diff --git a/.circleci/config.yml b/.circleci/config.yml index 92adc539e1..f9fbade930 100644 --- 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: | diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 22b58f39fa..d9c7dafba0 100644 --- 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 diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 91d7b73da9..246c118d67 100644 --- 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 diff --git a/CHANGELOG.md b/CHANGELOG.md index 61393911c5..c416a6bf42 100644 --- 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) diff --git 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 index a164c1f544..731186572e 100644 --- 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/% "${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 <${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 + +~~~ diff --git 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 new file mode 100644 index 0000000000..9273cd3510 Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/ca_certs/inter_ca.p12 differ diff --git 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 new file mode 100644 index 0000000000..cf0c5920bc Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/ca_certs/partner1_ca.p12 differ diff --git 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 new file mode 100644 index 0000000000..b5c1504fe5 Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/ca_certs/partner2_ca.p12 differ diff --git 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 new file mode 100644 index 0000000000..e5b8bdd364 Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/ca_certs/root_ca.p12 differ diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/crl/crl.pem b/acceptance-tests/tests/src/test/resources/pki-certs/crl/crl.pem new file mode 100644 index 0000000000..4e35203191 --- /dev/null +++ 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----- diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner1/crl.pem b/acceptance-tests/tests/src/test/resources/pki-certs/miner1/crl.pem deleted file mode 100644 index 8ced006c91..0000000000 --- a/acceptance-tests/tests/src/test/resources/pki-certs/miner1/crl.pem +++ /dev/null @@ -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----- diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner1/keys.p12 b/acceptance-tests/tests/src/test/resources/pki-certs/miner1/keys.p12 deleted file mode 100644 index e71ebbd476..0000000000 Binary files a/acceptance-tests/tests/src/test/resources/pki-certs/miner1/keys.p12 and /dev/null differ diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner1/keystore.jks b/acceptance-tests/tests/src/test/resources/pki-certs/miner1/keystore.jks deleted file mode 100644 index c8b821689a..0000000000 Binary files a/acceptance-tests/tests/src/test/resources/pki-certs/miner1/keystore.jks and /dev/null differ diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner1/miner1.jks b/acceptance-tests/tests/src/test/resources/pki-certs/miner1/miner1.jks new file mode 100644 index 0000000000..d5bc6e58b2 Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/miner1/miner1.jks differ diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner1/miner1.p12 b/acceptance-tests/tests/src/test/resources/pki-certs/miner1/miner1.p12 new file mode 100644 index 0000000000..2af9c63056 Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/miner1/miner1.p12 differ diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner1/nss.cfg b/acceptance-tests/tests/src/test/resources/pki-certs/miner1/nss.cfg index 5a046a9aed..d76bd9c163 100644 --- 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 diff --git 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 deleted file mode 100644 index 80bc38bd7b..0000000000 Binary files a/acceptance-tests/tests/src/test/resources/pki-certs/miner1/nssdb/cert8.db and /dev/null differ diff --git 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 new file mode 100644 index 0000000000..a8d86c4a02 Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/miner1/nssdb/cert9.db differ diff --git 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 deleted file mode 100644 index 84eb3256cf..0000000000 Binary files a/acceptance-tests/tests/src/test/resources/pki-certs/miner1/nssdb/key3.db and /dev/null differ diff --git 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 new file mode 100644 index 0000000000..e0fe6d8938 Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/miner1/nssdb/key4.db differ diff --git 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 new file mode 100644 index 0000000000..fe947a8221 --- /dev/null +++ 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}) + diff --git 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 index a2f790915a..e69de29bb2 100644 Binary files a/acceptance-tests/tests/src/test/resources/pki-certs/miner1/nssdb/secmod.db and b/acceptance-tests/tests/src/test/resources/pki-certs/miner1/nssdb/secmod.db differ diff --git 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 deleted file mode 100644 index 61a8f5230e..0000000000 --- a/acceptance-tests/tests/src/test/resources/pki-certs/miner1/ssl-ca.pem +++ /dev/null @@ -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----- diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner1/ssl.pem b/acceptance-tests/tests/src/test/resources/pki-certs/miner1/ssl.pem deleted file mode 100644 index 17ce93aa99..0000000000 --- a/acceptance-tests/tests/src/test/resources/pki-certs/miner1/ssl.pem +++ /dev/null @@ -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----- diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner1/truststore.jks b/acceptance-tests/tests/src/test/resources/pki-certs/miner1/truststore.jks deleted file mode 100644 index 3bb8973704..0000000000 Binary files a/acceptance-tests/tests/src/test/resources/pki-certs/miner1/truststore.jks and /dev/null differ diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner1/truststore.p12 b/acceptance-tests/tests/src/test/resources/pki-certs/miner1/truststore.p12 new file mode 100644 index 0000000000..e1770512cb Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/miner1/truststore.p12 differ diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner2/crl.pem b/acceptance-tests/tests/src/test/resources/pki-certs/miner2/crl.pem deleted file mode 100644 index 8ced006c91..0000000000 --- a/acceptance-tests/tests/src/test/resources/pki-certs/miner2/crl.pem +++ /dev/null @@ -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----- diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner2/keys.p12 b/acceptance-tests/tests/src/test/resources/pki-certs/miner2/keys.p12 deleted file mode 100644 index bd9ef1313f..0000000000 Binary files a/acceptance-tests/tests/src/test/resources/pki-certs/miner2/keys.p12 and /dev/null differ diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner2/keystore.jks b/acceptance-tests/tests/src/test/resources/pki-certs/miner2/keystore.jks deleted file mode 100644 index b5ee32efda..0000000000 Binary files a/acceptance-tests/tests/src/test/resources/pki-certs/miner2/keystore.jks and /dev/null differ diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner2/miner2.jks b/acceptance-tests/tests/src/test/resources/pki-certs/miner2/miner2.jks new file mode 100644 index 0000000000..4a0fdc3460 Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/miner2/miner2.jks differ diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner2/miner2.p12 b/acceptance-tests/tests/src/test/resources/pki-certs/miner2/miner2.p12 new file mode 100644 index 0000000000..1d16c7b019 Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/miner2/miner2.p12 differ diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner2/nss.cfg b/acceptance-tests/tests/src/test/resources/pki-certs/miner2/nss.cfg index 749298c517..995d452fc4 100644 --- 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 diff --git 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 deleted file mode 100644 index 2a24887826..0000000000 Binary files a/acceptance-tests/tests/src/test/resources/pki-certs/miner2/nssdb/cert8.db and /dev/null differ diff --git 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 new file mode 100644 index 0000000000..df9dd3f927 Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/miner2/nssdb/cert9.db differ diff --git 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 deleted file mode 100644 index 2019365308..0000000000 Binary files a/acceptance-tests/tests/src/test/resources/pki-certs/miner2/nssdb/key3.db and /dev/null differ diff --git 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 new file mode 100644 index 0000000000..a5a86da617 Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/miner2/nssdb/key4.db differ diff --git 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 new file mode 100644 index 0000000000..90b09f83b2 --- /dev/null +++ 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}) + diff --git 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 index 063522eadb..e69de29bb2 100644 Binary files a/acceptance-tests/tests/src/test/resources/pki-certs/miner2/nssdb/secmod.db and b/acceptance-tests/tests/src/test/resources/pki-certs/miner2/nssdb/secmod.db differ diff --git 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 deleted file mode 100644 index c0c4bf478f..0000000000 --- a/acceptance-tests/tests/src/test/resources/pki-certs/miner2/ssl-ca.pem +++ /dev/null @@ -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----- diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner2/ssl.pem b/acceptance-tests/tests/src/test/resources/pki-certs/miner2/ssl.pem deleted file mode 100644 index cf05616214..0000000000 --- a/acceptance-tests/tests/src/test/resources/pki-certs/miner2/ssl.pem +++ /dev/null @@ -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----- diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner2/truststore.jks b/acceptance-tests/tests/src/test/resources/pki-certs/miner2/truststore.jks deleted file mode 100644 index 07df7d815c..0000000000 Binary files a/acceptance-tests/tests/src/test/resources/pki-certs/miner2/truststore.jks and /dev/null differ diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner2/truststore.p12 b/acceptance-tests/tests/src/test/resources/pki-certs/miner2/truststore.p12 new file mode 100644 index 0000000000..4b549e7b15 Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/miner2/truststore.p12 differ diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner3/crl.pem b/acceptance-tests/tests/src/test/resources/pki-certs/miner3/crl.pem deleted file mode 100644 index 8ced006c91..0000000000 --- a/acceptance-tests/tests/src/test/resources/pki-certs/miner3/crl.pem +++ /dev/null @@ -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----- diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner3/keys.p12 b/acceptance-tests/tests/src/test/resources/pki-certs/miner3/keys.p12 deleted file mode 100644 index 0152428c14..0000000000 Binary files a/acceptance-tests/tests/src/test/resources/pki-certs/miner3/keys.p12 and /dev/null differ diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner3/keystore.jks b/acceptance-tests/tests/src/test/resources/pki-certs/miner3/keystore.jks deleted file mode 100644 index a28c21f39c..0000000000 Binary files a/acceptance-tests/tests/src/test/resources/pki-certs/miner3/keystore.jks and /dev/null differ diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner3/miner3.jks b/acceptance-tests/tests/src/test/resources/pki-certs/miner3/miner3.jks new file mode 100644 index 0000000000..8c4301b3fe Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/miner3/miner3.jks differ diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner3/miner3.p12 b/acceptance-tests/tests/src/test/resources/pki-certs/miner3/miner3.p12 new file mode 100644 index 0000000000..29a2e50e68 Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/miner3/miner3.p12 differ diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner3/nss.cfg b/acceptance-tests/tests/src/test/resources/pki-certs/miner3/nss.cfg index 96ce4654b3..65e04bccbf 100644 --- 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 diff --git 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 deleted file mode 100644 index b7917f7399..0000000000 Binary files a/acceptance-tests/tests/src/test/resources/pki-certs/miner3/nssdb/cert8.db and /dev/null differ diff --git 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 new file mode 100644 index 0000000000..71fbd033eb Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/miner3/nssdb/cert9.db differ diff --git 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 deleted file mode 100644 index b35e9ccac2..0000000000 Binary files a/acceptance-tests/tests/src/test/resources/pki-certs/miner3/nssdb/key3.db and /dev/null differ diff --git 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 new file mode 100644 index 0000000000..4a1fb4b4a3 Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/miner3/nssdb/key4.db differ diff --git 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 new file mode 100644 index 0000000000..c4368a178f --- /dev/null +++ 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}) + diff --git 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 index 77abf6407a..e69de29bb2 100644 Binary files a/acceptance-tests/tests/src/test/resources/pki-certs/miner3/nssdb/secmod.db and b/acceptance-tests/tests/src/test/resources/pki-certs/miner3/nssdb/secmod.db differ diff --git 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 deleted file mode 100644 index a5fdc343f5..0000000000 --- a/acceptance-tests/tests/src/test/resources/pki-certs/miner3/ssl-ca.pem +++ /dev/null @@ -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----- diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner3/ssl.pem b/acceptance-tests/tests/src/test/resources/pki-certs/miner3/ssl.pem deleted file mode 100644 index 15e7e83d03..0000000000 --- a/acceptance-tests/tests/src/test/resources/pki-certs/miner3/ssl.pem +++ /dev/null @@ -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----- diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner3/truststore.jks b/acceptance-tests/tests/src/test/resources/pki-certs/miner3/truststore.jks deleted file mode 100644 index 328ff9d8a5..0000000000 Binary files a/acceptance-tests/tests/src/test/resources/pki-certs/miner3/truststore.jks and /dev/null differ diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner3/truststore.p12 b/acceptance-tests/tests/src/test/resources/pki-certs/miner3/truststore.p12 new file mode 100644 index 0000000000..235819bcfb Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/miner3/truststore.p12 differ diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner4/crl.pem b/acceptance-tests/tests/src/test/resources/pki-certs/miner4/crl.pem deleted file mode 100644 index 8ced006c91..0000000000 --- a/acceptance-tests/tests/src/test/resources/pki-certs/miner4/crl.pem +++ /dev/null @@ -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----- diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner4/keys.p12 b/acceptance-tests/tests/src/test/resources/pki-certs/miner4/keys.p12 deleted file mode 100644 index aea50ff00d..0000000000 Binary files a/acceptance-tests/tests/src/test/resources/pki-certs/miner4/keys.p12 and /dev/null differ diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner4/keystore.jks b/acceptance-tests/tests/src/test/resources/pki-certs/miner4/keystore.jks deleted file mode 100644 index 03583b969a..0000000000 Binary files a/acceptance-tests/tests/src/test/resources/pki-certs/miner4/keystore.jks and /dev/null differ diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner4/miner4.jks b/acceptance-tests/tests/src/test/resources/pki-certs/miner4/miner4.jks new file mode 100644 index 0000000000..0c3395bb24 Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/miner4/miner4.jks differ diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner4/miner4.p12 b/acceptance-tests/tests/src/test/resources/pki-certs/miner4/miner4.p12 new file mode 100644 index 0000000000..122ec91515 Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/miner4/miner4.p12 differ diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner4/nss.cfg b/acceptance-tests/tests/src/test/resources/pki-certs/miner4/nss.cfg index c072465abb..29082f64b5 100644 --- 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 diff --git 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 deleted file mode 100644 index 07a0f5cb23..0000000000 Binary files a/acceptance-tests/tests/src/test/resources/pki-certs/miner4/nssdb/cert8.db and /dev/null differ diff --git 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 new file mode 100644 index 0000000000..76e1d8e22b Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/miner4/nssdb/cert9.db differ diff --git 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 deleted file mode 100644 index 12431948ee..0000000000 Binary files a/acceptance-tests/tests/src/test/resources/pki-certs/miner4/nssdb/key3.db and /dev/null differ diff --git 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 new file mode 100644 index 0000000000..65917d78bb Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/miner4/nssdb/key4.db differ diff --git 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 new file mode 100644 index 0000000000..730c97feb8 --- /dev/null +++ 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}) + diff --git 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 index 02bd40eff7..e69de29bb2 100644 Binary files a/acceptance-tests/tests/src/test/resources/pki-certs/miner4/nssdb/secmod.db and b/acceptance-tests/tests/src/test/resources/pki-certs/miner4/nssdb/secmod.db differ diff --git 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 deleted file mode 100644 index 8a3ea186f1..0000000000 --- a/acceptance-tests/tests/src/test/resources/pki-certs/miner4/ssl-ca.pem +++ /dev/null @@ -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----- diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner4/ssl.pem b/acceptance-tests/tests/src/test/resources/pki-certs/miner4/ssl.pem deleted file mode 100644 index dca9370fa5..0000000000 --- a/acceptance-tests/tests/src/test/resources/pki-certs/miner4/ssl.pem +++ /dev/null @@ -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----- diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner4/truststore.jks b/acceptance-tests/tests/src/test/resources/pki-certs/miner4/truststore.jks deleted file mode 100644 index d092d4464c..0000000000 Binary files a/acceptance-tests/tests/src/test/resources/pki-certs/miner4/truststore.jks and /dev/null differ diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner4/truststore.p12 b/acceptance-tests/tests/src/test/resources/pki-certs/miner4/truststore.p12 new file mode 100644 index 0000000000..7b889bfc89 Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/miner4/truststore.p12 differ diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner5/crl.pem b/acceptance-tests/tests/src/test/resources/pki-certs/miner5/crl.pem deleted file mode 100644 index 8ced006c91..0000000000 --- a/acceptance-tests/tests/src/test/resources/pki-certs/miner5/crl.pem +++ /dev/null @@ -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----- diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner5/keys.p12 b/acceptance-tests/tests/src/test/resources/pki-certs/miner5/keys.p12 deleted file mode 100644 index 55cc9c193b..0000000000 Binary files a/acceptance-tests/tests/src/test/resources/pki-certs/miner5/keys.p12 and /dev/null differ diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner5/keystore.jks b/acceptance-tests/tests/src/test/resources/pki-certs/miner5/keystore.jks deleted file mode 100644 index a9bdf87ab3..0000000000 Binary files a/acceptance-tests/tests/src/test/resources/pki-certs/miner5/keystore.jks and /dev/null differ diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner5/miner5.jks b/acceptance-tests/tests/src/test/resources/pki-certs/miner5/miner5.jks new file mode 100644 index 0000000000..b8e9de7015 Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/miner5/miner5.jks differ diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner5/miner5.p12 b/acceptance-tests/tests/src/test/resources/pki-certs/miner5/miner5.p12 new file mode 100644 index 0000000000..433d7ded26 Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/miner5/miner5.p12 differ diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner5/nss.cfg b/acceptance-tests/tests/src/test/resources/pki-certs/miner5/nss.cfg index e56635e2ab..063e31a2a3 100644 --- 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 diff --git 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 deleted file mode 100644 index efec34df6b..0000000000 Binary files a/acceptance-tests/tests/src/test/resources/pki-certs/miner5/nssdb/cert8.db and /dev/null differ diff --git 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 new file mode 100644 index 0000000000..2c7f6f3a80 Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/miner5/nssdb/cert9.db differ diff --git 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 deleted file mode 100644 index eebe7c390a..0000000000 Binary files a/acceptance-tests/tests/src/test/resources/pki-certs/miner5/nssdb/key3.db and /dev/null differ diff --git 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 new file mode 100644 index 0000000000..c7b9ed789a Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/miner5/nssdb/key4.db differ diff --git 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 new file mode 100644 index 0000000000..bd574fbdc7 --- /dev/null +++ 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}) + diff --git 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 index 80ccee03b8..e69de29bb2 100644 Binary files a/acceptance-tests/tests/src/test/resources/pki-certs/miner5/nssdb/secmod.db and b/acceptance-tests/tests/src/test/resources/pki-certs/miner5/nssdb/secmod.db differ diff --git 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 deleted file mode 100644 index 61a8f5230e..0000000000 --- a/acceptance-tests/tests/src/test/resources/pki-certs/miner5/ssl-ca.pem +++ /dev/null @@ -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----- diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner5/ssl.pem b/acceptance-tests/tests/src/test/resources/pki-certs/miner5/ssl.pem deleted file mode 100644 index 3bdd8f11b9..0000000000 --- a/acceptance-tests/tests/src/test/resources/pki-certs/miner5/ssl.pem +++ /dev/null @@ -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----- diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner5/truststore.jks b/acceptance-tests/tests/src/test/resources/pki-certs/miner5/truststore.jks deleted file mode 100644 index 7467d307a8..0000000000 Binary files a/acceptance-tests/tests/src/test/resources/pki-certs/miner5/truststore.jks and /dev/null differ diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner5/truststore.p12 b/acceptance-tests/tests/src/test/resources/pki-certs/miner5/truststore.p12 new file mode 100644 index 0000000000..14152b8831 Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/miner5/truststore.p12 differ diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner6/crl.pem b/acceptance-tests/tests/src/test/resources/pki-certs/miner6/crl.pem deleted file mode 100644 index 8ced006c91..0000000000 --- a/acceptance-tests/tests/src/test/resources/pki-certs/miner6/crl.pem +++ /dev/null @@ -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----- diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner6/keys.p12 b/acceptance-tests/tests/src/test/resources/pki-certs/miner6/keys.p12 deleted file mode 100644 index 914efaf1c8..0000000000 Binary files a/acceptance-tests/tests/src/test/resources/pki-certs/miner6/keys.p12 and /dev/null differ diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner6/keystore.jks b/acceptance-tests/tests/src/test/resources/pki-certs/miner6/keystore.jks deleted file mode 100644 index 9a5eb277b5..0000000000 Binary files a/acceptance-tests/tests/src/test/resources/pki-certs/miner6/keystore.jks and /dev/null differ diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner6/miner6.jks b/acceptance-tests/tests/src/test/resources/pki-certs/miner6/miner6.jks new file mode 100644 index 0000000000..c1e4079f75 Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/miner6/miner6.jks differ diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner6/miner6.p12 b/acceptance-tests/tests/src/test/resources/pki-certs/miner6/miner6.p12 new file mode 100644 index 0000000000..1ae95b5d55 Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/miner6/miner6.p12 differ diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner6/nss.cfg b/acceptance-tests/tests/src/test/resources/pki-certs/miner6/nss.cfg index bf3d54b4db..60a2e65bc4 100644 --- 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 diff --git 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 deleted file mode 100644 index d3bb57e190..0000000000 Binary files a/acceptance-tests/tests/src/test/resources/pki-certs/miner6/nssdb/cert8.db and /dev/null differ diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner6/nssdb/cert9.db b/acceptance-tests/tests/src/test/resources/pki-certs/miner6/nssdb/cert9.db new file mode 100644 index 0000000000..7966383de0 Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/miner6/nssdb/cert9.db differ diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner6/nssdb/key3.db b/acceptance-tests/tests/src/test/resources/pki-certs/miner6/nssdb/key3.db deleted file mode 100644 index 40d5642f51..0000000000 Binary files a/acceptance-tests/tests/src/test/resources/pki-certs/miner6/nssdb/key3.db and /dev/null differ diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner6/nssdb/key4.db b/acceptance-tests/tests/src/test/resources/pki-certs/miner6/nssdb/key4.db new file mode 100644 index 0000000000..88f4e9ed3f Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/miner6/nssdb/key4.db differ diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner6/nssdb/pkcs11.txt b/acceptance-tests/tests/src/test/resources/pki-certs/miner6/nssdb/pkcs11.txt new file mode 100644 index 0000000000..a47ca829b2 --- /dev/null +++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner6/nssdb/pkcs11.txt @@ -0,0 +1,5 @@ +library= +name=NSS Internal PKCS #11 Module +parameters=configdir='sql:./miner6/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}) + diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner6/nssdb/secmod.db b/acceptance-tests/tests/src/test/resources/pki-certs/miner6/nssdb/secmod.db index 0779f15b8b..e69de29bb2 100644 Binary files a/acceptance-tests/tests/src/test/resources/pki-certs/miner6/nssdb/secmod.db and b/acceptance-tests/tests/src/test/resources/pki-certs/miner6/nssdb/secmod.db differ diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner6/ssl-ca.pem b/acceptance-tests/tests/src/test/resources/pki-certs/miner6/ssl-ca.pem deleted file mode 100644 index c0c4bf478f..0000000000 --- a/acceptance-tests/tests/src/test/resources/pki-certs/miner6/ssl-ca.pem +++ /dev/null @@ -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----- diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner6/ssl.pem b/acceptance-tests/tests/src/test/resources/pki-certs/miner6/ssl.pem deleted file mode 100644 index a9dd092248..0000000000 --- a/acceptance-tests/tests/src/test/resources/pki-certs/miner6/ssl.pem +++ /dev/null @@ -1,126 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDZgmsLlcgSXuga -R8IRoGYwz6bIRCg1Yy6FFnWRu91cPf8jebSfx1Ek4CH9SD6OX3B+bWzfPyRLvpm8 -J6oJDHRE7AuwwQbbHtJNCbcyp8be57s3ZpSooJBIEZ++WSyTcht7cs7fDpR+2Nx0 -GkRZznjCXaCxIkmL12N6k2vziEQIYF2w9EDCecWqnpiB766yLTE8CGuLUy6CzcXM -eUXTF9iW9ogZ614LkAILZ2a1igzMA5bC3sH/RfpiiFIZ9o8+q9EecX0igWFF5OuS -4/2qxXEBRVLS9zGANVG5AdaNIqWPyBy674bl1BejGvSI/PGvLzqGZY/gelu3FkaA -84Lrc01HAgMBAAECggEAfYeuPdZozGlnrNsjHscikyMUj1n+lqkyDO8kVUJGA9ln -6VJxMxF2PED6fNH4AHUGWIDQp5sqWGidEyEVGfnNFIXiTVVpnoaQOpPT3fFEbhrx -SozyWMup2V4KgnG2rzXYtItS5xrkCr0fpgYO0oG94fblKbWvGnzpVbHFSJypHudl -rV3j+xqr/9BcZZaaiBFVIkchJcXOwzZHM/VWDNuAa6qqqiKn2cLGCv4S5rE4Ikgk -Sz1WfRMnX8+2m573gv2HlKbx/nryQAK6qKqaw7ohaz6UZ3oiTLh8AsWedmNtWtSR -lO0JIVhhkCFJfwpt7kC7gR3uS+3JYL/ZFixkWoWs4QKBgQD+DQKKXg8xSwNadeaI -3BOug0hA+dzHrMBDqRtijajoNOWZglk1VPWDCYppbhhTB39Na57XXFZgIpiE3pIv -pUTWzRmQC52FoANRsxSKODq+lr8GJJOo9YDk2SKFneRaFvoX1vY7ZeCAUdOpEJti -5DU+yJRG8FcAELlvRVrBHZZKdwKBgQDbLaLTJPHmHJxUpZ3lOkrwTCTEt+1tNjln -ufPZAlI9PleT9wejQHUYbyoyZhjtA6uneQNGGDo4g8aGfJuyemqYUvbdBLen1h6b -Sv4RjeS6kcf5s1wjFb+0BZhOv5FUtX9LHaLZVBGYi76jIAp0sjoTHtUWABBDKj/j -BDHCXBf3sQKBgEmDUjzfwt2sqye9/huUM03IR1wl8TEGWAw8HuSBwWKQC/BDu7Sn -BPQKCrc/WGKORNQOVERVP9lJqYCpNvv6gtT1PHRmKArGpq85drQYWUdVL6mDZAb8 -I3QVMNwhODapd2z2kwHVFQWMqAa/+3a+OnoUaHOukD5AmKgOFZjUCu05AoGBAMM2 -c1aCCl28z9RoqihXchVyjDEV7IcgC6MCMVjwQ1U+6HvmQsw5hdGceUXoP30ijsmb -87mDrJ9XZwOzim09sSE4i50xLW50PFBuS7pQ2g799tHE2WR6Y4MwlIZXA1ciTF0X -6UqOIRnwJXxe9lEXyLfs9zcgGVvpDnvg6XzFz6cRAoGANbY/4DuP9lJ1/8dDpfsn -sFa+kaKy0So5T0ul3PdWDj076HwiBETq92hhVQTH79UbUCJKiV/AdGNHFWfRWS09 -rzII1ctETcbVe98M+OnG/LjjNn7us4tua4P++kmtPUFRJ2Osji6OKVcTUmx9DeqY -EEhEH4FoDucaUdvbjfSn/rY= ------END PRIVATE KEY----- ------BEGIN CERTIFICATE----- -MIIEtTCCA52gAwIBAgIUE2YQ4Gyrr1+4i0VAQU4llwTyjNcwDQYJKoZIhvcNAQEL -BQAwgYExCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoGA1UEBwwDU0ZPMQsw -CQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDETMBEGA1UEAwwKcGFydG5lcmJjYTEm -MCQGCSqGSIb3DQEJARYXcGFydG5lcmJjYUBwYXJ0bmVyYi5jb20wIBcNMjEwNzA5 -MTkxMjMzWhgPMjEyMTA2MTUxOTEyMzNaMHkxCzAJBgNVBAYTAlVTMQswCQYDVQQI -DAJDQTEMMAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEP -MA0GA1UEAwwGbWluZXI2MSIwIAYJKoZIhvcNAQkBFhNtaW5lcjZAcGFydG5lcmIu -Y29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2YJrC5XIEl7oGkfC -EaBmMM+myEQoNWMuhRZ1kbvdXD3/I3m0n8dRJOAh/Ug+jl9wfm1s3z8kS76ZvCeq -CQx0ROwLsMEG2x7STQm3MqfG3ue7N2aUqKCQSBGfvlksk3Ibe3LO3w6UftjcdBpE -Wc54wl2gsSJJi9djepNr84hECGBdsPRAwnnFqp6Yge+usi0xPAhri1Mugs3FzHlF -0xfYlvaIGeteC5ACC2dmtYoMzAOWwt7B/0X6YohSGfaPPqvRHnF9IoFhReTrkuP9 -qsVxAUVS0vcxgDVRuQHWjSKlj8gcuu+G5dQXoxr0iPzxry86hmWP4HpbtxZGgPOC -63NNRwIDAQABo4IBKDCCASQwEQYJYIZIAYb4QgEBBAQDAgbAMB0GA1UdDgQWBBRK -gqxv4idQPVYoo/1ijv1cioLtYzAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIF4DAd -BgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwgbUGA1UdIwSBrTCBqoAUeWoi -dZwNRx4tF820bKeFe0/HigahfKR6MHgxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJD -QTEMMAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEQMA4G -A1UEAwwHaW50ZXJjYTEgMB4GCSqGSIb3DQEJARYRaW50ZXJjYUBhZG1pbi5jb22C -FHAEyPzePSbGcgLskvIH1ugaaXQSMA0GCSqGSIb3DQEBCwUAA4IBAQCJETSuFYHm -frjtpQKZgNCvr2bJWwddFh4kEPIiaaSwqOxGFu31sPaSTKb5DjWBOGOtPjPxnjPD -buESHTCzWqRbN7qJqMcb7dG9A/izyRNkeOWaey+Tb7eSPxuRPZsGHnvzxA8YtwBo -fQpf7Q/DX5kth1Qv23qg52THv29lk8Fw9UFFHkaHY4Q3yRd5iKfEvracztXNRLqH -NY0jCSobQzgiU1euWjpcIWRn5AHp5fBE5PAMPo1UWhko3rR/S5xOd2Lwq3ykNxjn -HdUV5vourtyvxBNeNZowWxnNc7tTQpQV60SbXVyWApnDLRz/oXFVk5jrarbXSdAI -78qynJuKXFyX ------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----- diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner6/truststore.jks b/acceptance-tests/tests/src/test/resources/pki-certs/miner6/truststore.jks deleted file mode 100644 index 474cead24b..0000000000 Binary files a/acceptance-tests/tests/src/test/resources/pki-certs/miner6/truststore.jks and /dev/null differ diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner6/truststore.p12 b/acceptance-tests/tests/src/test/resources/pki-certs/miner6/truststore.p12 new file mode 100644 index 0000000000..8837ef6703 Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/miner6/truststore.p12 differ diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/truststore/truststore.p12 b/acceptance-tests/tests/src/test/resources/pki-certs/truststore/truststore.p12 new file mode 100644 index 0000000000..33079569a1 Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/truststore/truststore.p12 differ diff --git a/besu/src/main/java/org/hyperledger/besu/Runner.java b/besu/src/main/java/org/hyperledger/besu/Runner.java index fb4facf0eb..f496bbaf22 100644 --- a/besu/src/main/java/org/hyperledger/besu/Runner.java +++ b/besu/src/main/java/org/hyperledger/besu/Runner.java @@ -16,8 +16,8 @@ package org.hyperledger.besu; import org.hyperledger.besu.controller.BesuController; import org.hyperledger.besu.ethereum.api.graphql.GraphQLHttpService; +import org.hyperledger.besu.ethereum.api.jsonrpc.EngineJsonRpcService; import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcHttpService; -import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcService; import org.hyperledger.besu.ethereum.api.jsonrpc.ipc.JsonRpcIpcService; import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.WebSocketService; import org.hyperledger.besu.ethereum.api.query.cache.AutoTransactionLogBloomCachingService; @@ -65,7 +65,7 @@ public class Runner implements AutoCloseable { private final Optional ethStatsService; private final Optional graphQLHttp; private final Optional jsonRpc; - private final Optional engineJsonRpc; + private final Optional engineJsonRpc; private final Optional metrics; private final Optional ipcJsonRpc; private final Optional pidPath; @@ -103,7 +103,7 @@ public class Runner implements AutoCloseable { final NetworkRunner networkRunner, final NatService natService, final Optional jsonRpc, - final Optional engineJsonRpc, + final Optional engineJsonRpc, final Optional graphQLHttp, final Optional webSocketRpc, final Optional ipcJsonRpc, diff --git a/besu/src/main/java/org/hyperledger/besu/RunnerBuilder.java b/besu/src/main/java/org/hyperledger/besu/RunnerBuilder.java index 6d1a0f5744..a9a8f6fea5 100644 --- a/besu/src/main/java/org/hyperledger/besu/RunnerBuilder.java +++ b/besu/src/main/java/org/hyperledger/besu/RunnerBuilder.java @@ -33,9 +33,9 @@ import org.hyperledger.besu.ethereum.api.graphql.GraphQLContextType; import org.hyperledger.besu.ethereum.api.graphql.GraphQLDataFetchers; import org.hyperledger.besu.ethereum.api.graphql.GraphQLHttpService; import org.hyperledger.besu.ethereum.api.graphql.GraphQLProvider; +import org.hyperledger.besu.ethereum.api.jsonrpc.EngineJsonRpcService; import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcConfiguration; import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcHttpService; -import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcService; import org.hyperledger.besu.ethereum.api.jsonrpc.authentication.AuthenticationService; import org.hyperledger.besu.ethereum.api.jsonrpc.authentication.DefaultAuthenticationService; import org.hyperledger.besu.ethereum.api.jsonrpc.authentication.EngineAuthService; @@ -887,7 +887,7 @@ public class RunnerBuilder { final SubscriptionManager subscriptionManager = createSubscriptionManager(vertx, transactionPool, blockchainQueries); - Optional engineJsonRpcService = Optional.empty(); + Optional engineJsonRpcService = Optional.empty(); if (engineJsonRpcConfiguration.isPresent() && engineJsonRpcConfiguration.get().isEnabled()) { final Map engineMethods = jsonRpcMethods( @@ -934,7 +934,7 @@ public class RunnerBuilder { engineJsonRpcService = Optional.of( - new JsonRpcService( + new EngineJsonRpcService( vertx, dataDir, engineJsonRpcConfiguration.orElse(JsonRpcConfiguration.createEngineDefault()), diff --git a/build.gradle b/build.gradle index 4860b0bf74..ae516109e8 100644 --- a/build.gradle +++ b/build.gradle @@ -30,8 +30,8 @@ plugins { id 'maven-publish' } -if (!JavaVersion.current().java11Compatible) { - throw new GradleException("Java 11 or later is required to build Besu.\n" + +if (!JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)) { + throw new GradleException("Java 17 or later is required to build Besu.\n" + " Detected version ${JavaVersion.current()}") } @@ -99,8 +99,8 @@ allprojects { from javadoc.outputDirectory } - sourceCompatibility = 11 - targetCompatibility = 11 + sourceCompatibility = 17 + targetCompatibility = 17 repositories { maven { @@ -622,8 +622,8 @@ def dockerOrgName = project.hasProperty('dockerOrgName') ? project.getProperty(" def dockerArtifactName = project.hasProperty("dockerArtifactName") ? project.getProperty("dockerArtifactName") : "besu" def dockerImageName = "${dockerOrgName}/${dockerArtifactName}" def dockerVariants = project.hasProperty("dockerVariants") ? project.getProperty("dockerVariants").split(",") : [ - "openjdk-11", - "openjdk-11-debug", + "openjdk-17", + "openjdk-17-debug", "graalvm", "openjdk-latest" ] diff --git a/datatypes/src/main/java/org/hyperledger/besu/datatypes/GWei.java b/datatypes/src/main/java/org/hyperledger/besu/datatypes/GWei.java index 06e3667690..0ebc6a9b8e 100644 --- a/datatypes/src/main/java/org/hyperledger/besu/datatypes/GWei.java +++ b/datatypes/src/main/java/org/hyperledger/besu/datatypes/GWei.java @@ -34,6 +34,9 @@ public final class GWei extends BaseUInt64Value implements Quantity { /** The constant MAX_GWEI. */ public static final GWei MAX_GWEI = of(UInt64.MAX_VALUE); + /** The constant GWEI_TO_WEI_MULTIPLIER. */ + private static final BigInteger GWEI_TO_WEI_MULTIPLIER = BigInteger.valueOf(1_000_000_000L); + /** * Instantiates a new GWei. * @@ -111,7 +114,7 @@ public final class GWei extends BaseUInt64Value implements Quantity { * @return Wei */ public Wei getAsWei() { - return Wei.of(getAsBigInteger().multiply(BigInteger.TEN.pow(9))); + return Wei.of(getAsBigInteger().multiply(GWEI_TO_WEI_MULTIPLIER)); } @Override diff --git a/docker/graalvm/Dockerfile b/docker/graalvm/Dockerfile index 0a660876f6..1b656ff3a7 100644 --- a/docker/graalvm/Dockerfile +++ b/docker/graalvm/Dockerfile @@ -1,5 +1,5 @@ -FROM ghcr.io/graalvm/graalvm-ce:ol8-java11 +FROM ghcr.io/graalvm/graalvm-ce:ol9-java17 ARG VERSION="dev" RUN adduser --home /opt/besu besu && \ diff --git a/docker/openjdk-11-debug/Dockerfile b/docker/openjdk-17-debug/Dockerfile similarity index 96% rename from docker/openjdk-11-debug/Dockerfile rename to docker/openjdk-17-debug/Dockerfile index 1f03d60465..adf0e88669 100644 --- a/docker/openjdk-11-debug/Dockerfile +++ b/docker/openjdk-17-debug/Dockerfile @@ -3,7 +3,7 @@ FROM ubuntu:20.04 ARG VERSION="dev" RUN apt-get update && \ - apt-get install --no-install-recommends -q --assume-yes curl=7* wget=1.20* jq=1.6* net-tools=1.60* openjdk-11-jdk-headless=11* libjemalloc-dev=5.* && \ + apt-get install --no-install-recommends -q --assume-yes curl=7* wget=1.20* jq=1.6* net-tools=1.60* openjdk-17-jdk-headless=17* libjemalloc-dev=5.* && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* && \ adduser --disabled-password --gecos "" --home /opt/besu besu && \ diff --git a/docker/openjdk-11/Dockerfile b/docker/openjdk-17/Dockerfile similarity index 97% rename from docker/openjdk-11/Dockerfile rename to docker/openjdk-17/Dockerfile index e6b71319cc..1eeac94cd8 100644 --- a/docker/openjdk-11/Dockerfile +++ b/docker/openjdk-17/Dockerfile @@ -3,7 +3,7 @@ FROM ubuntu:20.04 ARG VERSION="dev" RUN apt-get update && \ - apt-get install --no-install-recommends -q --assume-yes openjdk-11-jre-headless=11* libjemalloc-dev=5.* && \ + apt-get install --no-install-recommends -q --assume-yes openjdk-17-jre-headless=17* libjemalloc-dev=5.* && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* && \ adduser --disabled-password --gecos "" --home /opt/besu besu && \ diff --git a/docker/openjdk-latest/Dockerfile b/docker/openjdk-latest/Dockerfile index 1eeac94cd8..e2081facc5 100644 --- a/docker/openjdk-latest/Dockerfile +++ b/docker/openjdk-latest/Dockerfile @@ -1,9 +1,9 @@ -FROM ubuntu:20.04 +FROM ubuntu:22.04 ARG VERSION="dev" RUN apt-get update && \ - apt-get install --no-install-recommends -q --assume-yes openjdk-17-jre-headless=17* libjemalloc-dev=5.* && \ + apt-get install --no-install-recommends -q --assume-yes openjdk-19-jre-headless=19* libjemalloc-dev=5.* && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* && \ adduser --disabled-password --gecos "" --home /opt/besu besu && \ diff --git a/errorprone-checks/build.gradle b/errorprone-checks/build.gradle index 2feba558b2..805e513d2e 100644 --- a/errorprone-checks/build.gradle +++ b/errorprone-checks/build.gradle @@ -21,8 +21,8 @@ configurations.maybeCreate("epJavac") apply plugin: 'java' apply plugin: 'net.ltgt.errorprone' -sourceCompatibility = 11 -targetCompatibility = 11 +sourceCompatibility = 17 +targetCompatibility = 17 dependencies { api 'org.slf4j:slf4j-api' diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcService.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/EngineJsonRpcService.java similarity index 99% rename from ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcService.java rename to ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/EngineJsonRpcService.java index 0b4c8753a6..26710ff53e 100644 --- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcService.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/EngineJsonRpcService.java @@ -100,9 +100,9 @@ import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class JsonRpcService { +public class EngineJsonRpcService { - private static final Logger LOG = LoggerFactory.getLogger(JsonRpcService.class); + private static final Logger LOG = LoggerFactory.getLogger(EngineJsonRpcService.class); private static final String SPAN_CONTEXT = "span_context"; private static final InetSocketAddress EMPTY_SOCKET_ADDRESS = new InetSocketAddress("0.0.0.0", 0); @@ -152,7 +152,7 @@ public class JsonRpcService { private final HealthService readinessService; /** - * Construct a JsonRpcService to handle either http or websocket clients + * Construct a EngineJsonRpcService to handle either http or websocket clients * * @param vertx The vertx process that will be running this service * @param dataDir The data directory where requests can be buffered @@ -166,7 +166,7 @@ public class JsonRpcService { * @param livenessService A service responsible for reporting whether this node is live * @param readinessService A service responsible for reporting whether this node has fully started */ - public JsonRpcService( + public EngineJsonRpcService( final Vertx vertx, final Path dataDir, final JsonRpcConfiguration config, diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineExchangeCapabilities.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineExchangeCapabilities.java index 4d62e62cda..fd3b8ffa92 100644 --- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineExchangeCapabilities.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineExchangeCapabilities.java @@ -24,7 +24,6 @@ import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.ExecutionEngin import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse; import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse; -import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -52,10 +51,7 @@ public class EngineExchangeCapabilities extends ExecutionEngineJsonRpcMethod { public JsonRpcResponse syncResponse(final JsonRpcRequestContext requestContext) { engineCallListener.executionEngineCalled(); - final List remoteCapabilities = - Arrays.stream(requestContext.getRequest().getParams()) - .map(String::valueOf) - .collect(Collectors.toList()); + final String[] remoteCapabilities = requestContext.getRequiredParameter(0, String[].class); final Object reqId = requestContext.getRequest().getId(); traceLambda(LOG, "received remote capabilities: {}", () -> remoteCapabilities); diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineExchangeCapabilitiesTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineExchangeCapabilitiesTest.java index b9817f63df..2a30a2e5dc 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineExchangeCapabilitiesTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineExchangeCapabilitiesTest.java @@ -74,11 +74,13 @@ public class EngineExchangeCapabilitiesTest { verify(engineCallListener, times(1)).executionEngineCalled(); } - private JsonRpcResponse resp(final List params) { + private JsonRpcResponse resp(final List capabilitiesParam) { return method.response( new JsonRpcRequestContext( new JsonRpcRequest( - "2.0", ENGINE_EXCHANGE_CAPABILITIES.getMethodName(), params.toArray()))); + "2.0", + ENGINE_EXCHANGE_CAPABILITIES.getMethodName(), + new Object[] {capabilitiesParam}))); } @SuppressWarnings("unchecked") diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/JsonRpcJWTTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/JsonRpcJWTTest.java index 965e32eb3a..66b82e73c6 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/JsonRpcJWTTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/JsonRpcJWTTest.java @@ -18,8 +18,8 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; import static org.mockito.Mockito.spy; +import org.hyperledger.besu.ethereum.api.jsonrpc.EngineJsonRpcService; import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcConfiguration; -import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcService; import org.hyperledger.besu.ethereum.api.jsonrpc.authentication.AuthenticationService; import org.hyperledger.besu.ethereum.api.jsonrpc.authentication.EngineAuthService; import org.hyperledger.besu.ethereum.api.jsonrpc.health.HealthService; @@ -131,8 +131,8 @@ public class JsonRpcJWTTest { @Test public void unauthenticatedWebsocketAllowedWithoutJWTAuth(final TestContext context) { - JsonRpcService jsonRpcService = - new JsonRpcService( + EngineJsonRpcService engineJsonRpcService = + new EngineJsonRpcService( vertx, bufferDir, jsonRpcConfiguration, @@ -145,9 +145,9 @@ public class JsonRpcJWTTest { healthy, healthy); - jsonRpcService.start().join(); + engineJsonRpcService.start().join(); - final InetSocketAddress inetSocketAddress = jsonRpcService.socketAddress(); + final InetSocketAddress inetSocketAddress = engineJsonRpcService.socketAddress(); int listenPort = inetSocketAddress.getPort(); final HttpClientOptions httpClientOptions = @@ -184,15 +184,15 @@ public class JsonRpcJWTTest { }); async.awaitSuccess(10000); - jsonRpcService.stop(); + engineJsonRpcService.stop(); httpClient.close(); } @Test public void httpRequestWithDefaultHeaderAndValidJWTIsAccepted(final TestContext context) { - JsonRpcService jsonRpcService = - new JsonRpcService( + EngineJsonRpcService engineJsonRpcService = + new EngineJsonRpcService( vertx, bufferDir, jsonRpcConfiguration, @@ -205,9 +205,9 @@ public class JsonRpcJWTTest { healthy, healthy); - jsonRpcService.start().join(); + engineJsonRpcService.start().join(); - final InetSocketAddress inetSocketAddress = jsonRpcService.socketAddress(); + final InetSocketAddress inetSocketAddress = engineJsonRpcService.socketAddress(); int listenPort = inetSocketAddress.getPort(); final HttpClientOptions httpClientOptions = @@ -248,7 +248,7 @@ public class JsonRpcJWTTest { }); async.awaitSuccess(10000); - jsonRpcService.stop(); + engineJsonRpcService.stop(); httpClient.close(); } @@ -265,9 +265,9 @@ public class JsonRpcJWTTest { fail("didn't parse jwt"); } - JsonRpcService jsonRpcService = + EngineJsonRpcService engineJsonRpcService = spy( - new JsonRpcService( + new EngineJsonRpcService( vertx, bufferDir, strictHost, @@ -280,9 +280,9 @@ public class JsonRpcJWTTest { healthy, healthy)); - jsonRpcService.start().join(); + engineJsonRpcService.start().join(); - final InetSocketAddress inetSocketAddress = jsonRpcService.socketAddress(); + final InetSocketAddress inetSocketAddress = engineJsonRpcService.socketAddress(); int listenPort = inetSocketAddress.getPort(); final HttpClientOptions httpClientOptions = @@ -310,7 +310,7 @@ public class JsonRpcJWTTest { }); async.awaitSuccess(10000); - jsonRpcService.stop(); + engineJsonRpcService.stop(); httpClient.close(); } @@ -328,9 +328,9 @@ public class JsonRpcJWTTest { fail("didn't parse jwt"); } - JsonRpcService jsonRpcService = + EngineJsonRpcService engineJsonRpcService = spy( - new JsonRpcService( + new EngineJsonRpcService( vertx, bufferDir, strictHost, @@ -343,9 +343,9 @@ public class JsonRpcJWTTest { healthy, healthy)); - jsonRpcService.start().join(); + engineJsonRpcService.start().join(); - final InetSocketAddress inetSocketAddress = jsonRpcService.socketAddress(); + final InetSocketAddress inetSocketAddress = engineJsonRpcService.socketAddress(); int listenPort = inetSocketAddress.getPort(); final HttpClientOptions httpClientOptions = @@ -377,7 +377,7 @@ public class JsonRpcJWTTest { }); async.awaitSuccess(10000); - jsonRpcService.stop(); + engineJsonRpcService.stop(); httpClient.close(); } @@ -385,8 +385,8 @@ public class JsonRpcJWTTest { @Test public void httpRequestWithDefaultHeaderAndInvalidJWTIsDenied(final TestContext context) { - JsonRpcService jsonRpcService = - new JsonRpcService( + EngineJsonRpcService engineJsonRpcService = + new EngineJsonRpcService( vertx, bufferDir, jsonRpcConfiguration, @@ -399,9 +399,9 @@ public class JsonRpcJWTTest { healthy, healthy); - jsonRpcService.start().join(); + engineJsonRpcService.start().join(); - final InetSocketAddress inetSocketAddress = jsonRpcService.socketAddress(); + final InetSocketAddress inetSocketAddress = engineJsonRpcService.socketAddress(); int listenPort = inetSocketAddress.getPort(); final HttpClientOptions httpClientOptions = @@ -427,7 +427,7 @@ public class JsonRpcJWTTest { }); async.awaitSuccess(10000); - jsonRpcService.stop(); + engineJsonRpcService.stop(); httpClient.close(); } } diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/BonsaiWorldStateUpdater.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/BonsaiWorldStateUpdater.java index 28e1d7fcce..592861d268 100644 --- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/BonsaiWorldStateUpdater.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/BonsaiWorldStateUpdater.java @@ -284,7 +284,8 @@ public class BonsaiWorldStateUpdater extends AbstractWorldUpdater(wrappedWorldView().getCode(addr).orElse(null), null)); pendingCode.setUpdated(updatedAccount.getCode()); } - + // This is especially to avoid unnecessary computation for withdrawals + if (updatedAccount.getUpdatedStorage().isEmpty()) return; final StorageConsumingMap> pendingStorageUpdates = storageToUpdate.computeIfAbsent( updatedAddress, diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetPrecompiledContractRegistries.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetPrecompiledContractRegistries.java index 7d1ecf95fe..43878ee682 100644 --- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetPrecompiledContractRegistries.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetPrecompiledContractRegistries.java @@ -17,7 +17,6 @@ package org.hyperledger.besu.ethereum.mainnet; import static org.hyperledger.besu.ethereum.core.PrivacyParameters.DEFAULT_PRIVACY; import static org.hyperledger.besu.ethereum.core.PrivacyParameters.FLEXIBLE_PRIVACY; import static org.hyperledger.besu.ethereum.core.PrivacyParameters.PLUGIN_PRIVACY; -import static org.hyperledger.besu.evm.precompile.MainnetPrecompiledContracts.populateForBLS12; import static org.hyperledger.besu.evm.precompile.MainnetPrecompiledContracts.populateForByzantium; import static org.hyperledger.besu.evm.precompile.MainnetPrecompiledContracts.populateForCancun; import static org.hyperledger.besu.evm.precompile.MainnetPrecompiledContracts.populateForFrontier; @@ -29,39 +28,30 @@ import org.hyperledger.besu.ethereum.mainnet.precompiles.privacy.PrivacyPrecompi import org.hyperledger.besu.evm.precompile.PrecompileContractRegistry; /** Provides the various precompiled contracts used on mainnet hard forks. */ -public abstract class MainnetPrecompiledContractRegistries { +public interface MainnetPrecompiledContractRegistries { - private MainnetPrecompiledContractRegistries() {} - - public static PrecompileContractRegistry frontier( + static PrecompileContractRegistry frontier( final PrecompiledContractConfiguration precompiledContractConfiguration) { final PrecompileContractRegistry registry = new PrecompileContractRegistry(); populateForFrontier(registry, precompiledContractConfiguration.getGasCalculator()); return registry; } - public static PrecompileContractRegistry byzantium( + static PrecompileContractRegistry byzantium( final PrecompiledContractConfiguration precompiledContractConfiguration) { final PrecompileContractRegistry registry = new PrecompileContractRegistry(); populateForByzantium(registry, precompiledContractConfiguration.getGasCalculator()); return registry; } - public static PrecompileContractRegistry istanbul( + static PrecompileContractRegistry istanbul( final PrecompiledContractConfiguration precompiledContractConfiguration) { final PrecompileContractRegistry registry = new PrecompileContractRegistry(); populateForIstanbul(registry, precompiledContractConfiguration.getGasCalculator()); return registry; } - public static PrecompileContractRegistry bls12( - final PrecompiledContractConfiguration precompiledContractConfiguration) { - final PrecompileContractRegistry registry = new PrecompileContractRegistry(); - populateForBLS12(registry, precompiledContractConfiguration.getGasCalculator()); - return registry; - } - - public static PrecompileContractRegistry cancun( + static PrecompileContractRegistry cancun( final PrecompiledContractConfiguration precompiledContractConfiguration) { final PrecompileContractRegistry registry = new PrecompileContractRegistry(); populateForCancun(registry, precompiledContractConfiguration.getGasCalculator()); diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/NettyTLSConnectionInitializer.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/NettyTLSConnectionInitializer.java index 0526896571..7acf79225a 100644 --- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/NettyTLSConnectionInitializer.java +++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/NettyTLSConnectionInitializer.java @@ -33,6 +33,7 @@ import java.util.Optional; import java.util.function.Supplier; import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Suppliers; import io.netty.channel.Channel; import io.netty.handler.codec.LengthFieldBasedFrameDecoder; import io.netty.handler.codec.LengthFieldPrepender; @@ -69,7 +70,12 @@ public class NettyTLSConnectionInitializer extends NettyConnectionInitializer { final MetricsSystem metricsSystem, final Supplier tlsContextFactorySupplier) { super(nodeKey, config, localNode, eventDispatcher, metricsSystem); - this.tlsContextFactorySupplier = Optional.ofNullable(tlsContextFactorySupplier); + if (tlsContextFactorySupplier != null) { + this.tlsContextFactorySupplier = + Optional.of(Suppliers.memoize(tlsContextFactorySupplier::get)); + } else { + this.tlsContextFactorySupplier = Optional.empty(); + } } @Override diff --git a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/network/P2PPlainNetworkTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/network/P2PPlainNetworkTest.java index ad25f94eb2..da947efc32 100644 --- a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/network/P2PPlainNetworkTest.java +++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/network/P2PPlainNetworkTest.java @@ -17,6 +17,7 @@ package org.hyperledger.besu.ethereum.p2p.network; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.api.Fail.fail; +import static org.hyperledger.besu.pki.keystore.KeyStoreWrapper.KEYSTORE_TYPE_PKCS12; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; @@ -46,21 +47,18 @@ import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MockSubProtocol; import org.hyperledger.besu.ethereum.p2p.rlpx.wire.SubProtocol; import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason; import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; -import org.hyperledger.besu.pki.keystore.KeyStoreWrapper; import org.hyperledger.besu.plugin.data.EnodeURL; -import java.io.File; -import java.io.IOException; import java.net.InetAddress; -import java.nio.file.Files; +import java.net.URISyntaxException; import java.nio.file.Path; import java.util.Arrays; import java.util.Collections; +import java.util.Objects; import java.util.Optional; import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; -import com.google.common.base.Charsets; import io.vertx.core.Vertx; import org.apache.tuweni.bytes.Bytes; import org.assertj.core.api.Assertions; @@ -71,6 +69,7 @@ import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.StrictStubs.class) public class P2PPlainNetworkTest { + // See ethereum/p2p/src/test/resources/keys/README.md for certificates setup. private final Vertx vertx = Vertx.vertx(); private final NetworkingConfiguration config = NetworkingConfiguration.create() @@ -408,90 +407,34 @@ public class P2PPlainNetworkTest { .build()); } - private Path initNSSConfigFile(final Path srcFilePath) { - Path ret = null; + private static Path toPath(final String path) { 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 (final IOException e) { - throw new RuntimeException("Error populating nss config file", e); + return Path.of(Objects.requireNonNull(P2PPlainNetworkTest.class.getResource(path)).toURI()); + } catch (URISyntaxException e) { + throw new RuntimeException("Error converting to URI.", e); } - return ret; } - private Path createTemporaryFile(final String suffix) { - final File tempFile; - try { - tempFile = File.createTempFile("temp", suffix); - tempFile.deleteOnExit(); - } catch (final IOException e) { - throw new RuntimeException("Error creating temporary file", e); - } - return tempFile.toPath(); - } - - private static Path toPath(final String path) throws Exception { - return Path.of(P2PPlainNetworkTest.class.getResource(path).toURI()); - } - - public Optional p2pTLSEnabled(final String name, final String type) { + public Optional p2pTLSEnabled(final String clientDirName) { + final String parentPath = "/keys"; + final String keystorePath = parentPath + "/%s/client1.p12"; + final String truststorePath = parentPath + "/%s/truststore.p12"; + final String crl = parentPath + "/crl/crl.pem"; final TLSConfiguration.Builder builder = TLSConfiguration.Builder.tlsConfiguration(); - try { - final String nsspin = "/keys/%s/nsspin.txt"; - final String truststore = "/keys/%s/truststore.jks"; - final String crl = "/keys/%s/crl.pem"; - switch (type) { - case KeyStoreWrapper.KEYSTORE_TYPE_JKS: - builder - .withKeyStoreType(type) - .withKeyStorePath(toPath(String.format("/keys/%s/keystore.jks", name))) - .withKeyStorePasswordSupplier( - new FileBasedPasswordProvider(toPath(String.format(nsspin, name)))) - .withKeyStorePasswordPath(toPath(String.format(nsspin, name))) - .withTrustStoreType(type) - .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))); - break; - case KeyStoreWrapper.KEYSTORE_TYPE_PKCS12: - builder - .withKeyStoreType(type) - .withKeyStorePath(toPath(String.format("/keys/%s/keys.p12", name))) - .withKeyStorePasswordSupplier( - new FileBasedPasswordProvider(toPath(String.format(nsspin, name)))) - .withKeyStorePasswordPath(toPath(String.format(nsspin, name))) - .withTrustStoreType(KeyStoreWrapper.KEYSTORE_TYPE_JKS) - .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))); - break; - case KeyStoreWrapper.KEYSTORE_TYPE_PKCS11: - builder - .withKeyStoreType(type) - .withKeyStorePath(initNSSConfigFile(toPath(String.format("/keys/%s/nss.cfg", name)))) - .withKeyStorePasswordSupplier( - new FileBasedPasswordProvider(toPath(String.format(nsspin, name)))) - .withKeyStorePasswordPath(toPath(String.format(nsspin, name))) - .withCrlPath(toPath(String.format(crl, name))); - break; - } - } catch (final Exception e) { - throw new RuntimeException(e); - } + builder + .withKeyStoreType(KEYSTORE_TYPE_PKCS12) + .withKeyStorePath(toPath(String.format(keystorePath, clientDirName))) + .withKeyStorePasswordSupplier(() -> "test123") + // .withKeyStorePasswordPath(toPath(String.format(nsspin, name))) + .withTrustStoreType(KEYSTORE_TYPE_PKCS12) + .withTrustStorePath(toPath(String.format(truststorePath, clientDirName))) + .withTrustStorePasswordSupplier(() -> "test123") + .withCrlPath(toPath(crl)); + return Optional.of(builder.build()); } - private DefaultP2PNetwork.Builder builder(final String name) { + private DefaultP2PNetwork.Builder builder(final String clientDirName) { final MutableBlockchain blockchainMock = mock(MutableBlockchain.class); final Block blockMock = mock(Block.class); when(blockMock.getHash()).thenReturn(Hash.ZERO); @@ -500,7 +443,7 @@ public class P2PPlainNetworkTest { .vertx(vertx) .config(config) .nodeKey(NodeKeyUtils.generate()) - .p2pTLSConfiguration(p2pTLSEnabled(name, KeyStoreWrapper.KEYSTORE_TYPE_JKS)) + .p2pTLSConfiguration(p2pTLSEnabled(clientDirName)) .metricsSystem(new NoOpMetricsSystem()) .supportedCapabilities(Arrays.asList(Capability.create("eth", 63))) .storageProvider(new InMemoryKeyValueStorageProvider()) diff --git a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/TLSContextFactoryTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/TLSContextFactoryTest.java index 7170d97ea1..d89d319b87 100644 --- a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/TLSContextFactoryTest.java +++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/TLSContextFactoryTest.java @@ -15,6 +15,7 @@ package org.hyperledger.besu.ethereum.p2p.rlpx.connections.netty; import static org.assertj.core.api.Assertions.assertThat; +import static org.hyperledger.besu.pki.keystore.KeyStoreWrapper.KEYSTORE_TYPE_PKCS12; import org.hyperledger.besu.pki.PkiException; import org.hyperledger.besu.pki.keystore.HardwareKeyStoreWrapper; @@ -25,6 +26,7 @@ import java.net.InetSocketAddress; import java.nio.file.Path; import java.util.Arrays; import java.util.Collection; +import java.util.Optional; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -55,32 +57,29 @@ import org.slf4j.LoggerFactory; class TLSContextFactoryTest { - private static final String JKS = "JKS"; - private static final String validKeystorePassword = "test123"; - private static final String partner1client1PKCS11Config = "/keys/partner1client1/nss.cfg"; - private static final String partner1client1JKSKeystore = "/keys/partner1client1/keystore.jks"; - private static final String partner1client1JKSTruststore = "/keys/partner1client1/truststore.jks"; - private static final String partner1client1CRL = "/keys/partner1client1/crl.pem"; - private static final String partner1client2rvkJKSKeystore = - "/keys/partner1client2rvk/keystore.jks"; - private static final String partner1client2rvkJKSTruststore = - "/keys/partner1client2rvk/truststore.jks"; - private static final String partner2client1JKSKeystore = "/keys/partner2client1/keystore.jks"; - private static final String partner2client1JKSTruststore = "/keys/partner2client1/truststore.jks"; - private static final String partner2client1CRL = "/keys/partner2client1/crl.pem"; - private static final String invalidPartner1client1JKSKeystore = - "/keys/invalidpartner1client1/keystore.jks"; - private static final String invalidPartner1client1JKSTruststore = - "/keys/invalidpartner1client1/truststore.jks"; - private static final String invalidPartner1client1CRL = "/keys/invalidpartner1client1/crl.pem"; - private static final String partner2client2rvkJKSKeystore = - "/keys/partner2client2rvk/keystore.jks"; - private static final String partner2client2rvkJKSTruststore = - "/keys/partner2client2rvk/truststore.jks"; + // see resources/keys/README.md for setup details. + private static final String keystorePassword = "test123"; private static final Logger LOG = LoggerFactory.getLogger(TLSContextFactoryTest.class); private static final int MAX_NUMBER_MESSAGES = 10; + private static final String CRL_PEM = "/keys/crl/crl.pem"; + private static final String PARTNER1_CLIENT1_PKCS11 = "/keys/partner1client1/nss.cfg"; + private static final String PARTNER1_CLIENT1_KEYSTORE = "/keys/partner1client1/client1.p12"; + private static final String PARTNET1_CLIENT2_KEYSTORE = "/keys/partner1client2rvk/client2.p12"; + private static final String PARTNER2_CLIENT1_KEYSTORE = "/keys/partner2client1/client1.p12"; + private static final String PARTNER2_CLIENT2_KEYSTORE = "/keys/partner2client2rvk/client2.p12"; + private static final String INVALIDPARTNER1_CLIENT1_KEYSTORE = + "/keys/invalidpartner1client1/client1.p12"; + + private static final String PARTNER1_CLIENT1_TRUSTSTORE = "/keys/partner1client1/truststore.p12"; + private static final String PARTNET1_CLIENT2_TRUSTSTORE = + "/keys/partner1client2rvk/truststore.p12"; + private static final String PARTNER2_CLIENT1_TRUSTSTORE = "/keys/partner2client1/truststore.p12"; + private static final String PARTNER2_CLIENT2_TRUSTSTORE = + "/keys/partner2client2rvk/truststore.p12"; + private static final String INVALIDPARTNER1_CLIENT1_TRUSTSTORE = + "/keys/invalidpartner1client1/truststore.p12"; private Server server; private Client client; @@ -89,27 +88,31 @@ class TLSContextFactoryTest { return Arrays.asList( new Object[][] { { - "PKCS11 serverPartner1Client1 -> JKS clientPartner2Client1 SuccessfulConnection", + "PKCS11 server Partner1 Client1 -> PKCS12 client Partner2 Client1 SuccessfulConnection", true, - getHardwareKeyStoreWrapper(partner1client1PKCS11Config, partner1client1CRL), + getHardwareKeyStoreWrapper(PARTNER1_CLIENT1_PKCS11, CRL_PEM), getSoftwareKeyStoreWrapper( - partner2client1JKSKeystore, partner2client1JKSTruststore, partner2client1CRL) + PARTNER2_CLIENT1_KEYSTORE, PARTNER2_CLIENT1_TRUSTSTORE, CRL_PEM), + Optional.empty(), + Optional.empty() }, { - "PKCS11 serverPartner1Client1 -> JKS clientInvalidPartner1Client1 FailedConnection", + "PKCS11 server Partner1 Client1 -> PKCS12 client InvalidPartner1 Client1 FailedConnection", false, - getHardwareKeyStoreWrapper(partner1client1PKCS11Config, partner1client1CRL), + getHardwareKeyStoreWrapper(PARTNER1_CLIENT1_PKCS11, CRL_PEM), getSoftwareKeyStoreWrapper( - invalidPartner1client1JKSKeystore, - invalidPartner1client1JKSTruststore, - invalidPartner1client1CRL) + INVALIDPARTNER1_CLIENT1_KEYSTORE, INVALIDPARTNER1_CLIENT1_TRUSTSTORE, null), + Optional.empty(), + Optional.of("certificate_unknown") }, { - "PKCS11 serverPartner1Client1 -> JKS clientPartner1Client2rvk FailedConnection", + "PKCS11 server Partner1 Client1 -> PKCS12 client Partner2 Client2 revoked FailedConnection", false, - getHardwareKeyStoreWrapper(partner1client1PKCS11Config, partner1client1CRL), + getHardwareKeyStoreWrapper(PARTNER1_CLIENT1_PKCS11, CRL_PEM), getSoftwareKeyStoreWrapper( - partner1client2rvkJKSKeystore, partner1client2rvkJKSTruststore, null) + PARTNER2_CLIENT2_KEYSTORE, PARTNER2_CLIENT2_TRUSTSTORE, null), + Optional.of("Certificate revoked"), + Optional.of("certificate_unknown") }, }); } @@ -118,72 +121,84 @@ class TLSContextFactoryTest { return Arrays.asList( new Object[][] { { - "JKS serverPartner1Client1 -> JKS clientPartner2Client1 SuccessfulConnection", + "PKCS12 server Partner1 Client1 -> PKCS12 client Partner2 Client1 SuccessfulConnection", true, getSoftwareKeyStoreWrapper( - partner1client1JKSKeystore, partner1client1JKSTruststore, partner1client1CRL), + PARTNER1_CLIENT1_KEYSTORE, PARTNER1_CLIENT1_TRUSTSTORE, CRL_PEM), getSoftwareKeyStoreWrapper( - partner2client1JKSKeystore, partner2client1JKSTruststore, partner2client1CRL) + PARTNER2_CLIENT1_KEYSTORE, PARTNER2_CLIENT1_TRUSTSTORE, CRL_PEM), + Optional.empty(), + Optional.empty() }, { - "JKS serverPartner2Client1 -> JKS clientPartner1Client1 SuccessfulConnection", + "PKCS12 server Partner2 Client1 -> PKCS12 client Partner1 Client1 SuccessfulConnection", true, getSoftwareKeyStoreWrapper( - partner2client1JKSKeystore, partner2client1JKSTruststore, partner2client1CRL), + PARTNER2_CLIENT1_KEYSTORE, PARTNER2_CLIENT1_TRUSTSTORE, CRL_PEM), getSoftwareKeyStoreWrapper( - partner1client1JKSKeystore, partner1client1JKSTruststore, partner1client1CRL) + PARTNER1_CLIENT1_KEYSTORE, PARTNER1_CLIENT1_TRUSTSTORE, CRL_PEM), + Optional.empty(), + Optional.empty() }, { - "JKS serverPartner1Client1 -> JKS clientInvalidPartner1Client1 FailedConnection", + "PKCS12 server Partner1 Client1 -> PKCS12 client InvalidPartner1 Client1 FailedConnection", false, getSoftwareKeyStoreWrapper( - partner1client1JKSKeystore, partner1client1JKSTruststore, partner1client1CRL), + PARTNER1_CLIENT1_KEYSTORE, PARTNER1_CLIENT1_TRUSTSTORE, CRL_PEM), getSoftwareKeyStoreWrapper( - invalidPartner1client1JKSKeystore, - invalidPartner1client1JKSTruststore, - invalidPartner1client1CRL) + INVALIDPARTNER1_CLIENT1_KEYSTORE, INVALIDPARTNER1_CLIENT1_TRUSTSTORE, null), + Optional.empty(), + Optional.of("certificate_unknown") }, { - "JKS serverInvalidPartner1Client1 -> JKS clientPartner1Client1 FailedConnection", + "PKCS12 server InvalidPartner1 Client1 -> PKCS12 client Partner1 Client1 FailedConnection", false, getSoftwareKeyStoreWrapper( - invalidPartner1client1JKSKeystore, - invalidPartner1client1JKSTruststore, - invalidPartner1client1CRL), + INVALIDPARTNER1_CLIENT1_KEYSTORE, INVALIDPARTNER1_CLIENT1_TRUSTSTORE, null), getSoftwareKeyStoreWrapper( - partner1client1JKSKeystore, partner1client1JKSTruststore, partner1client1CRL) + PARTNER1_CLIENT1_KEYSTORE, PARTNER1_CLIENT1_TRUSTSTORE, CRL_PEM), + Optional.of("certificate_unknown"), + Optional.empty() }, { - "JKS serverPartner1Client2rvk -> JKS clientPartner2Client1 FailedConnection", + "PKCS12 server Partner1 Client2 (revoked) -> PKCS12 client Partner2 Client1 FailedConnection", false, getSoftwareKeyStoreWrapper( - partner1client2rvkJKSKeystore, partner1client2rvkJKSTruststore, null), + PARTNET1_CLIENT2_KEYSTORE, PARTNET1_CLIENT2_TRUSTSTORE, null), getSoftwareKeyStoreWrapper( - partner2client1JKSKeystore, partner2client1JKSTruststore, partner2client1CRL) + PARTNER2_CLIENT1_KEYSTORE, PARTNER2_CLIENT1_TRUSTSTORE, CRL_PEM), + Optional.empty(), + Optional.of("Certificate revoked") }, { - "JKS serverPartner2Client1 -> JKS clientPartner1Client2rvk FailedConnection", + "PKCS12 server Partner2 Client1 -> PKCS12 client Partner1 Client2 (revoked) FailedConnection", false, getSoftwareKeyStoreWrapper( - partner2client1JKSKeystore, partner2client1JKSTruststore, partner2client1CRL), + PARTNER2_CLIENT1_KEYSTORE, PARTNER2_CLIENT1_TRUSTSTORE, CRL_PEM), getSoftwareKeyStoreWrapper( - partner1client2rvkJKSKeystore, partner1client2rvkJKSTruststore, null) + PARTNET1_CLIENT2_KEYSTORE, PARTNET1_CLIENT2_TRUSTSTORE, null), + Optional.of("Certificate revoked"), + Optional.of("certificate_unknown") }, { - "JKS serverPartner2Client2rvk -> JKS clientPartner1Client1 FailedConnection", + "PKCS12 server Partner2 Client2 (revoked) -> PKCS12 client Partner1 Client1 FailedConnection", false, getSoftwareKeyStoreWrapper( - partner2client2rvkJKSKeystore, partner2client2rvkJKSTruststore, null), + PARTNER2_CLIENT2_KEYSTORE, PARTNER2_CLIENT2_TRUSTSTORE, null), getSoftwareKeyStoreWrapper( - partner1client1JKSKeystore, partner1client1JKSTruststore, partner1client1CRL) + PARTNER1_CLIENT1_KEYSTORE, PARTNER1_CLIENT1_TRUSTSTORE, CRL_PEM), + Optional.empty(), + Optional.of("Certificate revoked"), }, { - "JKS serverPartner1Client1 -> JKS clientPartner2Client2rvk FailedConnection", + "PKCS12 server Partner1 Client1 -> PKCS12 client Partner2 Client2 (revoked) FailedConnection", false, getSoftwareKeyStoreWrapper( - partner1client1JKSKeystore, partner1client1JKSTruststore, partner1client1CRL), + PARTNER1_CLIENT1_KEYSTORE, PARTNER1_CLIENT1_TRUSTSTORE, CRL_PEM), getSoftwareKeyStoreWrapper( - partner2client2rvkJKSKeystore, partner2client2rvkJKSTruststore, null) + PARTNER2_CLIENT2_KEYSTORE, PARTNER2_CLIENT2_TRUSTSTORE, null), + Optional.of("Certificate revoked"), + Optional.of("certificate_unknown") } }); } @@ -208,8 +223,7 @@ class TLSContextFactoryTest { private static KeyStoreWrapper getHardwareKeyStoreWrapper( final String config, final String crlLocation) { try { - return new HardwareKeyStoreWrapper( - validKeystorePassword, toPath(config), toPath(crlLocation)); + return new HardwareKeyStoreWrapper(keystorePassword, toPath(config), toPath(crlLocation)); } catch (final Exception e) { if (OS.MAC.isCurrentOs()) { // nss3 is difficult to setup on mac correctly, don't let it break unit tests for dev @@ -225,12 +239,12 @@ class TLSContextFactoryTest { final String jksKeyStore, final String trustStore, final String crl) { try { return new SoftwareKeyStoreWrapper( - JKS, + KEYSTORE_TYPE_PKCS12, toPath(jksKeyStore), - validKeystorePassword, - JKS, + keystorePassword, + KEYSTORE_TYPE_PKCS12, toPath(trustStore), - null, + keystorePassword, toPath(crl)); } catch (final Exception e) { throw new PkiException("Failed to initialize software keystore", e); @@ -243,9 +257,16 @@ class TLSContextFactoryTest { final String ignoredTestDescription, final boolean testSuccess, final KeyStoreWrapper serverKeyStoreWrapper, - final KeyStoreWrapper clientKeyStoreWrapper) + final KeyStoreWrapper clientKeyStoreWrapper, + final Optional serverFailureMessage, + final Optional clientFailureMessage) throws Exception { - testConnection(testSuccess, serverKeyStoreWrapper, clientKeyStoreWrapper); + testConnection( + testSuccess, + serverKeyStoreWrapper, + clientKeyStoreWrapper, + serverFailureMessage, + clientFailureMessage); } @ParameterizedTest(name = "{index}: {0}") @@ -254,15 +275,24 @@ class TLSContextFactoryTest { final String ignoredTestDescription, final boolean testSuccess, final KeyStoreWrapper serverKeyStoreWrapper, - final KeyStoreWrapper clientKeyStoreWrapper) + final KeyStoreWrapper clientKeyStoreWrapper, + final Optional serverFailureMessage, + final Optional clientFailureMessage) throws Exception { - testConnection(testSuccess, serverKeyStoreWrapper, clientKeyStoreWrapper); + testConnection( + testSuccess, + serverKeyStoreWrapper, + clientKeyStoreWrapper, + serverFailureMessage, + clientFailureMessage); } private void testConnection( final boolean testSuccess, final KeyStoreWrapper serverKeyStoreWrapper, - final KeyStoreWrapper clientKeyStoreWrapper) + final KeyStoreWrapper clientKeyStoreWrapper, + final Optional serverFailureMessage, + final Optional clientFailureMessage) throws Exception { final CountDownLatch serverLatch = new CountDownLatch(MAX_NUMBER_MESSAGES); final CountDownLatch clientLatch = new CountDownLatch(MAX_NUMBER_MESSAGES); @@ -279,6 +309,20 @@ class TLSContextFactoryTest { client.getChannelFuture().channel().writeAndFlush(Unpooled.copyInt(0)).sync(); serverLatch.await(2, TimeUnit.SECONDS); assertThat(client.getChannelFuture().channel().isActive()).isFalse(); + + if (serverFailureMessage.isPresent()) { + assertThat(server.getCause()).isNotEmpty(); + assertThat(server.getCause().get()).hasMessageContaining(serverFailureMessage.get()); + } else { + assertThat(server.getCause()).isEmpty(); + } + + if (clientFailureMessage.isPresent()) { + assertThat(client.getCause()).isNotEmpty(); + assertThat(client.getCause().get()).hasMessageContaining(clientFailureMessage.get()); + } else { + assertThat(client.getCause()).isEmpty(); + } } catch (final Exception e) { // NOOP } @@ -288,7 +332,7 @@ class TLSContextFactoryTest { private Server startServer(final KeyStoreWrapper keyStoreWrapper, final CountDownLatch latch) throws Exception { - final Server nettyServer = new Server(validKeystorePassword, keyStoreWrapper, latch); + final Server nettyServer = new Server(keystorePassword, keyStoreWrapper, latch); nettyServer.start(); return nettyServer; } @@ -297,7 +341,7 @@ class TLSContextFactoryTest { final int port, final KeyStoreWrapper keyStoreWrapper, final CountDownLatch latch) throws Exception { - final Client nettyClient = new Client(port, validKeystorePassword, keyStoreWrapper, latch); + final Client nettyClient = new Client(port, keystorePassword, keyStoreWrapper, latch); nettyClient.start(); return nettyClient; } @@ -306,6 +350,8 @@ class TLSContextFactoryTest { private final String id; private final CountDownLatch latch; + private Throwable cause; + MessageHandler(final String id, final CountDownLatch latch) { this.id = id; this.latch = latch; @@ -325,6 +371,16 @@ class TLSContextFactoryTest { LOG.info("Remaining {}", this.latch.getCount()); } } + + @Override + public void exceptionCaught(final ChannelHandlerContext ctx, final Throwable cause) + throws Exception { + this.cause = cause; + } + + public Optional getCause() { + return Optional.ofNullable(cause); + } } static class Client { @@ -335,6 +391,7 @@ class TLSContextFactoryTest { private ChannelFuture channelFuture; private final EventLoopGroup group = new NioEventLoopGroup(); + private MessageHandler messageHandler; ChannelFuture getChannelFuture() { return channelFuture; @@ -365,8 +422,8 @@ class TLSContextFactoryTest { final SslHandler sslHandler = sslContext.newHandler(socketChannel.alloc()); socketChannel.pipeline().addFirst("ssl", sslHandler); - - socketChannel.pipeline().addLast(new MessageHandler("Client", latch)); + messageHandler = new MessageHandler("Client", latch); + socketChannel.pipeline().addLast(messageHandler); } }); @@ -375,6 +432,11 @@ class TLSContextFactoryTest { void stop() { group.shutdownGracefully(); + messageHandler = null; + } + + Optional getCause() { + return messageHandler != null ? messageHandler.getCause() : Optional.empty(); } } @@ -389,6 +451,8 @@ class TLSContextFactoryTest { private final EventLoopGroup parentGroup = new NioEventLoopGroup(); private final EventLoopGroup childGroup = new NioEventLoopGroup(); + private MessageHandler messageHandler; + Server( final String keystorePassword, final KeyStoreWrapper keyStoreWrapper, @@ -412,7 +476,9 @@ class TLSContextFactoryTest { final SslHandler sslHandler = sslContext.newHandler(channel.alloc()); socketChannel.pipeline().addFirst("ssl", sslHandler); - socketChannel.pipeline().addLast(new MessageHandler("Server", latch)); + socketChannel + .pipeline() + .addLast(messageHandler = new MessageHandler("Server", latch)); } }); @@ -425,5 +491,9 @@ class TLSContextFactoryTest { childGroup.shutdownGracefully(); parentGroup.shutdownGracefully(); } + + Optional getCause() { + return messageHandler != null ? messageHandler.getCause() : Optional.empty(); + } } } diff --git a/ethereum/p2p/src/test/resources/keys/README.md b/ethereum/p2p/src/test/resources/keys/README.md new file mode 100644 index 0000000000..9c567f2f22 --- /dev/null +++ b/ethereum/p2p/src/test/resources/keys/README.md @@ -0,0 +1,241 @@ +Following instructions were used to set up various certificates and keystores. + +The certificates hierarchy +~~~ + root.ca.besu.com + | + inter.ca.besu.com + | +partner1.ca.besu.com partner2.ca.besu.com + | | +client1.partner1.besu.com client1.partner2.besu.com +client2.partner1.besu.com client2.partner2.besu.com +~~~ + +Partner1 clients +Client1 - EC key, backed by PKCS11/nssdb as well. +Client2 - in certificate revoked list (CRL) + +Partner2 clients +Client1 +Client2 - in certificate revoked list (CRL) + +InvalidPartner1 clients +Client1 - not trusted by Partner1 and Partner2 due to different CA hierarchy + + + +## Lib NSS Setup Instructions: +Linux: `sudo apt install libnss3-tools` +Mac OS: +1. `brew install nss` +2. Create symlink for libnss3 and lonsoftokn3 in your JDK's lib (or update LD_LIBRARY_PATH globally) +~~~ +ln -s /opt/homebrew/lib/libnss3.dylib /lib/libnss3.dylib +ln -s /opt/homebrew/lib/libsoftokn3.dylib /lib/libsoftokn3.dylib +~~~ + +## Root CA, InterCA, partner1 CA, partner2 CA +All the CA keystores will be generated in `ca_certs` directory. + +Generate Root CA (validity 100 years) +~~~ +export ROOT_CA_KS=root_ca.p12 +export INTER_CA_KS=inter_ca.p12 +export PARTNER1_CA_KS=partner1_ca.p12 +export PARTNER2_CA_KS=partner2_ca.p12 +~~~ +~~~ +keytool -genkeypair -alias root_ca -dname "CN=root.ca.besu.com" -ext bc:c -keyalg RSA \ +-sigalg SHA256WithRSA -validity 36500 \ +-storepass test123 \ +-keystore $ROOT_CA_KS + +keytool -genkeypair -alias inter_ca -dname "CN=inter.ca.besu.com" \ +-ext bc:c=ca:true,pathlen:1 -ext ku:c=dS,kCS,cRLs \ +-keyalg RSA -sigalg SHA256WithRSA -validity 36500 \ +-storepass test123 \ +-keystore $INTER_CA_KS + +keytool -genkeypair -alias partner1_ca -dname "CN=partner1.ca.besu.com" \ +-ext bc:c=ca:true,pathlen:0 -ext ku:c=dS,kCS,cRLs \ +-keyalg RSA -sigalg SHA256WithRSA -validity 36500 \ +-storepass test123 \ +-keystore $PARTNER1_CA_KS + +keytool -genkeypair -alias partner2_ca -dname "CN=partner2.ca.besu.com" \ +-ext bc:c=ca:true,pathlen:0 -ext ku:c=dS,kCS,cRLs \ +-keyalg RSA -sigalg SHA256WithRSA -validity 36500 \ +-storepass test123 \ +-keystore $PARTNER2_CA_KS +~~~ + +CSR, Signing and re-import +~~~ +keytool -storepass test123 -keystore $ROOT_CA_KS -alias root_ca -exportcert -rfc > root_ca.pem + +keytool -storepass test123 -keystore $INTER_CA_KS -certreq -alias inter_ca \ +| keytool -storepass test123 -keystore $ROOT_CA_KS -gencert -alias root_ca \ +-ext bc:c=ca:true,pathlen:1 -ext ku:c=dS,kCS,cRLs -rfc > inter_ca.pem + +cat root_ca.pem >> inter_ca.pem + +keytool -keystore $INTER_CA_KS -importcert -alias inter_ca \ +-storepass test123 -noprompt -file ./inter_ca.pem + +keytool -storepass test123 -keystore $PARTNER1_CA_KS -certreq -alias partner1_ca \ +| keytool -storepass test123 -keystore $INTER_CA_KS -gencert -alias inter_ca \ +-ext bc:c=ca:true,pathlen:0 -ext ku:c=dS,kCS,cRLs -rfc > partner1_ca.pem + +keytool -storepass test123 -keystore $PARTNER2_CA_KS -certreq -alias partner2_ca \ +| keytool -storepass test123 -keystore $INTER_CA_KS -gencert -alias inter_ca \ +-ext bc:c=ca:true,pathlen:0 -ext ku:c=dS,kCS,cRLs -rfc > partner2_ca.pem + +cat root_ca.pem >> partner1_ca.pem +cat root_ca.pem >> partner2_ca.pem + +keytool -keystore $PARTNER1_CA_KS -importcert -alias partner1_ca \ +-storepass test123 -noprompt -file ./partner1_ca.pem + +keytool -keystore $PARTNER2_CA_KS -importcert -alias partner2_ca \ +-storepass test123 -noprompt -file ./partner2_ca.pem +~~~ + +--- + +## Client certificates +Following folder names are used +- +- `partner1client1` +- `partner1client2rvk` +- `partner2client1` +- `partner2client2rvk` + +Modify the partner and client variables while running following commands accordingly. + +## Truststore +Create truststore for each partner and copy in appropriate client directories +~~~ +export OU=partner1 + +keytool -import -trustcacerts -alias root_ca \ +-file ./ca_certs/root_ca.pem -keystore truststore.p12 \ +-storepass test123 -noprompt + +keytool -import -trustcacerts -alias inter_ca \ +-file ./ca_certs/inter_ca.pem -keystore truststore.p12 \ +-storepass test123 -noprompt + +keytool -import -trustcacerts -alias ${OU}_ca \ +-file ./ca_certs/${OU}_ca.pem -keystore truststore.p12 \ +-storepass test123 -noprompt + +~~~ + +Cd to appropriate client directory and generate the certificates. +Note: The keyalg for partner1client1 is different than others + +Modify the export command. +~~~ +export OU=partner1 +export CLIENT=client1 +~~~ + +EC Key generation (for partner1 client 1) +~~~ +keytool -genkeypair -keystore $CLIENT.p12 -storepass test123 -alias $CLIENT \ +-keyalg EC -groupname secp256r1 -validity 36500 \ +-dname "CN=$CLIENT.$OU.besu.com, OU=$OU, O=Besu, L=Brisbane, ST=QLD, C=AU" \ +-ext san=dns:localhost,ip:127.0.0.1 +~~~ +RSA key generation +~~~ +keytool -genkeypair -keystore $CLIENT.p12 -storepass test123 -alias $CLIENT \ +-keyalg RSA -validity 36500 \ +-dname "CN=$CLIENT.$OU.besu.com, OU=$OU, O=Besu, L=Brisbane, ST=QLD, C=AU" \ +-ext san=dns:localhost,ip:127.0.0.1 +~~~ + +CSR and reimport +~~~ +keytool -storepass test123 -keystore "$CLIENT.p12" -certreq -alias $CLIENT \ +| keytool -storepass test123 -keystore "../ca_certs/${OU}_ca.p12" -gencert -alias ${OU}_ca \ +-ext ku:c=digitalSignature,nonRepudiation,keyEncipherment -ext eku=sA,cA -rfc > "$CLIENT.pem" + +cat ../ca_certs/root_ca.pem >> $CLIENT.pem + +keytool -keystore $CLIENT.p12 -importcert -alias $CLIENT \ +-storepass test123 -noprompt -file ./$CLIENT.pem +~~~ + +Verify +~~~ +keytool -keystore $CLIENT.p12 -storepass test123 -list -v +~~~ + + +## NSS database setup +The nss database will be setup in `partner1client1` directory. + +Initialize empty nss database. Modify client and OU export. +~~~ +export CLIENT=client1 +export OU=partner1 + +mkdir nssdb +echo "test123" > nsspin.txt +certutil -N -d sql:nssdb -f nsspin.txt +touch ./nssdb/secmod.db +~~~ + +Import client1 keystore into nss +~~~ +pk12util -i ./$CLIENT.p12 -d sql:nssdb -k nsspin.txt -W test123 +certutil -M -n "CN=root.ca.besu.com" -t CT,C,C -d sql:nssdb -f ./nsspin.txt +certutil -M -n "CN=inter.ca.besu.com" -t CT,C,C -d sql:nssdb -f ./nsspin.txt +certutil -M -n "CN=${OU}.ca.besu.com" -t CT,C,C -d sql:nssdb -f ./nsspin.txt + +certutil -d sql:nssdb -f nsspin.txt -L +~~~ + +PKCS11 Configuration file +~~~ +cat <./nss.cfg +name = NSScrypto-${OU}-${CLIENT} +nssSecmodDirectory = ./src/test/resources/keys/partner1client1/nssdb +nssDbMode = readOnly +nssModule = keystore +showInfo = true +EOF +~~~ + +## CRL certificate +As mentioned at the start of README, `partner1client2` and `partner2client2` certificates are in revoke list. +The crl list is maintained under `crl` folder. + +Partner1 and Partner2 private keys are required to exported in pem format. + +Following operations are performed under `crl` folder. +_Note: On Mac OS, using `gnutls-certtool`. On Linux, `certtool` can be used._ + +~~~ +openssl pkcs12 -nodes -in ../ca_certs/partner1_ca.p12 -out partner1_ca_key.pem -passin pass:test123 -nocerts +openssl pkcs12 -nodes -in ../ca_certs/partner1_ca.p12 -out partner1_ca.pem -passin pass:test123 -nokeys + +openssl pkcs12 -nodes -in ../ca_certs/partner2_ca.p12 -out partner2_ca_key.pem -passin pass:test123 -nocerts +openssl pkcs12 -nodes -in ../ca_certs/partner2_ca.p12 -out partner2_ca.pem -passin pass:test123 -nokeys + +openssl pkcs12 -nokeys -clcerts -in ../partner1client2rvk/client2.p12 -out partner1client2.pem -passin pass:test123 +openssl pkcs12 -nokeys -clcerts -in ../partner2client2rvk/client2.p12 -out partner2client2.pem -passin pass:test123 + +gnutls-certtool --generate-crl --load-ca-privkey ./partner1_ca_key.pem --load-ca-certificate ./partner1_ca.pem \ +--load-certificate ./partner1client2.pem >> crl.pem +gnutls-certtool --generate-crl --load-ca-privkey ./partner2_ca_key.pem --load-ca-certificate ./partner2_ca.pem \ +--load-certificate ./partner2client2.pem >> crl.pem + +keytool -printcrl -file ./crl.pem + +rm *_ca_key.pem +rm *_ca.pem +rm *client2.pem +~~~ diff --git a/ethereum/p2p/src/test/resources/keys/ca_certs/inter_ca.p12 b/ethereum/p2p/src/test/resources/keys/ca_certs/inter_ca.p12 new file mode 100644 index 0000000000..9273cd3510 Binary files /dev/null and b/ethereum/p2p/src/test/resources/keys/ca_certs/inter_ca.p12 differ diff --git a/ethereum/p2p/src/test/resources/keys/ca_certs/partner1_ca.p12 b/ethereum/p2p/src/test/resources/keys/ca_certs/partner1_ca.p12 new file mode 100644 index 0000000000..cf0c5920bc Binary files /dev/null and b/ethereum/p2p/src/test/resources/keys/ca_certs/partner1_ca.p12 differ diff --git a/ethereum/p2p/src/test/resources/keys/ca_certs/partner2_ca.p12 b/ethereum/p2p/src/test/resources/keys/ca_certs/partner2_ca.p12 new file mode 100644 index 0000000000..b5c1504fe5 Binary files /dev/null and b/ethereum/p2p/src/test/resources/keys/ca_certs/partner2_ca.p12 differ diff --git a/ethereum/p2p/src/test/resources/keys/ca_certs/root_ca.p12 b/ethereum/p2p/src/test/resources/keys/ca_certs/root_ca.p12 new file mode 100644 index 0000000000..e5b8bdd364 Binary files /dev/null and b/ethereum/p2p/src/test/resources/keys/ca_certs/root_ca.p12 differ diff --git a/ethereum/p2p/src/test/resources/keys/crl/crl.pem b/ethereum/p2p/src/test/resources/keys/crl/crl.pem new file mode 100644 index 0000000000..39839805ee --- /dev/null +++ b/ethereum/p2p/src/test/resources/keys/crl/crl.pem @@ -0,0 +1,24 @@ +-----BEGIN X509 CRL----- +MIIBxDCBrQIBATANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDExRwYXJ0bmVyMS5j +YS5iZXN1LmNvbRcNMjMwMjAyMDEyOTIyWhcNMjQwMjAyMDEyOTI4WjAXMBUCBEn+ +j9gXDTIzMDIwMjAxMjkyMlqgQTA/MB8GA1UdIwQYMBaAFBIuwtMGbq3lv8zRoPbk +RVU3C7+cMBwGA1UdFAQVAhNj2xH4Eap56JBF7NBDmVvkj4otMA0GCSqGSIb3DQEB +CwUAA4IBAQAsMhdgnStf7oA0NpamCprGZ8AZMzbQbfFRe0C1j/BC2UCbziLXyn5o +wEAz/2XHjbiEOW5/ocJHvZVwMCAB14gjQ9weLmIDzpkDSepnrH0EfLPM8zHmEElM +nDN3L8f0z7fbk1zzpTcWfUSs7T5WYkrJLpwEZjXgbMFtR/YpjzFCWu1er54B78sL +CRxit3+/y52bT4wCRyew2w8E0TAA023IRyPnFPetGy1EoBSyENSf29dwZS1X5Bmm +OVUCpN9eGMGIgzEimhqhn1xRWvJ8sZ1xSvLO8ztW3gjtAGfmq3kUnQQLBq9iitCt +yzPPZzL7zUQ3UCIl6n268dgrvO7XQdJK +-----END X509 CRL----- +-----BEGIN X509 CRL----- +MIIBxDCBrQIBATANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDExRwYXJ0bmVyMi5j +YS5iZXN1LmNvbRcNMjMwMjAyMDEyOTI5WhcNMjQwMjAyMDEyOTMxWjAXMBUCBGNz +oxQXDTIzMDIwMjAxMjkyOVqgQTA/MB8GA1UdIwQYMBaAFD9/xcIxAL/W332b3jmJ +/oCeelKZMBwGA1UdFAQVAhNj2xH7OlhXIEZ9qsmcOEjl+WQCMA0GCSqGSIb3DQEB +CwUAA4IBAQCFgGbrw0K8w/qS4TF5qNx5zbjIQ/cH5aZ89iRn8fq7CvYH0gwJmp3b +Eu0l2FP+Lqod1HiUN90hePDV+rhYqsJQ9f03oYOQKJZ7b7QHvgVENwXmVr/CgWnU +qn00scsT4SDm/lXxFu8Lb0JaR58z/mRisZMmDBPx5JFBlbt6HZNN1EYD8lMpu02I +aI7+KHIIRWYgRgi0yGYo74GfO/ER+PozTr755W7UTgdlYu4sPEcPrFidoLVycEoe +a0N79gZ3X6pgSoIhghrAp3MxP2xCeMBQrht96Y2CBsTtUBrrQoyX+u1UkwI7FO1u +WDJulTIKBHKXffd1bMOcQEEfsY4/2ZO9 +-----END X509 CRL----- diff --git a/ethereum/p2p/src/test/resources/keys/invalidpartner1client1/client1.p12 b/ethereum/p2p/src/test/resources/keys/invalidpartner1client1/client1.p12 new file mode 100644 index 0000000000..09ffa23508 Binary files /dev/null and b/ethereum/p2p/src/test/resources/keys/invalidpartner1client1/client1.p12 differ diff --git a/ethereum/p2p/src/test/resources/keys/invalidpartner1client1/crl.pem b/ethereum/p2p/src/test/resources/keys/invalidpartner1client1/crl.pem deleted file mode 100644 index 48552756f2..0000000000 --- a/ethereum/p2p/src/test/resources/keys/invalidpartner1client1/crl.pem +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN X509 CRL----- -MIICBDCB7QIBATANBgkqhkiG9w0BAQsFADCBgTELMAkGA1UEBhMCVVMxCzAJBgNV -BAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJBgNVBAoMAk1DMQ0wCwYDVQQLDARyb290 -MRMwEQYDVQQDDApwYXJ0bmVyMWNhMSYwJAYJKoZIhvcNAQkBFhdwYXJ0bmVyMWNh -QHBhcnRuZXIxLmNvbRcNMjEwNjA3MTkxNzI4WhcNMjIwNjA3MTkxNzI4WjAnMCUC -FFFuSkrE8m/dVEcso4PkZUFYmvFBFw0yMTA2MDcxOTE3MjhaoA4wDDAKBgNVHRQE -AwIBADANBgkqhkiG9w0BAQsFAAOCAQEAQujFul5rvGr4yytm/mjPQdcbeSTM3uT/ -aFM6WbPE6DHx5/R1ItNCyA7YdfxzojfZ+kzR7j0WsSydWT2TngHD/2C6tIhXZRcG -UG6E473xniLFctn0FYyKZL03pOwdQgWk4dCUd3Ko8Qbos+vTRClXPMnPANPwJjYG -7x1UlEPShHaoQNiDakuUa6fGZyyFGbTWuH1zltH3aUKh/L2w1/Sndkv66Cmr4VQ0 -s/ZsMnjJNPrjZJs32BzjxVaWYToe6vpwiQ6+UGyaZ3GTfv6r/oTWeRxcmQeXAT03 -kxbwywkQwFndeC9NlrOQRM+TipsOybeiJToQskmPiEJ/7xfUAHOV3w== ------END X509 CRL----- ------BEGIN X509 CRL----- -MIICLDCCARQCAQEwDQYJKoZIhvcNAQELBQAwgYExCzAJBgNVBAYTAlVTMQswCQYD -VQQIDAJDQTEMMAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9v -dDETMBEGA1UEAwwKcGFydG5lcjJjYTEmMCQGCSqGSIb3DQEJARYXcGFydG5lcjJj -YUBwYXJ0bmVyMi5jb20XDTIxMDYwNzE5MTcyOFoXDTIyMDYwNzE5MTcyOFowTjAl -AhQtbA3PphdVjORDUvomlgGblf8OABcNMjEwNjA3MTkxNzI4WjAlAhRRbkpKxPJv -3VRHLKOD5GVBWJrxQRcNMjEwNjA3MTkxNzI4WqAOMAwwCgYDVR0UBAMCAQEwDQYJ -KoZIhvcNAQELBQADggEBAJXmtYDcF+sA0zQiRiCOIALVUQ4i0t4UwREEL7SEzD9C -hAOas0uFwkPef1hQWNkvx+OghFb3fStKS1zh9zbJx0fxyKttfsaaW2dQX4H8tyRR -vtuNtZBv/PT2ouWdpumSh9TmQUxKr/Uer5gGaqOm1S5MOemOVEYfsNqAzSnGI7f9 -v5yMDywigHfv2dmM7xpttSZG3WCd5w0PJisndyAV/qga3CQMI5X6DIpWHmHbcD3k -sSps2YggdueW7y61uoi61jvpOGTbr6UAWLjHRyL35txC9xOMGJgJqBgebw/hGmW9 -syY2loiEfzWX0A/9KGPo6Q8PB2YJbMmc7WT04g5W++8= ------END X509 CRL----- diff --git a/ethereum/p2p/src/test/resources/keys/invalidpartner1client1/inter_ca.p12 b/ethereum/p2p/src/test/resources/keys/invalidpartner1client1/inter_ca.p12 new file mode 100644 index 0000000000..5cf36ad031 Binary files /dev/null and b/ethereum/p2p/src/test/resources/keys/invalidpartner1client1/inter_ca.p12 differ diff --git a/ethereum/p2p/src/test/resources/keys/invalidpartner1client1/keys.p12 b/ethereum/p2p/src/test/resources/keys/invalidpartner1client1/keys.p12 deleted file mode 100644 index 1f2177ec00..0000000000 Binary files a/ethereum/p2p/src/test/resources/keys/invalidpartner1client1/keys.p12 and /dev/null differ diff --git a/ethereum/p2p/src/test/resources/keys/invalidpartner1client1/keystore.jks b/ethereum/p2p/src/test/resources/keys/invalidpartner1client1/keystore.jks deleted file mode 100644 index ca47494a49..0000000000 Binary files a/ethereum/p2p/src/test/resources/keys/invalidpartner1client1/keystore.jks and /dev/null differ diff --git a/ethereum/p2p/src/test/resources/keys/invalidpartner1client1/nss.cfg b/ethereum/p2p/src/test/resources/keys/invalidpartner1client1/nss.cfg deleted file mode 100644 index 6395ab8a93..0000000000 --- a/ethereum/p2p/src/test/resources/keys/invalidpartner1client1/nss.cfg +++ /dev/null @@ -1,6 +0,0 @@ - -name = NSScrypto-invalidpartner1client1 -nssSecmodDirectory = ./src/test/resources/keys/invalidpartner1client1/nssdb -nssDbMode = readOnly -nssModule = keystore - diff --git a/ethereum/p2p/src/test/resources/keys/invalidpartner1client1/nssdb/cert8.db b/ethereum/p2p/src/test/resources/keys/invalidpartner1client1/nssdb/cert8.db deleted file mode 100644 index f81e235309..0000000000 Binary files a/ethereum/p2p/src/test/resources/keys/invalidpartner1client1/nssdb/cert8.db and /dev/null differ diff --git a/ethereum/p2p/src/test/resources/keys/invalidpartner1client1/nssdb/key3.db b/ethereum/p2p/src/test/resources/keys/invalidpartner1client1/nssdb/key3.db deleted file mode 100644 index 8de80d0657..0000000000 Binary files a/ethereum/p2p/src/test/resources/keys/invalidpartner1client1/nssdb/key3.db and /dev/null differ diff --git a/ethereum/p2p/src/test/resources/keys/invalidpartner1client1/nssdb/secmod.db b/ethereum/p2p/src/test/resources/keys/invalidpartner1client1/nssdb/secmod.db deleted file mode 100644 index 60fc82d1e0..0000000000 Binary files a/ethereum/p2p/src/test/resources/keys/invalidpartner1client1/nssdb/secmod.db and /dev/null differ diff --git a/ethereum/p2p/src/test/resources/keys/invalidpartner1client1/nsspin.txt b/ethereum/p2p/src/test/resources/keys/invalidpartner1client1/nsspin.txt deleted file mode 100644 index 5271a52680..0000000000 --- a/ethereum/p2p/src/test/resources/keys/invalidpartner1client1/nsspin.txt +++ /dev/null @@ -1 +0,0 @@ -test123 diff --git a/ethereum/p2p/src/test/resources/keys/invalidpartner1client1/partner1_ca.p12 b/ethereum/p2p/src/test/resources/keys/invalidpartner1client1/partner1_ca.p12 new file mode 100644 index 0000000000..17105e4ccb Binary files /dev/null and b/ethereum/p2p/src/test/resources/keys/invalidpartner1client1/partner1_ca.p12 differ diff --git a/ethereum/p2p/src/test/resources/keys/invalidpartner1client1/root_ca.p12 b/ethereum/p2p/src/test/resources/keys/invalidpartner1client1/root_ca.p12 new file mode 100644 index 0000000000..ef95c26dcb Binary files /dev/null and b/ethereum/p2p/src/test/resources/keys/invalidpartner1client1/root_ca.p12 differ diff --git a/ethereum/p2p/src/test/resources/keys/invalidpartner1client1/ssl-ca.pem b/ethereum/p2p/src/test/resources/keys/invalidpartner1client1/ssl-ca.pem deleted file mode 100644 index 99ab0179ac..0000000000 --- a/ethereum/p2p/src/test/resources/keys/invalidpartner1client1/ssl-ca.pem +++ /dev/null @@ -1,72 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIEFDCCAvygAwIBAgIUK7zDrM1bZ8uhFadVKFJAvYr7KK0wDQYJKoZIhvcNAQEL -BQAwgYYxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoGA1UEBwwDU0ZPMQsw -CQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEXMBUGA1UEAwwOaW52YWxpZGludGVy -Y2ExJzAlBgkqhkiG9w0BCQEWGGludmFsaWRpbnRlcmNhQGFkbWluLmNvbTAgFw0y -MTA2MDcxOTE3MjBaGA8yMTIxMDUxNDE5MTcyMFowgZYxCzAJBgNVBAYTAlVTMQsw -CQYDVQQIDAJDQTEMMAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwE -cm9vdDEaMBgGA1UEAwwRaW52YWxpZHBhcnRuZXIxY2ExNDAyBgkqhkiG9w0BCQEW -JWludmFsaWRwYXJ0bmVyMWNhQGludmFsaWRwYXJ0bmVyMS5jb20wggEiMA0GCSqG -SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDdNAUgeC4azUM3Y1X767u9x0VktNS0khDg -53NvEtD15l6emELSvIVof0M/tXbSaDDe1RK8NyLFVeV0CawK6MYVO44rHVjp580w -dVC+3M9qrCvtt5ZKf12DYt9CrPsuNSp9qfsw07xJP7Mood43xV61+p/04EVJ13Aw -AnKNQz/IpaKX44ddlgJUbrjJ5fzvSPRxqPWr+X64fpKG/kbycuG22TJBiRpGu+KO -pTZl21Ved+EChr/jEU/1cWGnWorolpxftrQGkKVeIO9tIkEssPJ/Gvz9nBdix95X -2dFEQVwyiNONBvZP9N/R/VTQfadD35OUSTTjUOW3LKMOG8abfVnfAgMBAAGjZjBk -MB0GA1UdDgQWBBSxZDo4nW3EJYtZcQLmuE4Gffxx1TAfBgNVHSMEGDAWgBSci49+ -KDSauQAwRw1tIW5K+dFDdTASBgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQE -AwIBhjANBgkqhkiG9w0BAQsFAAOCAQEAQyq836+vtcMvmlc75iQ0J5hGl4jRHdi9 -XdxlmD7iSx0aCAV88WgSO8TwTvKd4plN+45Fh7ZfbRpd4RQNGCHUgvFcZ/iKZ2kd -SFuoFdufMDosI0B9MCCmy+9F5DW3wjDP4zohyoe5gh8VoX5/lDtayrllx7FnRNKL -i2KxdSqKvaQ9Op4//5SNbCRYQz/M9k3I92gh6PtxvwbYD2DMphq3XdibqBICAgqc -MehguFKKsTNuJdYLEaPJ1V4QLOwtsDnSThDRF8P2cJ5jLSmbNSjl4eKZCdzlmAqw -DV94cehbaHaMnpb0xFoQK6TN5WymGIHN/qTHArhkoeZmG7kfw5cf6A== ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIECDCCAvCgAwIBAgIUDzY3/t2lD5x6TFJkG+wwjo1Qsh4wDQYJKoZIhvcNAQEL -BQAwgYoxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoGA1UEBwwDU0ZPMQsw -CQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEcMBoGA1UEAwwTcm9vdGludmFsaWRj -YS5hZG1pbjEmMCQGCSqGSIb3DQEJARYXcm9vdGludmFsaWRjYUBhZG1pbi5jb20w -IBcNMjEwNjA3MTkxNzIwWhgPMjEyMTA1MTQxOTE3MjBaMIGGMQswCQYDVQQGEwJV -UzELMAkGA1UECAwCQ0ExDDAKBgNVBAcMA1NGTzELMAkGA1UECgwCTUMxDTALBgNV -BAsMBHJvb3QxFzAVBgNVBAMMDmludmFsaWRpbnRlcmNhMScwJQYJKoZIhvcNAQkB -FhhpbnZhbGlkaW50ZXJjYUBhZG1pbi5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IB -DwAwggEKAoIBAQCh57jnUu4vopH0LjIn4RKrm31KBOZHZJOgbBL+LpNwhDNte+uq -GXAXI1djr4oA5bpSlwghaojbpnTV8qIafL01wwpmevbZG9R97h/tYiHlWP52Bj2j -cK1wIQWpnrpD+Nsc6Cb2UT1M3v1THljh8sT6ZlUgNr/0EpZ90Txb+FBb4g1SVSPg -zhaHAF2VnRNlX7PRkrztOtQfyTK6LdefCIlLczEcAz5oWLXpUOYWzFF8aFvXP/e0 -BRjj3xcRFzHiG4E5Spomlf6f2fqSfQa+cawyHxGX9yehwA7S1jsZWvNfINhXl/Zs -LQnaHM885PkATNFFaSOqZuWTH2wi9cyIN/adAgMBAAGjZjBkMB0GA1UdDgQWBBSc -i49+KDSauQAwRw1tIW5K+dFDdTAfBgNVHSMEGDAWgBT/NPV6XAiQbNcxTYXEr/25 -5dOgOjASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG -9w0BAQsFAAOCAQEAAoiXUj8QyFa8MzyRNFCSRz6/evhJ7OxON9C89C49vIC3S+5p -Vn7SSkzK44OrWaRbVQOI8rbJSAd72iWaMVodHPKUkvFeiFHql6YheX0mnpmFyq72 -C5OHMbIo8kMbvEBrawJCx25GKuCV3peloMRWmz7UdAjlTuPiv5WO6/GzBJkAMdw6 -ZaySzGghRN6eMKfhwb4NSeC9fZQZ8B41rpYrvp+SWjy6DktMmzpmsKxQ00IiNUe/ -rXBJPUCNOLmDaX/iBb4UWTmseo7t7nmYWEwN4YQ7bwKjFi6elqCS68v4fWW+fO1R -4F1Elk3gXEPDiBz1e+0OhK6nzXzr0IrswfthAQ== ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIID+TCCAuGgAwIBAgIULStfBL19hwdAOantFEGhxNaVQe0wDQYJKoZIhvcNAQEL -BQAwgYoxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoGA1UEBwwDU0ZPMQsw -CQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEcMBoGA1UEAwwTcm9vdGludmFsaWRj -YS5hZG1pbjEmMCQGCSqGSIb3DQEJARYXcm9vdGludmFsaWRjYUBhZG1pbi5jb20w -IBcNMjEwNjA3MTkxNzIwWhgPMjEyMTA1MTQxOTE3MjBaMIGKMQswCQYDVQQGEwJV -UzELMAkGA1UECAwCQ0ExDDAKBgNVBAcMA1NGTzELMAkGA1UECgwCTUMxDTALBgNV -BAsMBHJvb3QxHDAaBgNVBAMME3Jvb3RpbnZhbGlkY2EuYWRtaW4xJjAkBgkqhkiG -9w0BCQEWF3Jvb3RpbnZhbGlkY2FAYWRtaW4uY29tMIIBIjANBgkqhkiG9w0BAQEF -AAOCAQ8AMIIBCgKCAQEA0iTSh4F18DCcDY2pnBu4g/dwNChnHCSMY+M69jRvj54U -aVIOxmvyTKWPJnsv1bSRuhoFaLpXMyFmCyCp8e617QTNGlPkpu1ByoOjQGeTmTAs -kJV/vpfzD00BriWPXp1fVdg78s2hHh08JjAHWIUVFd1GxXVyJdoW12nxPEmXzHDc -vsRiniu+lkOgz3pmOdtpSNDYuhAL5q8hhZioClbilA5HTEvlvMxbqt2IzrU9vlrR -hZXvtx9w4PXxFfFK8CS3iTOQ+p+4JyAU31VHBJD1iukqZQ1U9P36K5PNRzR2fHxb -jo35J35OcVJ/Dl/CuozmRjJKh4cbs7UAzgsrS1rlpQIDAQABo1MwUTAdBgNVHQ4E -FgQU/zT1elwIkGzXMU2FxK/9ueXToDowHwYDVR0jBBgwFoAU/zT1elwIkGzXMU2F -xK/9ueXToDowDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAAzuG -9JOuuW8v2KUkHDeGqJ9LjMSpti83tz59P33z5jHLBwmRcYWlX0orBbtOTrn1mb9V -+YcTp/zYiUwNmsR1/bTo6+fDyB7i47i7A3CxnyZV+xP8eauB92LDZqlCl8k/ZynU -JgIbKO3fmeWayW3kVqsHy6hJxNN41zWbO3Q3I9j9sh6muFZM4s1w2+FawN/v9qil -hjd3sWMSfkm6cSXZowJ2ExIaw99qG1GyWHaDFufLj2b4lDTm2tP/gXmF6XXIS9iE -WqLxI17zv4npeYA7S5/8uf7tfMWBhAhuGDIXt1mOMCAZziz92VVlSwEkY54wZ9uR -8VovTAmGEM415qM+iA== ------END CERTIFICATE----- diff --git a/ethereum/p2p/src/test/resources/keys/invalidpartner1client1/ssl.pem b/ethereum/p2p/src/test/resources/keys/invalidpartner1client1/ssl.pem deleted file mode 100644 index e859952da8..0000000000 --- a/ethereum/p2p/src/test/resources/keys/invalidpartner1client1/ssl.pem +++ /dev/null @@ -1,129 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQD0g+rrRCOrs8GR -NKlVgJnMzwR6WEt4oLk5KTJ+PbORcLsPqBslnTwEC0ZFJa4DXKhAGJrtIPfsKWOh -S15nJUE7O+i62e9wcEjjmPCiyzI82UUsmGFTku1lIjgulAd8Nlc+VjZ3sC961tX+ -9otUMjH7BrYI0CrjuEremAUdFK6Yw5xiVBJMkl9x+0jWYfJAVQT7+I+WyhUas0uU -GjFlORQNA1xibd+xYk/CCKZ9HyDkNfS3objwSHAVAaRvGvEFGv34cvLNe9dvmZPz -H4gN2gSw/Y5Kf7V42qn6I53VuoIE7JGQfESG6+W/+uYb8vc6+oPfYbEq60LQMLHZ -o2Cou7fnAgMBAAECggEBAJF/5ky1MVy9DJQxeAovClY7YfjDjbVsPovrHebNJIuJ -P2bjq7PISqxFYT1IXLIXcu8hNR+iHKVlQ6n5RWWvX4+16Jk3kimgR19X5OmabHyU -9XrB+jhXF/i0UiY1Y/bgBy5K8wJpzvcT3Cdp4iLp85/isHOyG7OCONsYLwLNCdBQ -fHsQnB1VA/um7rVIPgb/rjq7E7KcQ8Up/momI0TFm2UQT67qkqFWEKsfnENmQQ63 -BjWiltcH0I4Yu0RA9y8cbcmT6HsszNF3K/iCw19V0mXpY2bS7AqRiLX8J65AkeaF -Sm9WWchdDE7cCP10NI5OqCTUntXzeZtVh8OWPqgnviECgYEA/GlSiM1Sq6gF22p1 -Z/QlThy6s1pyYM316DLeZUlK0oOYn+EikBxBjMMPIm5CxqEUVa5k+zlRkjC3zYZy -mpxc2uWJRUnhIfq/lxqDJBDbAegWrEDGIGfUANSzR/dbp8ZN4qjXBbS6NqnChdCF -glX4GwIJRatw75sy+/CN4LY/QA8CgYEA9/3bRZTuKdApo3whxOxLg2QY6a6GUou/ -MIs6r2dFhca7ESpGOEeEw6u/tqMRu0qZ44nKPbKP1YQfw/8sDNWcI/QWlAK8aSL0 -IYfCKcLTzjSSvpawBM9K4hODIALktqvbgMdsDHQ5qXEmCT2K4Nz0FUNnfnqDWPO/ -Bq9lSEqQsqkCgYAJ7NZK/M/gYhYA37nIIaiJ3sVUohzXQ6IExGNMVkpz5qrMtpyW -UBYfw9fHgdBsYQ8co2PjIQjdF79SfJPrEnTwQpBYQiRxIpwABBHeDC+gbpDdqxpf -UdXbRoHaNZbMDRco73ytA8NCvQAiJOXrDxhXb4gPzkL9mPuzPm1FxcTM7wKBgGs9 -/3XuurOgTnFhe+UB3oH6Zn+ftny57Dsc6orx2PHKCBmbM3ShEPvhKO3dRQy+bSAl -9SyLLIJEOcxza+Q89+Hga2cka7/3mqVpZQDUPO4edBsxZPsffZ2YnIraVXfdh/X/ -x2z3UfxBbxZt48HsKy2K0ZWze1ubRM+qR91kSYDJAoGAXclfb+ltZ6ArLfO/cjR4 -aDvdDB7EJzd9dCWGMUI+Ne5jQ7pO6PDqZLjC+w6zGQtAoN3nCXsZt1MO7/imuo0V -Amm7Iv1ClLsATY4NhcCwvUq3c+NQXLF3uGr95vpsMgSx9McpjetJlnms9jjw+Vs0 -PfxYP7dBdcHeZu1d6q4c6pY= ------END PRIVATE KEY----- ------BEGIN CERTIFICATE----- -MIIFAzCCA+ugAwIBAgIUGeJjr1J00k/FSvKYmpjq9jJAeGgwDQYJKoZIhvcNAQEL -BQAwgZYxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoGA1UEBwwDU0ZPMQsw -CQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEaMBgGA1UEAwwRaW52YWxpZHBhcnRu -ZXIxY2ExNDAyBgkqhkiG9w0BCQEWJWludmFsaWRwYXJ0bmVyMWNhQGludmFsaWRw -YXJ0bmVyMS5jb20wIBcNMjEwNjA3MTkxNzIwWhgPMjEyMTA1MTQxOTE3MjBaMIGg -MQswCQYDVQQGEwJVUzELMAkGA1UECAwCQ0ExDDAKBgNVBAcMA1NGTzELMAkGA1UE -CgwCTUMxDTALBgNVBAsMBHJvb3QxHzAdBgNVBAMMFmludmFsaWRwYXJ0bmVyMWNs -aWVudDExOTA3BgkqhkiG9w0BCQEWKmludmFsaWRwYXJ0bmVyMWNsaWVudDFAaW52 -YWxpZHBhcnRuZXIxLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB -APSD6utEI6uzwZE0qVWAmczPBHpYS3iguTkpMn49s5Fwuw+oGyWdPAQLRkUlrgNc -qEAYmu0g9+wpY6FLXmclQTs76LrZ73BwSOOY8KLLMjzZRSyYYVOS7WUiOC6UB3w2 -Vz5WNnewL3rW1f72i1QyMfsGtgjQKuO4St6YBR0UrpjDnGJUEkySX3H7SNZh8kBV -BPv4j5bKFRqzS5QaMWU5FA0DXGJt37FiT8IIpn0fIOQ19LehuPBIcBUBpG8a8QUa -/fhy8s1712+Zk/MfiA3aBLD9jkp/tXjaqfojndW6ggTskZB8RIbr5b/65hvy9zr6 -g99hsSrrQtAwsdmjYKi7t+cCAwEAAaOCATkwggE1MBEGCWCGSAGG+EIBAQQEAwIG -wDAdBgNVHQ4EFgQUXIHtNfkGLUo3FRBXIlBzaPIp9hMwCQYDVR0TBAIwADAOBgNV -HQ8BAf8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMIHGBgNV -HSMEgb4wgbuAFLFkOjidbcQli1lxAua4TgZ9/HHVoYGMpIGJMIGGMQswCQYDVQQG -EwJVUzELMAkGA1UECAwCQ0ExDDAKBgNVBAcMA1NGTzELMAkGA1UECgwCTUMxDTAL -BgNVBAsMBHJvb3QxFzAVBgNVBAMMDmludmFsaWRpbnRlcmNhMScwJQYJKoZIhvcN -AQkBFhhpbnZhbGlkaW50ZXJjYUBhZG1pbi5jb22CFCu8w6zNW2fLoRWnVShSQL2K -+yitMA0GCSqGSIb3DQEBCwUAA4IBAQAW6D2PaVcFqpNtpGc40H90SiB7PdNZak0l -DyXvDY84JgCuEgeesjec+K7QsJh2+h6yaXmNampjzCtRhj6vVNWjgB9s5uHNG16n -ZbceijtLRZoczpdrMemmW5BFs5gQNXNpdtgLDcASHrOqxXRd6QoltcHE7nsxa9+n -xW1ctbFCD3ckkaW2ppP1zSxrXBc0v6Nda+BF+As056pXs5SCzBwMAeQC4vct0gM6 -Fl8LplHId1IA9tTL6y9C6/aPXdYFf62f/yZr0MD4jONkIA0yPVlgjSsmapugsNdJ -VZnoYBq7FbenB2uF3QDluVUlIFvCxHiazdrkkO3NpKiv2d0pzHIl ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIEFDCCAvygAwIBAgIUK7zDrM1bZ8uhFadVKFJAvYr7KK0wDQYJKoZIhvcNAQEL -BQAwgYYxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoGA1UEBwwDU0ZPMQsw -CQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEXMBUGA1UEAwwOaW52YWxpZGludGVy -Y2ExJzAlBgkqhkiG9w0BCQEWGGludmFsaWRpbnRlcmNhQGFkbWluLmNvbTAgFw0y -MTA2MDcxOTE3MjBaGA8yMTIxMDUxNDE5MTcyMFowgZYxCzAJBgNVBAYTAlVTMQsw -CQYDVQQIDAJDQTEMMAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwE -cm9vdDEaMBgGA1UEAwwRaW52YWxpZHBhcnRuZXIxY2ExNDAyBgkqhkiG9w0BCQEW -JWludmFsaWRwYXJ0bmVyMWNhQGludmFsaWRwYXJ0bmVyMS5jb20wggEiMA0GCSqG -SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDdNAUgeC4azUM3Y1X767u9x0VktNS0khDg -53NvEtD15l6emELSvIVof0M/tXbSaDDe1RK8NyLFVeV0CawK6MYVO44rHVjp580w -dVC+3M9qrCvtt5ZKf12DYt9CrPsuNSp9qfsw07xJP7Mood43xV61+p/04EVJ13Aw -AnKNQz/IpaKX44ddlgJUbrjJ5fzvSPRxqPWr+X64fpKG/kbycuG22TJBiRpGu+KO -pTZl21Ved+EChr/jEU/1cWGnWorolpxftrQGkKVeIO9tIkEssPJ/Gvz9nBdix95X -2dFEQVwyiNONBvZP9N/R/VTQfadD35OUSTTjUOW3LKMOG8abfVnfAgMBAAGjZjBk -MB0GA1UdDgQWBBSxZDo4nW3EJYtZcQLmuE4Gffxx1TAfBgNVHSMEGDAWgBSci49+ -KDSauQAwRw1tIW5K+dFDdTASBgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQE -AwIBhjANBgkqhkiG9w0BAQsFAAOCAQEAQyq836+vtcMvmlc75iQ0J5hGl4jRHdi9 -XdxlmD7iSx0aCAV88WgSO8TwTvKd4plN+45Fh7ZfbRpd4RQNGCHUgvFcZ/iKZ2kd -SFuoFdufMDosI0B9MCCmy+9F5DW3wjDP4zohyoe5gh8VoX5/lDtayrllx7FnRNKL -i2KxdSqKvaQ9Op4//5SNbCRYQz/M9k3I92gh6PtxvwbYD2DMphq3XdibqBICAgqc -MehguFKKsTNuJdYLEaPJ1V4QLOwtsDnSThDRF8P2cJ5jLSmbNSjl4eKZCdzlmAqw -DV94cehbaHaMnpb0xFoQK6TN5WymGIHN/qTHArhkoeZmG7kfw5cf6A== ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIECDCCAvCgAwIBAgIUDzY3/t2lD5x6TFJkG+wwjo1Qsh4wDQYJKoZIhvcNAQEL -BQAwgYoxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoGA1UEBwwDU0ZPMQsw -CQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEcMBoGA1UEAwwTcm9vdGludmFsaWRj -YS5hZG1pbjEmMCQGCSqGSIb3DQEJARYXcm9vdGludmFsaWRjYUBhZG1pbi5jb20w -IBcNMjEwNjA3MTkxNzIwWhgPMjEyMTA1MTQxOTE3MjBaMIGGMQswCQYDVQQGEwJV -UzELMAkGA1UECAwCQ0ExDDAKBgNVBAcMA1NGTzELMAkGA1UECgwCTUMxDTALBgNV -BAsMBHJvb3QxFzAVBgNVBAMMDmludmFsaWRpbnRlcmNhMScwJQYJKoZIhvcNAQkB -FhhpbnZhbGlkaW50ZXJjYUBhZG1pbi5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IB -DwAwggEKAoIBAQCh57jnUu4vopH0LjIn4RKrm31KBOZHZJOgbBL+LpNwhDNte+uq -GXAXI1djr4oA5bpSlwghaojbpnTV8qIafL01wwpmevbZG9R97h/tYiHlWP52Bj2j -cK1wIQWpnrpD+Nsc6Cb2UT1M3v1THljh8sT6ZlUgNr/0EpZ90Txb+FBb4g1SVSPg -zhaHAF2VnRNlX7PRkrztOtQfyTK6LdefCIlLczEcAz5oWLXpUOYWzFF8aFvXP/e0 -BRjj3xcRFzHiG4E5Spomlf6f2fqSfQa+cawyHxGX9yehwA7S1jsZWvNfINhXl/Zs -LQnaHM885PkATNFFaSOqZuWTH2wi9cyIN/adAgMBAAGjZjBkMB0GA1UdDgQWBBSc -i49+KDSauQAwRw1tIW5K+dFDdTAfBgNVHSMEGDAWgBT/NPV6XAiQbNcxTYXEr/25 -5dOgOjASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG -9w0BAQsFAAOCAQEAAoiXUj8QyFa8MzyRNFCSRz6/evhJ7OxON9C89C49vIC3S+5p -Vn7SSkzK44OrWaRbVQOI8rbJSAd72iWaMVodHPKUkvFeiFHql6YheX0mnpmFyq72 -C5OHMbIo8kMbvEBrawJCx25GKuCV3peloMRWmz7UdAjlTuPiv5WO6/GzBJkAMdw6 -ZaySzGghRN6eMKfhwb4NSeC9fZQZ8B41rpYrvp+SWjy6DktMmzpmsKxQ00IiNUe/ -rXBJPUCNOLmDaX/iBb4UWTmseo7t7nmYWEwN4YQ7bwKjFi6elqCS68v4fWW+fO1R -4F1Elk3gXEPDiBz1e+0OhK6nzXzr0IrswfthAQ== ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIID+TCCAuGgAwIBAgIULStfBL19hwdAOantFEGhxNaVQe0wDQYJKoZIhvcNAQEL -BQAwgYoxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoGA1UEBwwDU0ZPMQsw -CQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEcMBoGA1UEAwwTcm9vdGludmFsaWRj -YS5hZG1pbjEmMCQGCSqGSIb3DQEJARYXcm9vdGludmFsaWRjYUBhZG1pbi5jb20w -IBcNMjEwNjA3MTkxNzIwWhgPMjEyMTA1MTQxOTE3MjBaMIGKMQswCQYDVQQGEwJV -UzELMAkGA1UECAwCQ0ExDDAKBgNVBAcMA1NGTzELMAkGA1UECgwCTUMxDTALBgNV -BAsMBHJvb3QxHDAaBgNVBAMME3Jvb3RpbnZhbGlkY2EuYWRtaW4xJjAkBgkqhkiG -9w0BCQEWF3Jvb3RpbnZhbGlkY2FAYWRtaW4uY29tMIIBIjANBgkqhkiG9w0BAQEF -AAOCAQ8AMIIBCgKCAQEA0iTSh4F18DCcDY2pnBu4g/dwNChnHCSMY+M69jRvj54U -aVIOxmvyTKWPJnsv1bSRuhoFaLpXMyFmCyCp8e617QTNGlPkpu1ByoOjQGeTmTAs -kJV/vpfzD00BriWPXp1fVdg78s2hHh08JjAHWIUVFd1GxXVyJdoW12nxPEmXzHDc -vsRiniu+lkOgz3pmOdtpSNDYuhAL5q8hhZioClbilA5HTEvlvMxbqt2IzrU9vlrR -hZXvtx9w4PXxFfFK8CS3iTOQ+p+4JyAU31VHBJD1iukqZQ1U9P36K5PNRzR2fHxb -jo35J35OcVJ/Dl/CuozmRjJKh4cbs7UAzgsrS1rlpQIDAQABo1MwUTAdBgNVHQ4E -FgQU/zT1elwIkGzXMU2FxK/9ueXToDowHwYDVR0jBBgwFoAU/zT1elwIkGzXMU2F -xK/9ueXToDowDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAAzuG -9JOuuW8v2KUkHDeGqJ9LjMSpti83tz59P33z5jHLBwmRcYWlX0orBbtOTrn1mb9V -+YcTp/zYiUwNmsR1/bTo6+fDyB7i47i7A3CxnyZV+xP8eauB92LDZqlCl8k/ZynU -JgIbKO3fmeWayW3kVqsHy6hJxNN41zWbO3Q3I9j9sh6muFZM4s1w2+FawN/v9qil -hjd3sWMSfkm6cSXZowJ2ExIaw99qG1GyWHaDFufLj2b4lDTm2tP/gXmF6XXIS9iE -WqLxI17zv4npeYA7S5/8uf7tfMWBhAhuGDIXt1mOMCAZziz92VVlSwEkY54wZ9uR -8VovTAmGEM415qM+iA== ------END CERTIFICATE----- diff --git a/ethereum/p2p/src/test/resources/keys/invalidpartner1client1/truststore.jks b/ethereum/p2p/src/test/resources/keys/invalidpartner1client1/truststore.jks deleted file mode 100644 index 421be66ae1..0000000000 Binary files a/ethereum/p2p/src/test/resources/keys/invalidpartner1client1/truststore.jks and /dev/null differ diff --git a/ethereum/p2p/src/test/resources/keys/invalidpartner1client1/truststore.p12 b/ethereum/p2p/src/test/resources/keys/invalidpartner1client1/truststore.p12 new file mode 100644 index 0000000000..28a22ee0c9 Binary files /dev/null and b/ethereum/p2p/src/test/resources/keys/invalidpartner1client1/truststore.p12 differ diff --git a/ethereum/p2p/src/test/resources/keys/partner1client1/client1.p12 b/ethereum/p2p/src/test/resources/keys/partner1client1/client1.p12 new file mode 100644 index 0000000000..c69d41e5dc Binary files /dev/null and b/ethereum/p2p/src/test/resources/keys/partner1client1/client1.p12 differ diff --git a/ethereum/p2p/src/test/resources/keys/partner1client1/crl.pem b/ethereum/p2p/src/test/resources/keys/partner1client1/crl.pem deleted file mode 100644 index 48552756f2..0000000000 --- a/ethereum/p2p/src/test/resources/keys/partner1client1/crl.pem +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN X509 CRL----- -MIICBDCB7QIBATANBgkqhkiG9w0BAQsFADCBgTELMAkGA1UEBhMCVVMxCzAJBgNV -BAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJBgNVBAoMAk1DMQ0wCwYDVQQLDARyb290 -MRMwEQYDVQQDDApwYXJ0bmVyMWNhMSYwJAYJKoZIhvcNAQkBFhdwYXJ0bmVyMWNh -QHBhcnRuZXIxLmNvbRcNMjEwNjA3MTkxNzI4WhcNMjIwNjA3MTkxNzI4WjAnMCUC -FFFuSkrE8m/dVEcso4PkZUFYmvFBFw0yMTA2MDcxOTE3MjhaoA4wDDAKBgNVHRQE -AwIBADANBgkqhkiG9w0BAQsFAAOCAQEAQujFul5rvGr4yytm/mjPQdcbeSTM3uT/ -aFM6WbPE6DHx5/R1ItNCyA7YdfxzojfZ+kzR7j0WsSydWT2TngHD/2C6tIhXZRcG -UG6E473xniLFctn0FYyKZL03pOwdQgWk4dCUd3Ko8Qbos+vTRClXPMnPANPwJjYG -7x1UlEPShHaoQNiDakuUa6fGZyyFGbTWuH1zltH3aUKh/L2w1/Sndkv66Cmr4VQ0 -s/ZsMnjJNPrjZJs32BzjxVaWYToe6vpwiQ6+UGyaZ3GTfv6r/oTWeRxcmQeXAT03 -kxbwywkQwFndeC9NlrOQRM+TipsOybeiJToQskmPiEJ/7xfUAHOV3w== ------END X509 CRL----- ------BEGIN X509 CRL----- -MIICLDCCARQCAQEwDQYJKoZIhvcNAQELBQAwgYExCzAJBgNVBAYTAlVTMQswCQYD -VQQIDAJDQTEMMAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9v -dDETMBEGA1UEAwwKcGFydG5lcjJjYTEmMCQGCSqGSIb3DQEJARYXcGFydG5lcjJj -YUBwYXJ0bmVyMi5jb20XDTIxMDYwNzE5MTcyOFoXDTIyMDYwNzE5MTcyOFowTjAl -AhQtbA3PphdVjORDUvomlgGblf8OABcNMjEwNjA3MTkxNzI4WjAlAhRRbkpKxPJv -3VRHLKOD5GVBWJrxQRcNMjEwNjA3MTkxNzI4WqAOMAwwCgYDVR0UBAMCAQEwDQYJ -KoZIhvcNAQELBQADggEBAJXmtYDcF+sA0zQiRiCOIALVUQ4i0t4UwREEL7SEzD9C -hAOas0uFwkPef1hQWNkvx+OghFb3fStKS1zh9zbJx0fxyKttfsaaW2dQX4H8tyRR -vtuNtZBv/PT2ouWdpumSh9TmQUxKr/Uer5gGaqOm1S5MOemOVEYfsNqAzSnGI7f9 -v5yMDywigHfv2dmM7xpttSZG3WCd5w0PJisndyAV/qga3CQMI5X6DIpWHmHbcD3k -sSps2YggdueW7y61uoi61jvpOGTbr6UAWLjHRyL35txC9xOMGJgJqBgebw/hGmW9 -syY2loiEfzWX0A/9KGPo6Q8PB2YJbMmc7WT04g5W++8= ------END X509 CRL----- diff --git a/ethereum/p2p/src/test/resources/keys/partner1client1/keys.p12 b/ethereum/p2p/src/test/resources/keys/partner1client1/keys.p12 deleted file mode 100644 index c812dc07a7..0000000000 Binary files a/ethereum/p2p/src/test/resources/keys/partner1client1/keys.p12 and /dev/null differ diff --git a/ethereum/p2p/src/test/resources/keys/partner1client1/keystore.jks b/ethereum/p2p/src/test/resources/keys/partner1client1/keystore.jks deleted file mode 100644 index a1237f947f..0000000000 Binary files a/ethereum/p2p/src/test/resources/keys/partner1client1/keystore.jks and /dev/null differ diff --git a/ethereum/p2p/src/test/resources/keys/partner1client1/nss.cfg b/ethereum/p2p/src/test/resources/keys/partner1client1/nss.cfg index 2b519e1d93..c4dd61c691 100644 --- a/ethereum/p2p/src/test/resources/keys/partner1client1/nss.cfg +++ b/ethereum/p2p/src/test/resources/keys/partner1client1/nss.cfg @@ -1,6 +1,5 @@ - -name = NSScrypto-partner1client1 +name = NSScrypto-partner1-client1 nssSecmodDirectory = ./src/test/resources/keys/partner1client1/nssdb nssDbMode = readOnly nssModule = keystore - +showInfo = true diff --git a/ethereum/p2p/src/test/resources/keys/partner1client1/nssdb/cert8.db b/ethereum/p2p/src/test/resources/keys/partner1client1/nssdb/cert8.db deleted file mode 100644 index 154e88152c..0000000000 Binary files a/ethereum/p2p/src/test/resources/keys/partner1client1/nssdb/cert8.db and /dev/null differ diff --git a/ethereum/p2p/src/test/resources/keys/partner1client1/nssdb/cert9.db b/ethereum/p2p/src/test/resources/keys/partner1client1/nssdb/cert9.db new file mode 100644 index 0000000000..ba8c3181da Binary files /dev/null and b/ethereum/p2p/src/test/resources/keys/partner1client1/nssdb/cert9.db differ diff --git a/ethereum/p2p/src/test/resources/keys/partner1client1/nssdb/key3.db b/ethereum/p2p/src/test/resources/keys/partner1client1/nssdb/key3.db deleted file mode 100644 index ab942b97f4..0000000000 Binary files a/ethereum/p2p/src/test/resources/keys/partner1client1/nssdb/key3.db and /dev/null differ diff --git a/ethereum/p2p/src/test/resources/keys/partner1client1/nssdb/key4.db b/ethereum/p2p/src/test/resources/keys/partner1client1/nssdb/key4.db new file mode 100644 index 0000000000..e8d0d29730 Binary files /dev/null and b/ethereum/p2p/src/test/resources/keys/partner1client1/nssdb/key4.db differ diff --git a/ethereum/p2p/src/test/resources/keys/partner1client1/nssdb/pkcs11.txt b/ethereum/p2p/src/test/resources/keys/partner1client1/nssdb/pkcs11.txt new file mode 100644 index 0000000000..d6925f0781 --- /dev/null +++ b/ethereum/p2p/src/test/resources/keys/partner1client1/nssdb/pkcs11.txt @@ -0,0 +1,5 @@ +library= +name=NSS Internal PKCS #11 Module +parameters=configdir='sql: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}) + diff --git a/ethereum/p2p/src/test/resources/keys/partner1client1/nssdb/secmod.db b/ethereum/p2p/src/test/resources/keys/partner1client1/nssdb/secmod.db index 0f6316142f..e69de29bb2 100644 Binary files a/ethereum/p2p/src/test/resources/keys/partner1client1/nssdb/secmod.db and b/ethereum/p2p/src/test/resources/keys/partner1client1/nssdb/secmod.db differ diff --git a/ethereum/p2p/src/test/resources/keys/partner1client1/ssl-ca.pem b/ethereum/p2p/src/test/resources/keys/partner1client1/ssl-ca.pem deleted file mode 100644 index 61ef3d79ed..0000000000 --- a/ethereum/p2p/src/test/resources/keys/partner1client1/ssl-ca.pem +++ /dev/null @@ -1,70 +0,0 @@ ------BEGIN CERTIFICATE----- -MIID8DCCAtigAwIBAgIUEJC9AdHUUw4ERLyYQmzHk6NSn6gwDQYJKoZIhvcNAQEL -BQAweDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ -BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRAwDgYDVQQDDAdpbnRlcmNhMSAwHgYJ -KoZIhvcNAQkBFhFpbnRlcmNhQGFkbWluLmNvbTAgFw0yMTA2MDcxOTE3MTVaGA8y -MTIxMDUxNDE5MTcxNVowgYExCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoG -A1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDETMBEGA1UEAwwK -cGFydG5lcjFjYTEmMCQGCSqGSIb3DQEJARYXcGFydG5lcjFjYUBwYXJ0bmVyMS5j -b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDNy4ztMqq6KIYHrYRQ -2XNXZisj5oiTyrdlZ2+lo7P8xrS12d8ZigA2ofs6lGSXPQiM6HbShw0NPGacbElL -rueqJyiN/AC8ZGWx6jJG4rvtOwtrftXHaa17iSqnStvT6Jk7wShAZYZfDaYAw1kc -ryCs2RdbOCXWLvlMyZT4l0g0U7VEfTStSDP7T1NjEEjfDQvKrdoNHoNaXneRQFhx -0DCrNbyfoUwBIeQPYIpmi92hWlwNV9/GooyHj0pK78eVb+tl7AVlvjuilph+IIos -8e7s+TCPRNbT0ksDIKUrcd7ZBkJzoRs8bRvSAQyCZZcPqiQce8z7BchxGJJZQUJH -nFRlAgMBAAGjZjBkMB0GA1UdDgQWBBTIqkjkocRp/5kHvmu19OdHACemJjAfBgNV -HSMEGDAWgBTI4y/EE00f+IcRV07NdF4bEg1S/TASBgNVHRMBAf8ECDAGAQH/AgEA -MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEACgRyonvWCo7z/v+a -o1WN9EunfMtiNhSHAyx9CMJhkBhcGWqsSCkEPXWKLRsnIBKSGbikpr1Jg3bHdwB5 -PYV+EIZvS0ndzupg/01xToTHQMS2ynCT/3QBCmPUPYm3sJa3KArNgWAUOzPdJ/Fj -fi53cADpr78Z2/tdY2SSUzLe+nJZf5MHTAx2I06XUi04ic7GdC2d1+g0AdsFatZN -vbxeAZx0Bg5sc8F9CDGmlYjJ/TeZ8s2hM+6hogz+4lz7W47GxqzMW/2I3WkDGcQd -SO5usxYoOztihuu7g9QzB3hGTc+SelnPtk91FQhpxO1qEQIfDkUJksZcvxcgTaX9 -LbcwIw== ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIID6jCCAtKgAwIBAgIUFdCzxpaFd/h+szr/7iWKsoQQAAcwDQYJKoZIhvcNAQEL -BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ -BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x -HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNjA3MTkxNzE1 -WhgPMjEyMTA1MTQxOTE3MTVaMHgxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM -MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEQMA4GA1UE -AwwHaW50ZXJjYTEgMB4GCSqGSIb3DQEJARYRaW50ZXJjYUBhZG1pbi5jb20wggEi -MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQyBkPmtfNcev4/BeiFIJJw5vk -+xrIQnIRC1FAq/Db14lWPk7L+ZnlgzR0Agc+JTpi7C2qC42KHpIvLeMFAa8ww/dI -yGHTu/ds0KEgBXDIa4amdZQuK5lNN681226jCgxz7xGEHmStNT74aXEgwajcflwe -sijn5pEIA+MIujYQ8eFWfhpkyL3l6Zzbd3NKnBGAmaWd8rE33ka9Gs6sw5KRFbjI -khgxePl9/S8Uip7Fm8DY4OUDLzhQpOUvv+sZuX+g7Hjh+rvyWULVHnHCZlkkQz2s -J4IIOB6SihgSHkTwsLGDXySymMY3GMmo4nIiu9lu5IfjZxYTkhbQLB2kC0JrAgMB -AAGjZjBkMB0GA1UdDgQWBBTI4y/EE00f+IcRV07NdF4bEg1S/TAfBgNVHSMEGDAW -gBTSXVKotGw90L784/vRRjvjCQB3tDASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1Ud -DwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEArLGs90jHg7a7vIm2igyD4+/6 -LdL8pZwdmNKSFYQLsIjre5vJcSchQPyL850pIk1aZciFtBtTxWHVt8xNsKpqmV3l -BhEk4PXtebnwVVYATZznDd97h9pd3Dmaos9JPhz8oLs4Ly5BY0JzUHQk+o3o6EAg -p5Oa/WM0ZPs2FzbcxSjq3HmKlpDyIL+5Jn43F7z1feVsEh8Fw2FbzoFYz5/4uudP -aAh9g9TH7R4At02G6XqyLgayIzj+2ZILo5nz5/ULGbwCvoFQ+HjbZ84u/X8tRQuR -5kxOTnkxEoB8wbKGz8XZddqjC9ufzM4gobsGuougMFSGaCyqrvK7xS9wiVQYPA== ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIID2zCCAsOgAwIBAgIUY6A2eCEpaP+hfVPA3mgtROGIQQ0wDQYJKoZIhvcNAQEL -BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ -BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x -HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNjA3MTkxNzE1 -WhgPMjEyMTA1MTQxOTE3MTVaMHwxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM -MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEVMBMGA1UE -AwwMcm9vdGNhLmFkbWluMR8wHQYJKoZIhvcNAQkBFhByb290Y2FAYWRtaW4uY29t -MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuw5ntBeNNq6CDlUcztnv -6MYzFpTXTdn+pqGPq032OHE/ochWxVFy1gKm0hxgFp0d6kEiKc/h9RAp9Er+N0e0 -iJyqrKUIaXjWd9P4Dlr4RnQdmajo6k9opyevI32qPXvMKX0cwtMqJO6kB8nQfPgs -U9Za5TO6mJBSJT5jPca0RZy+/ueBto+2MjvFs3K8dCjYmmZeoSrYjCljGkLTPWu+ -lsY+3raBfcj/DUkmGIz8lYAYS3N4JronOUax7E3g2iX7ERf95/sOwi1pADnwoBtm -RhhBhr8+OcWoJtLGfHHyDyFUSYPwb+0ZiE62lR6ClkFf7YJt7GsOS4/sapcV1PTj -pQIDAQABo1MwUTAdBgNVHQ4EFgQU0l1SqLRsPdC+/OP70UY74wkAd7QwHwYDVR0j -BBgwFoAU0l1SqLRsPdC+/OP70UY74wkAd7QwDwYDVR0TAQH/BAUwAwEB/zANBgkq -hkiG9w0BAQsFAAOCAQEATaIT3/UU5B8BKeKiqTKr02diC6gvNCkuAy37eq8uFUzy -5YzSkAZtKcVFBU5cEl8/mnd+a3w1EiJtzE4FtwR5J/fKHzCmsq+QTTrneUsVyx4g -02yqnik1Z7NmYzfnpol+t90Beo0Mwr1n4NEbQri9Z2qNxDX4fwlAqqfAGCAKjrWp -+scvjv/wCxfd9+EHZp5GvtORHB7ZnQUe5qY08SjxP5nbRDHdiVTCs3otHo9F+5Rq -oecPStW11C0XzH22RJMZFM8VhFBqPNeaAc+QvbXBgjLDjkftewqklHJWPc/rmFxR -Hc7m7LCRf+8X/o6uxRJ1fBDjnNfTkUwW4bEtd31efw== ------END CERTIFICATE----- diff --git a/ethereum/p2p/src/test/resources/keys/partner1client1/ssl.pem b/ethereum/p2p/src/test/resources/keys/partner1client1/ssl.pem deleted file mode 100644 index 3cdc905ea0..0000000000 --- a/ethereum/p2p/src/test/resources/keys/partner1client1/ssl.pem +++ /dev/null @@ -1,126 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDkn7PoS4TmqQnQ -JQ0WDj3kS2SUsMlrb48xi1cYUShYZ9d//JzOFXDPp+AdKndHPQy56qyv67R9x5rl -vcCn//ZyHuS1PEveIJU9IvXb4oIya1iZ/CdTRmJZZJvH9ELjYi5WBv08Na9b0y/Y -hSY4kcP0EaO3Lce0TUeDcIrNEzdGlccDdjwq6q+UBBUVeUsZwa/CCj6FQ/df3IIl -c92bsKdx1szR2E7CJvPwZ2CR4Qih1eXJGhw+q9zqY6ZZ4Zy1ymz28uszkPcpz2Kp -ZnKlOgd7GaS8G/kBHsLoLw3Ir1KdOLII6DSWy4Q7JLOBkbBgQ6cMiENC0rTUXt6P -uCK2E+idAgMBAAECggEBAN2i7VhvjeHHUhoVMUCGgf3GETYMxNeAiUMwoDiUxRYf -ZU1Qaftn0bueNahQuN25E5NRLCRHzux5C3NZp2G2xQYRaQtB7xLiZ4ujTtHiHvIe -GwD88GrMux+KZ3NLG2Uwk1cW43zxVpUggSvYuRryRRNh3mMA4K+sk32bJxR0Yovr -Zmvf3+nInAyaLcVmUfkqZ2/kTNsTDZd++PWI/znBSeDv9paMoGpJlFo7NQsbT2cm -hBs25httCPE9RJA/wut/TDIzkkx7WkRTGZQYS4/zWnV+8YN3XHXpGfoqrGw5a44O -nYyz3quuq+J+FX4URNvMf0CGMFjxAOhaRzCWcENUY0ECgYEA+rFOlYWRVr14wqwk -YYj41SQk0k/XBVVk478A7mwizFq3EBWWHHAiYQFFs1pLFyIevBqCXrKJUsN23BkV -qYvI3ML7XnVtZrHqcGtotIUu988ptwgS3WcwU8cGUW5KzxRgtMkTewEdzTjADbxN -7CXT5detae7aSpHeQgNNxOr31iUCgYEA6XbJ1zuoSE4JkVG2GkAG7XLfOPlhd5x6 -68T+WKu6a/nzw1E35Mi/EscZCmgKhrQUwmD/7wzwsfwoHmt9gIIaSd5u4XKAZ8Po -BFpuRoJdCl2X2ebE/PUDJ0Xz0fJdIgjjKQCtbOA9d6GXqsY7kzsyV+ZNF+IKFp8R -UKHccxwKUxkCgYA6NFB6hrhn2zXefPk1bAfZ9LpX2hGiO2FhP0eIE7NAnw9BvMFN -ePuCajk0mxI0HMfmBIGgWvNnM9q0314YL0xDdUHHfJwZ69TypP16bDGrd33H8Sfw -H7UovlzJK0JTMfgCAW10cZ3pt/NfPQkaeu3nv1uT7NDh31wrF3lG7wb7wQKBgC4b -bqtaNdbpyovvlkZC5NtaN2maHryvo7sScaTzbWLLv2+Qh7hgSRQdS/25JHML95mX -7JO6e4K7KPUxB10s1KJIEp/lrCRSFW1eqq60KknUyBuZrsfCX7gO4aNR+UCyfqJn -Zti8xIbu2/Q3KCbgpwWjDxCrbJChI5tIDDCTlhppAoGAPIAq4ldvkCMhG/GsGaa/ -vC9IAbLWXxeN2CC9FAWLZhWReoC+rPdSrnb4x/if2fPrGuLlIkCOY89eZ53A0upa -amzYmpdDWIsHWJKp78SS9DLtXrVKHAygkwvEDPUuB4D+n3561holR39CtplpRNWi -sQgkTxCHEj2IAIXti6MoQok= ------END PRIVATE KEY----- ------BEGIN CERTIFICATE----- -MIIEyDCCA7CgAwIBAgIUUW5KSsTyb91URyyjg+RlQVia8UAwDQYJKoZIhvcNAQEL -BQAwgYExCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoGA1UEBwwDU0ZPMQsw -CQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDETMBEGA1UEAwwKcGFydG5lcjFjYTEm -MCQGCSqGSIb3DQEJARYXcGFydG5lcjFjYUBwYXJ0bmVyMS5jb20wIBcNMjEwNjA3 -MTkxNzE1WhgPMjEyMTA1MTQxOTE3MTVaMIGLMQswCQYDVQQGEwJVUzELMAkGA1UE -CAwCQ0ExDDAKBgNVBAcMA1NGTzELMAkGA1UECgwCTUMxDTALBgNVBAsMBHJvb3Qx -GDAWBgNVBAMMD3BhcnRuZXIxY2xpZW50MTErMCkGCSqGSIb3DQEJARYccGFydG5l -cjFjbGllbnQxQHBhcnRuZXIxLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC -AQoCggEBAOSfs+hLhOapCdAlDRYOPeRLZJSwyWtvjzGLVxhRKFhn13/8nM4VcM+n -4B0qd0c9DLnqrK/rtH3HmuW9wKf/9nIe5LU8S94glT0i9dvigjJrWJn8J1NGYllk -m8f0QuNiLlYG/Tw1r1vTL9iFJjiRw/QRo7ctx7RNR4Nwis0TN0aVxwN2PCrqr5QE -FRV5SxnBr8IKPoVD91/cgiVz3Zuwp3HWzNHYTsIm8/BnYJHhCKHV5ckaHD6r3Opj -plnhnLXKbPby6zOQ9ynPYqlmcqU6B3sZpLwb+QEewugvDcivUp04sgjoNJbLhDsk -s4GRsGBDpwyIQ0LStNRe3o+4IrYT6J0CAwEAAaOCASgwggEkMBEGCWCGSAGG+EIB -AQQEAwIGwDAdBgNVHQ4EFgQUJie04hHyMXwfShvdI/rVOSGUD6YwCQYDVR0TBAIw -ADAOBgNVHQ8BAf8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC -MIG1BgNVHSMEga0wgaqAFMiqSOShxGn/mQe+a7X050cAJ6YmoXykejB4MQswCQYD -VQQGEwJVUzELMAkGA1UECAwCQ0ExDDAKBgNVBAcMA1NGTzELMAkGA1UECgwCTUMx -DTALBgNVBAsMBHJvb3QxEDAOBgNVBAMMB2ludGVyY2ExIDAeBgkqhkiG9w0BCQEW -EWludGVyY2FAYWRtaW4uY29tghQQkL0B0dRTDgREvJhCbMeTo1KfqDANBgkqhkiG -9w0BAQsFAAOCAQEAokvaJAcGVFBUt2kU3eTQ6EvF5gT4JVsfbMseb8HhH03TBDEY -BmQMi9pymhb52NVQXhRFZrCsOkAi8VRGcpkUsknCCWCxvL2SfsEw9h8sKKOZO8pl -AhQrUIVr39WzWr6Uop8H7d/db2wJoSqkOpIAGl5Vk8rpF46MNTl87tIb9bq2BNd1 -fW6XqCHTYPVaBLSyrOuhzqeZvefkzzlahrsjbwPGBk3GhMoR/7/Jhrb1NjbHqzHr -AazuWi0Y1VAih+yar332VI1iHFuo9VUdbOksAayDLs1Gwmis5DaMyBsOrSDdzVAe -0Iv7HXIpTZvJF5mrh5y5NcT2lOr6dVaWy2FO+Q== ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIID8DCCAtigAwIBAgIUEJC9AdHUUw4ERLyYQmzHk6NSn6gwDQYJKoZIhvcNAQEL -BQAweDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ -BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRAwDgYDVQQDDAdpbnRlcmNhMSAwHgYJ -KoZIhvcNAQkBFhFpbnRlcmNhQGFkbWluLmNvbTAgFw0yMTA2MDcxOTE3MTVaGA8y -MTIxMDUxNDE5MTcxNVowgYExCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoG -A1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDETMBEGA1UEAwwK -cGFydG5lcjFjYTEmMCQGCSqGSIb3DQEJARYXcGFydG5lcjFjYUBwYXJ0bmVyMS5j -b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDNy4ztMqq6KIYHrYRQ -2XNXZisj5oiTyrdlZ2+lo7P8xrS12d8ZigA2ofs6lGSXPQiM6HbShw0NPGacbElL -rueqJyiN/AC8ZGWx6jJG4rvtOwtrftXHaa17iSqnStvT6Jk7wShAZYZfDaYAw1kc -ryCs2RdbOCXWLvlMyZT4l0g0U7VEfTStSDP7T1NjEEjfDQvKrdoNHoNaXneRQFhx -0DCrNbyfoUwBIeQPYIpmi92hWlwNV9/GooyHj0pK78eVb+tl7AVlvjuilph+IIos -8e7s+TCPRNbT0ksDIKUrcd7ZBkJzoRs8bRvSAQyCZZcPqiQce8z7BchxGJJZQUJH -nFRlAgMBAAGjZjBkMB0GA1UdDgQWBBTIqkjkocRp/5kHvmu19OdHACemJjAfBgNV -HSMEGDAWgBTI4y/EE00f+IcRV07NdF4bEg1S/TASBgNVHRMBAf8ECDAGAQH/AgEA -MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEACgRyonvWCo7z/v+a -o1WN9EunfMtiNhSHAyx9CMJhkBhcGWqsSCkEPXWKLRsnIBKSGbikpr1Jg3bHdwB5 -PYV+EIZvS0ndzupg/01xToTHQMS2ynCT/3QBCmPUPYm3sJa3KArNgWAUOzPdJ/Fj -fi53cADpr78Z2/tdY2SSUzLe+nJZf5MHTAx2I06XUi04ic7GdC2d1+g0AdsFatZN -vbxeAZx0Bg5sc8F9CDGmlYjJ/TeZ8s2hM+6hogz+4lz7W47GxqzMW/2I3WkDGcQd -SO5usxYoOztihuu7g9QzB3hGTc+SelnPtk91FQhpxO1qEQIfDkUJksZcvxcgTaX9 -LbcwIw== ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIID6jCCAtKgAwIBAgIUFdCzxpaFd/h+szr/7iWKsoQQAAcwDQYJKoZIhvcNAQEL -BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ -BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x -HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNjA3MTkxNzE1 -WhgPMjEyMTA1MTQxOTE3MTVaMHgxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM -MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEQMA4GA1UE -AwwHaW50ZXJjYTEgMB4GCSqGSIb3DQEJARYRaW50ZXJjYUBhZG1pbi5jb20wggEi -MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQyBkPmtfNcev4/BeiFIJJw5vk -+xrIQnIRC1FAq/Db14lWPk7L+ZnlgzR0Agc+JTpi7C2qC42KHpIvLeMFAa8ww/dI -yGHTu/ds0KEgBXDIa4amdZQuK5lNN681226jCgxz7xGEHmStNT74aXEgwajcflwe -sijn5pEIA+MIujYQ8eFWfhpkyL3l6Zzbd3NKnBGAmaWd8rE33ka9Gs6sw5KRFbjI -khgxePl9/S8Uip7Fm8DY4OUDLzhQpOUvv+sZuX+g7Hjh+rvyWULVHnHCZlkkQz2s -J4IIOB6SihgSHkTwsLGDXySymMY3GMmo4nIiu9lu5IfjZxYTkhbQLB2kC0JrAgMB -AAGjZjBkMB0GA1UdDgQWBBTI4y/EE00f+IcRV07NdF4bEg1S/TAfBgNVHSMEGDAW -gBTSXVKotGw90L784/vRRjvjCQB3tDASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1Ud -DwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEArLGs90jHg7a7vIm2igyD4+/6 -LdL8pZwdmNKSFYQLsIjre5vJcSchQPyL850pIk1aZciFtBtTxWHVt8xNsKpqmV3l -BhEk4PXtebnwVVYATZznDd97h9pd3Dmaos9JPhz8oLs4Ly5BY0JzUHQk+o3o6EAg -p5Oa/WM0ZPs2FzbcxSjq3HmKlpDyIL+5Jn43F7z1feVsEh8Fw2FbzoFYz5/4uudP -aAh9g9TH7R4At02G6XqyLgayIzj+2ZILo5nz5/ULGbwCvoFQ+HjbZ84u/X8tRQuR -5kxOTnkxEoB8wbKGz8XZddqjC9ufzM4gobsGuougMFSGaCyqrvK7xS9wiVQYPA== ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIID2zCCAsOgAwIBAgIUY6A2eCEpaP+hfVPA3mgtROGIQQ0wDQYJKoZIhvcNAQEL -BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ -BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x -HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNjA3MTkxNzE1 -WhgPMjEyMTA1MTQxOTE3MTVaMHwxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM -MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEVMBMGA1UE -AwwMcm9vdGNhLmFkbWluMR8wHQYJKoZIhvcNAQkBFhByb290Y2FAYWRtaW4uY29t -MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuw5ntBeNNq6CDlUcztnv -6MYzFpTXTdn+pqGPq032OHE/ochWxVFy1gKm0hxgFp0d6kEiKc/h9RAp9Er+N0e0 -iJyqrKUIaXjWd9P4Dlr4RnQdmajo6k9opyevI32qPXvMKX0cwtMqJO6kB8nQfPgs -U9Za5TO6mJBSJT5jPca0RZy+/ueBto+2MjvFs3K8dCjYmmZeoSrYjCljGkLTPWu+ -lsY+3raBfcj/DUkmGIz8lYAYS3N4JronOUax7E3g2iX7ERf95/sOwi1pADnwoBtm -RhhBhr8+OcWoJtLGfHHyDyFUSYPwb+0ZiE62lR6ClkFf7YJt7GsOS4/sapcV1PTj -pQIDAQABo1MwUTAdBgNVHQ4EFgQU0l1SqLRsPdC+/OP70UY74wkAd7QwHwYDVR0j -BBgwFoAU0l1SqLRsPdC+/OP70UY74wkAd7QwDwYDVR0TAQH/BAUwAwEB/zANBgkq -hkiG9w0BAQsFAAOCAQEATaIT3/UU5B8BKeKiqTKr02diC6gvNCkuAy37eq8uFUzy -5YzSkAZtKcVFBU5cEl8/mnd+a3w1EiJtzE4FtwR5J/fKHzCmsq+QTTrneUsVyx4g -02yqnik1Z7NmYzfnpol+t90Beo0Mwr1n4NEbQri9Z2qNxDX4fwlAqqfAGCAKjrWp -+scvjv/wCxfd9+EHZp5GvtORHB7ZnQUe5qY08SjxP5nbRDHdiVTCs3otHo9F+5Rq -oecPStW11C0XzH22RJMZFM8VhFBqPNeaAc+QvbXBgjLDjkftewqklHJWPc/rmFxR -Hc7m7LCRf+8X/o6uxRJ1fBDjnNfTkUwW4bEtd31efw== ------END CERTIFICATE----- diff --git a/ethereum/p2p/src/test/resources/keys/partner1client1/truststore.jks b/ethereum/p2p/src/test/resources/keys/partner1client1/truststore.jks deleted file mode 100644 index 2921fe0517..0000000000 Binary files a/ethereum/p2p/src/test/resources/keys/partner1client1/truststore.jks and /dev/null differ diff --git a/ethereum/p2p/src/test/resources/keys/partner1client1/truststore.p12 b/ethereum/p2p/src/test/resources/keys/partner1client1/truststore.p12 new file mode 100644 index 0000000000..96e3253a6e Binary files /dev/null and b/ethereum/p2p/src/test/resources/keys/partner1client1/truststore.p12 differ diff --git a/ethereum/p2p/src/test/resources/keys/partner1client2rvk/client2.p12 b/ethereum/p2p/src/test/resources/keys/partner1client2rvk/client2.p12 new file mode 100644 index 0000000000..5168f2e055 Binary files /dev/null and b/ethereum/p2p/src/test/resources/keys/partner1client2rvk/client2.p12 differ diff --git a/ethereum/p2p/src/test/resources/keys/partner1client2rvk/crl.pem b/ethereum/p2p/src/test/resources/keys/partner1client2rvk/crl.pem deleted file mode 100644 index 48552756f2..0000000000 --- a/ethereum/p2p/src/test/resources/keys/partner1client2rvk/crl.pem +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN X509 CRL----- -MIICBDCB7QIBATANBgkqhkiG9w0BAQsFADCBgTELMAkGA1UEBhMCVVMxCzAJBgNV -BAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJBgNVBAoMAk1DMQ0wCwYDVQQLDARyb290 -MRMwEQYDVQQDDApwYXJ0bmVyMWNhMSYwJAYJKoZIhvcNAQkBFhdwYXJ0bmVyMWNh -QHBhcnRuZXIxLmNvbRcNMjEwNjA3MTkxNzI4WhcNMjIwNjA3MTkxNzI4WjAnMCUC -FFFuSkrE8m/dVEcso4PkZUFYmvFBFw0yMTA2MDcxOTE3MjhaoA4wDDAKBgNVHRQE -AwIBADANBgkqhkiG9w0BAQsFAAOCAQEAQujFul5rvGr4yytm/mjPQdcbeSTM3uT/ -aFM6WbPE6DHx5/R1ItNCyA7YdfxzojfZ+kzR7j0WsSydWT2TngHD/2C6tIhXZRcG -UG6E473xniLFctn0FYyKZL03pOwdQgWk4dCUd3Ko8Qbos+vTRClXPMnPANPwJjYG -7x1UlEPShHaoQNiDakuUa6fGZyyFGbTWuH1zltH3aUKh/L2w1/Sndkv66Cmr4VQ0 -s/ZsMnjJNPrjZJs32BzjxVaWYToe6vpwiQ6+UGyaZ3GTfv6r/oTWeRxcmQeXAT03 -kxbwywkQwFndeC9NlrOQRM+TipsOybeiJToQskmPiEJ/7xfUAHOV3w== ------END X509 CRL----- ------BEGIN X509 CRL----- -MIICLDCCARQCAQEwDQYJKoZIhvcNAQELBQAwgYExCzAJBgNVBAYTAlVTMQswCQYD -VQQIDAJDQTEMMAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9v -dDETMBEGA1UEAwwKcGFydG5lcjJjYTEmMCQGCSqGSIb3DQEJARYXcGFydG5lcjJj -YUBwYXJ0bmVyMi5jb20XDTIxMDYwNzE5MTcyOFoXDTIyMDYwNzE5MTcyOFowTjAl -AhQtbA3PphdVjORDUvomlgGblf8OABcNMjEwNjA3MTkxNzI4WjAlAhRRbkpKxPJv -3VRHLKOD5GVBWJrxQRcNMjEwNjA3MTkxNzI4WqAOMAwwCgYDVR0UBAMCAQEwDQYJ -KoZIhvcNAQELBQADggEBAJXmtYDcF+sA0zQiRiCOIALVUQ4i0t4UwREEL7SEzD9C -hAOas0uFwkPef1hQWNkvx+OghFb3fStKS1zh9zbJx0fxyKttfsaaW2dQX4H8tyRR -vtuNtZBv/PT2ouWdpumSh9TmQUxKr/Uer5gGaqOm1S5MOemOVEYfsNqAzSnGI7f9 -v5yMDywigHfv2dmM7xpttSZG3WCd5w0PJisndyAV/qga3CQMI5X6DIpWHmHbcD3k -sSps2YggdueW7y61uoi61jvpOGTbr6UAWLjHRyL35txC9xOMGJgJqBgebw/hGmW9 -syY2loiEfzWX0A/9KGPo6Q8PB2YJbMmc7WT04g5W++8= ------END X509 CRL----- diff --git a/ethereum/p2p/src/test/resources/keys/partner1client2rvk/keys.p12 b/ethereum/p2p/src/test/resources/keys/partner1client2rvk/keys.p12 deleted file mode 100644 index 2a634cbab7..0000000000 Binary files a/ethereum/p2p/src/test/resources/keys/partner1client2rvk/keys.p12 and /dev/null differ diff --git a/ethereum/p2p/src/test/resources/keys/partner1client2rvk/keystore.jks b/ethereum/p2p/src/test/resources/keys/partner1client2rvk/keystore.jks deleted file mode 100644 index 66580ee76d..0000000000 Binary files a/ethereum/p2p/src/test/resources/keys/partner1client2rvk/keystore.jks and /dev/null differ diff --git a/ethereum/p2p/src/test/resources/keys/partner1client2rvk/nss.cfg b/ethereum/p2p/src/test/resources/keys/partner1client2rvk/nss.cfg deleted file mode 100644 index 7d76873f3d..0000000000 --- a/ethereum/p2p/src/test/resources/keys/partner1client2rvk/nss.cfg +++ /dev/null @@ -1,6 +0,0 @@ - -name = NSScrypto-partner1client2rvk -nssSecmodDirectory = ./src/test/resources/keys/partner1client2rvk/nssdb -nssDbMode = readOnly -nssModule = keystore - diff --git a/ethereum/p2p/src/test/resources/keys/partner1client2rvk/nssdb/cert8.db b/ethereum/p2p/src/test/resources/keys/partner1client2rvk/nssdb/cert8.db deleted file mode 100644 index 3b3a07aa0e..0000000000 Binary files a/ethereum/p2p/src/test/resources/keys/partner1client2rvk/nssdb/cert8.db and /dev/null differ diff --git a/ethereum/p2p/src/test/resources/keys/partner1client2rvk/nssdb/key3.db b/ethereum/p2p/src/test/resources/keys/partner1client2rvk/nssdb/key3.db deleted file mode 100644 index d4841cc32a..0000000000 Binary files a/ethereum/p2p/src/test/resources/keys/partner1client2rvk/nssdb/key3.db and /dev/null differ diff --git a/ethereum/p2p/src/test/resources/keys/partner1client2rvk/nssdb/secmod.db b/ethereum/p2p/src/test/resources/keys/partner1client2rvk/nssdb/secmod.db deleted file mode 100644 index 1fe6e30aaf..0000000000 Binary files a/ethereum/p2p/src/test/resources/keys/partner1client2rvk/nssdb/secmod.db and /dev/null differ diff --git a/ethereum/p2p/src/test/resources/keys/partner1client2rvk/nsspin.txt b/ethereum/p2p/src/test/resources/keys/partner1client2rvk/nsspin.txt deleted file mode 100644 index 5271a52680..0000000000 --- a/ethereum/p2p/src/test/resources/keys/partner1client2rvk/nsspin.txt +++ /dev/null @@ -1 +0,0 @@ -test123 diff --git a/ethereum/p2p/src/test/resources/keys/partner1client2rvk/ssl-ca.pem b/ethereum/p2p/src/test/resources/keys/partner1client2rvk/ssl-ca.pem deleted file mode 100644 index 61ef3d79ed..0000000000 --- a/ethereum/p2p/src/test/resources/keys/partner1client2rvk/ssl-ca.pem +++ /dev/null @@ -1,70 +0,0 @@ ------BEGIN CERTIFICATE----- -MIID8DCCAtigAwIBAgIUEJC9AdHUUw4ERLyYQmzHk6NSn6gwDQYJKoZIhvcNAQEL -BQAweDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ -BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRAwDgYDVQQDDAdpbnRlcmNhMSAwHgYJ -KoZIhvcNAQkBFhFpbnRlcmNhQGFkbWluLmNvbTAgFw0yMTA2MDcxOTE3MTVaGA8y -MTIxMDUxNDE5MTcxNVowgYExCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoG -A1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDETMBEGA1UEAwwK -cGFydG5lcjFjYTEmMCQGCSqGSIb3DQEJARYXcGFydG5lcjFjYUBwYXJ0bmVyMS5j -b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDNy4ztMqq6KIYHrYRQ -2XNXZisj5oiTyrdlZ2+lo7P8xrS12d8ZigA2ofs6lGSXPQiM6HbShw0NPGacbElL -rueqJyiN/AC8ZGWx6jJG4rvtOwtrftXHaa17iSqnStvT6Jk7wShAZYZfDaYAw1kc -ryCs2RdbOCXWLvlMyZT4l0g0U7VEfTStSDP7T1NjEEjfDQvKrdoNHoNaXneRQFhx -0DCrNbyfoUwBIeQPYIpmi92hWlwNV9/GooyHj0pK78eVb+tl7AVlvjuilph+IIos -8e7s+TCPRNbT0ksDIKUrcd7ZBkJzoRs8bRvSAQyCZZcPqiQce8z7BchxGJJZQUJH -nFRlAgMBAAGjZjBkMB0GA1UdDgQWBBTIqkjkocRp/5kHvmu19OdHACemJjAfBgNV -HSMEGDAWgBTI4y/EE00f+IcRV07NdF4bEg1S/TASBgNVHRMBAf8ECDAGAQH/AgEA -MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEACgRyonvWCo7z/v+a -o1WN9EunfMtiNhSHAyx9CMJhkBhcGWqsSCkEPXWKLRsnIBKSGbikpr1Jg3bHdwB5 -PYV+EIZvS0ndzupg/01xToTHQMS2ynCT/3QBCmPUPYm3sJa3KArNgWAUOzPdJ/Fj -fi53cADpr78Z2/tdY2SSUzLe+nJZf5MHTAx2I06XUi04ic7GdC2d1+g0AdsFatZN -vbxeAZx0Bg5sc8F9CDGmlYjJ/TeZ8s2hM+6hogz+4lz7W47GxqzMW/2I3WkDGcQd -SO5usxYoOztihuu7g9QzB3hGTc+SelnPtk91FQhpxO1qEQIfDkUJksZcvxcgTaX9 -LbcwIw== ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIID6jCCAtKgAwIBAgIUFdCzxpaFd/h+szr/7iWKsoQQAAcwDQYJKoZIhvcNAQEL -BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ -BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x -HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNjA3MTkxNzE1 -WhgPMjEyMTA1MTQxOTE3MTVaMHgxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM -MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEQMA4GA1UE -AwwHaW50ZXJjYTEgMB4GCSqGSIb3DQEJARYRaW50ZXJjYUBhZG1pbi5jb20wggEi -MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQyBkPmtfNcev4/BeiFIJJw5vk -+xrIQnIRC1FAq/Db14lWPk7L+ZnlgzR0Agc+JTpi7C2qC42KHpIvLeMFAa8ww/dI -yGHTu/ds0KEgBXDIa4amdZQuK5lNN681226jCgxz7xGEHmStNT74aXEgwajcflwe -sijn5pEIA+MIujYQ8eFWfhpkyL3l6Zzbd3NKnBGAmaWd8rE33ka9Gs6sw5KRFbjI -khgxePl9/S8Uip7Fm8DY4OUDLzhQpOUvv+sZuX+g7Hjh+rvyWULVHnHCZlkkQz2s -J4IIOB6SihgSHkTwsLGDXySymMY3GMmo4nIiu9lu5IfjZxYTkhbQLB2kC0JrAgMB -AAGjZjBkMB0GA1UdDgQWBBTI4y/EE00f+IcRV07NdF4bEg1S/TAfBgNVHSMEGDAW -gBTSXVKotGw90L784/vRRjvjCQB3tDASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1Ud -DwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEArLGs90jHg7a7vIm2igyD4+/6 -LdL8pZwdmNKSFYQLsIjre5vJcSchQPyL850pIk1aZciFtBtTxWHVt8xNsKpqmV3l -BhEk4PXtebnwVVYATZznDd97h9pd3Dmaos9JPhz8oLs4Ly5BY0JzUHQk+o3o6EAg -p5Oa/WM0ZPs2FzbcxSjq3HmKlpDyIL+5Jn43F7z1feVsEh8Fw2FbzoFYz5/4uudP -aAh9g9TH7R4At02G6XqyLgayIzj+2ZILo5nz5/ULGbwCvoFQ+HjbZ84u/X8tRQuR -5kxOTnkxEoB8wbKGz8XZddqjC9ufzM4gobsGuougMFSGaCyqrvK7xS9wiVQYPA== ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIID2zCCAsOgAwIBAgIUY6A2eCEpaP+hfVPA3mgtROGIQQ0wDQYJKoZIhvcNAQEL -BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ -BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x -HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNjA3MTkxNzE1 -WhgPMjEyMTA1MTQxOTE3MTVaMHwxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM -MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEVMBMGA1UE -AwwMcm9vdGNhLmFkbWluMR8wHQYJKoZIhvcNAQkBFhByb290Y2FAYWRtaW4uY29t -MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuw5ntBeNNq6CDlUcztnv -6MYzFpTXTdn+pqGPq032OHE/ochWxVFy1gKm0hxgFp0d6kEiKc/h9RAp9Er+N0e0 -iJyqrKUIaXjWd9P4Dlr4RnQdmajo6k9opyevI32qPXvMKX0cwtMqJO6kB8nQfPgs -U9Za5TO6mJBSJT5jPca0RZy+/ueBto+2MjvFs3K8dCjYmmZeoSrYjCljGkLTPWu+ -lsY+3raBfcj/DUkmGIz8lYAYS3N4JronOUax7E3g2iX7ERf95/sOwi1pADnwoBtm -RhhBhr8+OcWoJtLGfHHyDyFUSYPwb+0ZiE62lR6ClkFf7YJt7GsOS4/sapcV1PTj -pQIDAQABo1MwUTAdBgNVHQ4EFgQU0l1SqLRsPdC+/OP70UY74wkAd7QwHwYDVR0j -BBgwFoAU0l1SqLRsPdC+/OP70UY74wkAd7QwDwYDVR0TAQH/BAUwAwEB/zANBgkq -hkiG9w0BAQsFAAOCAQEATaIT3/UU5B8BKeKiqTKr02diC6gvNCkuAy37eq8uFUzy -5YzSkAZtKcVFBU5cEl8/mnd+a3w1EiJtzE4FtwR5J/fKHzCmsq+QTTrneUsVyx4g -02yqnik1Z7NmYzfnpol+t90Beo0Mwr1n4NEbQri9Z2qNxDX4fwlAqqfAGCAKjrWp -+scvjv/wCxfd9+EHZp5GvtORHB7ZnQUe5qY08SjxP5nbRDHdiVTCs3otHo9F+5Rq -oecPStW11C0XzH22RJMZFM8VhFBqPNeaAc+QvbXBgjLDjkftewqklHJWPc/rmFxR -Hc7m7LCRf+8X/o6uxRJ1fBDjnNfTkUwW4bEtd31efw== ------END CERTIFICATE----- diff --git a/ethereum/p2p/src/test/resources/keys/partner1client2rvk/ssl.pem b/ethereum/p2p/src/test/resources/keys/partner1client2rvk/ssl.pem deleted file mode 100644 index 2d0ac5d97b..0000000000 --- a/ethereum/p2p/src/test/resources/keys/partner1client2rvk/ssl.pem +++ /dev/null @@ -1,126 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIIEwAIBADANBgkqhkiG9w0BAQEFAASCBKowggSmAgEAAoIBAQDYC3xKV4yPWkcW -cpDZmuS4GzTj4A8gW5JZurw560p2eNyiGZfbN2i5oxFNnQOmyGBcWEisBJriEY65 -M1QhC5kJG+kWBCoTQ9vwjGH1mCmEJWhpxJzzWsQe0W2RJDnLvzfU81ajWrGCOi2s -pN/8Nc+jjBhRq0bd+nkfMqcADttgBc2qerCoVxjD45CVffQt1A4VkfpnPvbuw+tz -ucEivppUJa0JlzaBLS1Qvx9oRhm/hJGL+EWEKZ+inE10aY4tguTj49uWuO0P36vW -zuXrjjn6RRKZ+0tUQse7eNBs0EkwS7AL55JiCz921Mtt4yVDRc4JoPb6pbxMKJIe -LDVA6ozRAgMBAAECggEBAJ1lcL2wnuTpfpTqDoGaiTtgBt5lpF+Ml0jr9Km1s+Aw -GX23a5z390IXfUmwNLLTlPByGS/JgxVkeTiQHqCclHfAb8XsbsLuU1Qi0lNc8hIm -NrWn2jipTeyt40c0vy6jNwfb6KjGMECSJih7TfuvMIEUVbtaLx0VmByUiHpQWJ7R -BHr8Y1ukZshxVm7aJSO9pvuRsy/u4R9qq2u4dU4EBiTXteDYTYouwBZI1AxXzlX8 -4ORJ2Txakv7qLoV1j53PwAhdEHPKrO/2VvSPfZwmzJ6+ofydQKrd83KgzQda8huZ -Pd8iYDVeQGtwWG91ubiZszBAEgoi1i4QYpDJhEKorAECgYEA9uuIQLNpv4ItyHfV -yCB/eWbW3KHrPWU3TlSOfwIAfIzRuk9oxLNfaA/Y9qLX4nLUsiZRfVjBYHaiECL3 -IrkxYsMDZlyyZq85+uMvXLuiWb9bkkySODgc2VARlIRp6Rtc8XK+SAiFTDgEWS9E -JCpykwL6cpD6gvPxI6LxurFFzrECgYEA3/1Mi1gb+MYMC/54Wz8VMNoMwqJuxjX2 -He3lQtgFIvmOoi5FqJ6Qy7bUifZBSAH7MG15wcGA+nr4dmPbzbzgWw/7RdXXYYHM -E3v4DoYlaeDW5yIaSGpXCDpJ6EZsQ+4NkQLUFfIda2Rija0Xw9fVaJcLj/i0J6go -EoAYrwTjaCECgYEAieB9RbupOfHEBOO9cTGMXMrrAWo8xBynpEqdAxioEuRDHCjJ -VMTgamgm+5l0uRLr58pzyG1uFaJI3n/XxgDpLb+9P0RVrfb8hjajtMFlZ33t8SRm -pZPXsBUArBDAXxUTchNjYy+21xeUfgRhpVw6fBK2rJB+Ae+bYA3VsyzX0RECgYEA -rcB53iXtHN/UfIFbr7yRnaGoAFusfolhb/oYu++CnIzl/hzS4GiQfdZHrPWf0lHn -HrvtlUWb3bIChyQTX9dCWqFdE+E8AGGFgx/JXsrkvusxCX7E0KPc+37r0gi+9zr0 -vyZoitWTyLjIUoqRQtRssYNp7rbIWXLyEtfXTf0GwsECgYEAqvnZx+hF9tBQlamL -tnc523SVx+0xeeKyQqe633VQqRy8Wy32nakVTzXv01BNKZ692rMTL5UNsydUm1uP -S3++Mfjy046TZRwHLVE9eE6+9bTT9KaxAdWf/ooQGGifkpjcm8TU6sETX0Ghcl4h -L2UG4X2N2Plpb2Pi3RjepGa9qqg= ------END PRIVATE KEY----- ------BEGIN CERTIFICATE----- -MIIEzjCCA7agAwIBAgIUUW5KSsTyb91URyyjg+RlQVia8UEwDQYJKoZIhvcNAQEL -BQAwgYExCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoGA1UEBwwDU0ZPMQsw -CQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDETMBEGA1UEAwwKcGFydG5lcjFjYTEm -MCQGCSqGSIb3DQEJARYXcGFydG5lcjFjYUBwYXJ0bmVyMS5jb20wIBcNMjEwNjA3 -MTkxNzI0WhgPMjEyMTA1MTQxOTE3MjRaMIGRMQswCQYDVQQGEwJVUzELMAkGA1UE -CAwCQ0ExDDAKBgNVBAcMA1NGTzELMAkGA1UECgwCTUMxDTALBgNVBAsMBHJvb3Qx -GzAZBgNVBAMMEnBhcnRuZXIxY2xpZW50MnJ2azEuMCwGCSqGSIb3DQEJARYfcGFy -dG5lcjFjbGllbnQycnZrQHBhcnRuZXIxLmNvbTCCASIwDQYJKoZIhvcNAQEBBQAD -ggEPADCCAQoCggEBANgLfEpXjI9aRxZykNma5LgbNOPgDyBbklm6vDnrSnZ43KIZ -l9s3aLmjEU2dA6bIYFxYSKwEmuIRjrkzVCELmQkb6RYEKhND2/CMYfWYKYQlaGnE -nPNaxB7RbZEkOcu/N9TzVqNasYI6Layk3/w1z6OMGFGrRt36eR8ypwAO22AFzap6 -sKhXGMPjkJV99C3UDhWR+mc+9u7D63O5wSK+mlQlrQmXNoEtLVC/H2hGGb+EkYv4 -RYQpn6KcTXRpji2C5OPj25a47Q/fq9bO5euOOfpFEpn7S1RCx7t40GzQSTBLsAvn -kmILP3bUy23jJUNFzgmg9vqlvEwokh4sNUDqjNECAwEAAaOCASgwggEkMBEGCWCG -SAGG+EIBAQQEAwIGwDAdBgNVHQ4EFgQUUEG1Jtyl+XAoXO6kYDoMt4Gw1bcwCQYD -VR0TBAIwADAOBgNVHQ8BAf8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG -AQUFBwMCMIG1BgNVHSMEga0wgaqAFMiqSOShxGn/mQe+a7X050cAJ6YmoXykejB4 -MQswCQYDVQQGEwJVUzELMAkGA1UECAwCQ0ExDDAKBgNVBAcMA1NGTzELMAkGA1UE -CgwCTUMxDTALBgNVBAsMBHJvb3QxEDAOBgNVBAMMB2ludGVyY2ExIDAeBgkqhkiG -9w0BCQEWEWludGVyY2FAYWRtaW4uY29tghQQkL0B0dRTDgREvJhCbMeTo1KfqDAN -BgkqhkiG9w0BAQsFAAOCAQEAy6XXVzzCzR8Eyo5TU6MRsWLORWCxM7x5li2VyTsj -QOKPg7GN9dl8Fq0SSnHzUfCODksWV+aD4Sh+RMleKXO96ZHJ/SinQRVcqfNsh3c1 -dZEVQGoKTLnuUrTdR2/Vgnz6mTOKZWNE7B51bvA9YaY3/cniclY2eRtRhwYaXXh/ -8JcTR+3BsfLWHXUfz+tCQcqN1Fo4AgR6TMoRrKHNM/bIE/HrQn9YNgmnisDsR2fp -tV826nln7+MkZoFFxji2esPA6e9i7MPTQx1ACJ/THZiFwhYYopZt+ecEfCEjMzDa -RtgR3nfpCHCXyl+Xk+nMmMRqWGoUbEUkCGDKEVr7Ai20LQ== ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIID8DCCAtigAwIBAgIUEJC9AdHUUw4ERLyYQmzHk6NSn6gwDQYJKoZIhvcNAQEL -BQAweDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ -BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRAwDgYDVQQDDAdpbnRlcmNhMSAwHgYJ -KoZIhvcNAQkBFhFpbnRlcmNhQGFkbWluLmNvbTAgFw0yMTA2MDcxOTE3MTVaGA8y -MTIxMDUxNDE5MTcxNVowgYExCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoG -A1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDETMBEGA1UEAwwK -cGFydG5lcjFjYTEmMCQGCSqGSIb3DQEJARYXcGFydG5lcjFjYUBwYXJ0bmVyMS5j -b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDNy4ztMqq6KIYHrYRQ -2XNXZisj5oiTyrdlZ2+lo7P8xrS12d8ZigA2ofs6lGSXPQiM6HbShw0NPGacbElL -rueqJyiN/AC8ZGWx6jJG4rvtOwtrftXHaa17iSqnStvT6Jk7wShAZYZfDaYAw1kc -ryCs2RdbOCXWLvlMyZT4l0g0U7VEfTStSDP7T1NjEEjfDQvKrdoNHoNaXneRQFhx -0DCrNbyfoUwBIeQPYIpmi92hWlwNV9/GooyHj0pK78eVb+tl7AVlvjuilph+IIos -8e7s+TCPRNbT0ksDIKUrcd7ZBkJzoRs8bRvSAQyCZZcPqiQce8z7BchxGJJZQUJH -nFRlAgMBAAGjZjBkMB0GA1UdDgQWBBTIqkjkocRp/5kHvmu19OdHACemJjAfBgNV -HSMEGDAWgBTI4y/EE00f+IcRV07NdF4bEg1S/TASBgNVHRMBAf8ECDAGAQH/AgEA -MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEACgRyonvWCo7z/v+a -o1WN9EunfMtiNhSHAyx9CMJhkBhcGWqsSCkEPXWKLRsnIBKSGbikpr1Jg3bHdwB5 -PYV+EIZvS0ndzupg/01xToTHQMS2ynCT/3QBCmPUPYm3sJa3KArNgWAUOzPdJ/Fj -fi53cADpr78Z2/tdY2SSUzLe+nJZf5MHTAx2I06XUi04ic7GdC2d1+g0AdsFatZN -vbxeAZx0Bg5sc8F9CDGmlYjJ/TeZ8s2hM+6hogz+4lz7W47GxqzMW/2I3WkDGcQd -SO5usxYoOztihuu7g9QzB3hGTc+SelnPtk91FQhpxO1qEQIfDkUJksZcvxcgTaX9 -LbcwIw== ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIID6jCCAtKgAwIBAgIUFdCzxpaFd/h+szr/7iWKsoQQAAcwDQYJKoZIhvcNAQEL -BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ -BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x -HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNjA3MTkxNzE1 -WhgPMjEyMTA1MTQxOTE3MTVaMHgxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM -MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEQMA4GA1UE -AwwHaW50ZXJjYTEgMB4GCSqGSIb3DQEJARYRaW50ZXJjYUBhZG1pbi5jb20wggEi -MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQyBkPmtfNcev4/BeiFIJJw5vk -+xrIQnIRC1FAq/Db14lWPk7L+ZnlgzR0Agc+JTpi7C2qC42KHpIvLeMFAa8ww/dI -yGHTu/ds0KEgBXDIa4amdZQuK5lNN681226jCgxz7xGEHmStNT74aXEgwajcflwe -sijn5pEIA+MIujYQ8eFWfhpkyL3l6Zzbd3NKnBGAmaWd8rE33ka9Gs6sw5KRFbjI -khgxePl9/S8Uip7Fm8DY4OUDLzhQpOUvv+sZuX+g7Hjh+rvyWULVHnHCZlkkQz2s -J4IIOB6SihgSHkTwsLGDXySymMY3GMmo4nIiu9lu5IfjZxYTkhbQLB2kC0JrAgMB -AAGjZjBkMB0GA1UdDgQWBBTI4y/EE00f+IcRV07NdF4bEg1S/TAfBgNVHSMEGDAW -gBTSXVKotGw90L784/vRRjvjCQB3tDASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1Ud -DwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEArLGs90jHg7a7vIm2igyD4+/6 -LdL8pZwdmNKSFYQLsIjre5vJcSchQPyL850pIk1aZciFtBtTxWHVt8xNsKpqmV3l -BhEk4PXtebnwVVYATZznDd97h9pd3Dmaos9JPhz8oLs4Ly5BY0JzUHQk+o3o6EAg -p5Oa/WM0ZPs2FzbcxSjq3HmKlpDyIL+5Jn43F7z1feVsEh8Fw2FbzoFYz5/4uudP -aAh9g9TH7R4At02G6XqyLgayIzj+2ZILo5nz5/ULGbwCvoFQ+HjbZ84u/X8tRQuR -5kxOTnkxEoB8wbKGz8XZddqjC9ufzM4gobsGuougMFSGaCyqrvK7xS9wiVQYPA== ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIID2zCCAsOgAwIBAgIUY6A2eCEpaP+hfVPA3mgtROGIQQ0wDQYJKoZIhvcNAQEL -BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ -BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x -HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNjA3MTkxNzE1 -WhgPMjEyMTA1MTQxOTE3MTVaMHwxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM -MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEVMBMGA1UE -AwwMcm9vdGNhLmFkbWluMR8wHQYJKoZIhvcNAQkBFhByb290Y2FAYWRtaW4uY29t -MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuw5ntBeNNq6CDlUcztnv -6MYzFpTXTdn+pqGPq032OHE/ochWxVFy1gKm0hxgFp0d6kEiKc/h9RAp9Er+N0e0 -iJyqrKUIaXjWd9P4Dlr4RnQdmajo6k9opyevI32qPXvMKX0cwtMqJO6kB8nQfPgs -U9Za5TO6mJBSJT5jPca0RZy+/ueBto+2MjvFs3K8dCjYmmZeoSrYjCljGkLTPWu+ -lsY+3raBfcj/DUkmGIz8lYAYS3N4JronOUax7E3g2iX7ERf95/sOwi1pADnwoBtm -RhhBhr8+OcWoJtLGfHHyDyFUSYPwb+0ZiE62lR6ClkFf7YJt7GsOS4/sapcV1PTj -pQIDAQABo1MwUTAdBgNVHQ4EFgQU0l1SqLRsPdC+/OP70UY74wkAd7QwHwYDVR0j -BBgwFoAU0l1SqLRsPdC+/OP70UY74wkAd7QwDwYDVR0TAQH/BAUwAwEB/zANBgkq -hkiG9w0BAQsFAAOCAQEATaIT3/UU5B8BKeKiqTKr02diC6gvNCkuAy37eq8uFUzy -5YzSkAZtKcVFBU5cEl8/mnd+a3w1EiJtzE4FtwR5J/fKHzCmsq+QTTrneUsVyx4g -02yqnik1Z7NmYzfnpol+t90Beo0Mwr1n4NEbQri9Z2qNxDX4fwlAqqfAGCAKjrWp -+scvjv/wCxfd9+EHZp5GvtORHB7ZnQUe5qY08SjxP5nbRDHdiVTCs3otHo9F+5Rq -oecPStW11C0XzH22RJMZFM8VhFBqPNeaAc+QvbXBgjLDjkftewqklHJWPc/rmFxR -Hc7m7LCRf+8X/o6uxRJ1fBDjnNfTkUwW4bEtd31efw== ------END CERTIFICATE----- diff --git a/ethereum/p2p/src/test/resources/keys/partner1client2rvk/truststore.jks b/ethereum/p2p/src/test/resources/keys/partner1client2rvk/truststore.jks deleted file mode 100644 index d4b6d34027..0000000000 Binary files a/ethereum/p2p/src/test/resources/keys/partner1client2rvk/truststore.jks and /dev/null differ diff --git a/ethereum/p2p/src/test/resources/keys/partner1client2rvk/truststore.p12 b/ethereum/p2p/src/test/resources/keys/partner1client2rvk/truststore.p12 new file mode 100644 index 0000000000..96e3253a6e Binary files /dev/null and b/ethereum/p2p/src/test/resources/keys/partner1client2rvk/truststore.p12 differ diff --git a/ethereum/p2p/src/test/resources/keys/partner2client1/client1.p12 b/ethereum/p2p/src/test/resources/keys/partner2client1/client1.p12 new file mode 100644 index 0000000000..e58b4de86e Binary files /dev/null and b/ethereum/p2p/src/test/resources/keys/partner2client1/client1.p12 differ diff --git a/ethereum/p2p/src/test/resources/keys/partner2client1/crl.pem b/ethereum/p2p/src/test/resources/keys/partner2client1/crl.pem deleted file mode 100644 index 48552756f2..0000000000 --- a/ethereum/p2p/src/test/resources/keys/partner2client1/crl.pem +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN X509 CRL----- -MIICBDCB7QIBATANBgkqhkiG9w0BAQsFADCBgTELMAkGA1UEBhMCVVMxCzAJBgNV -BAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJBgNVBAoMAk1DMQ0wCwYDVQQLDARyb290 -MRMwEQYDVQQDDApwYXJ0bmVyMWNhMSYwJAYJKoZIhvcNAQkBFhdwYXJ0bmVyMWNh -QHBhcnRuZXIxLmNvbRcNMjEwNjA3MTkxNzI4WhcNMjIwNjA3MTkxNzI4WjAnMCUC -FFFuSkrE8m/dVEcso4PkZUFYmvFBFw0yMTA2MDcxOTE3MjhaoA4wDDAKBgNVHRQE -AwIBADANBgkqhkiG9w0BAQsFAAOCAQEAQujFul5rvGr4yytm/mjPQdcbeSTM3uT/ -aFM6WbPE6DHx5/R1ItNCyA7YdfxzojfZ+kzR7j0WsSydWT2TngHD/2C6tIhXZRcG -UG6E473xniLFctn0FYyKZL03pOwdQgWk4dCUd3Ko8Qbos+vTRClXPMnPANPwJjYG -7x1UlEPShHaoQNiDakuUa6fGZyyFGbTWuH1zltH3aUKh/L2w1/Sndkv66Cmr4VQ0 -s/ZsMnjJNPrjZJs32BzjxVaWYToe6vpwiQ6+UGyaZ3GTfv6r/oTWeRxcmQeXAT03 -kxbwywkQwFndeC9NlrOQRM+TipsOybeiJToQskmPiEJ/7xfUAHOV3w== ------END X509 CRL----- ------BEGIN X509 CRL----- -MIICLDCCARQCAQEwDQYJKoZIhvcNAQELBQAwgYExCzAJBgNVBAYTAlVTMQswCQYD -VQQIDAJDQTEMMAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9v -dDETMBEGA1UEAwwKcGFydG5lcjJjYTEmMCQGCSqGSIb3DQEJARYXcGFydG5lcjJj -YUBwYXJ0bmVyMi5jb20XDTIxMDYwNzE5MTcyOFoXDTIyMDYwNzE5MTcyOFowTjAl -AhQtbA3PphdVjORDUvomlgGblf8OABcNMjEwNjA3MTkxNzI4WjAlAhRRbkpKxPJv -3VRHLKOD5GVBWJrxQRcNMjEwNjA3MTkxNzI4WqAOMAwwCgYDVR0UBAMCAQEwDQYJ -KoZIhvcNAQELBQADggEBAJXmtYDcF+sA0zQiRiCOIALVUQ4i0t4UwREEL7SEzD9C -hAOas0uFwkPef1hQWNkvx+OghFb3fStKS1zh9zbJx0fxyKttfsaaW2dQX4H8tyRR -vtuNtZBv/PT2ouWdpumSh9TmQUxKr/Uer5gGaqOm1S5MOemOVEYfsNqAzSnGI7f9 -v5yMDywigHfv2dmM7xpttSZG3WCd5w0PJisndyAV/qga3CQMI5X6DIpWHmHbcD3k -sSps2YggdueW7y61uoi61jvpOGTbr6UAWLjHRyL35txC9xOMGJgJqBgebw/hGmW9 -syY2loiEfzWX0A/9KGPo6Q8PB2YJbMmc7WT04g5W++8= ------END X509 CRL----- diff --git a/ethereum/p2p/src/test/resources/keys/partner2client1/keys.p12 b/ethereum/p2p/src/test/resources/keys/partner2client1/keys.p12 deleted file mode 100644 index c417c39aee..0000000000 Binary files a/ethereum/p2p/src/test/resources/keys/partner2client1/keys.p12 and /dev/null differ diff --git a/ethereum/p2p/src/test/resources/keys/partner2client1/keystore.jks b/ethereum/p2p/src/test/resources/keys/partner2client1/keystore.jks deleted file mode 100644 index 7311b75369..0000000000 Binary files a/ethereum/p2p/src/test/resources/keys/partner2client1/keystore.jks and /dev/null differ diff --git a/ethereum/p2p/src/test/resources/keys/partner2client1/nss.cfg b/ethereum/p2p/src/test/resources/keys/partner2client1/nss.cfg deleted file mode 100644 index 8439740704..0000000000 --- a/ethereum/p2p/src/test/resources/keys/partner2client1/nss.cfg +++ /dev/null @@ -1,6 +0,0 @@ - -name = NSScrypto-partner2client1 -nssSecmodDirectory = ./src/test/resources/keys/partner2client1/nssdb -nssDbMode = readOnly -nssModule = keystore - diff --git a/ethereum/p2p/src/test/resources/keys/partner2client1/nssdb/cert8.db b/ethereum/p2p/src/test/resources/keys/partner2client1/nssdb/cert8.db deleted file mode 100644 index dbacdad027..0000000000 Binary files a/ethereum/p2p/src/test/resources/keys/partner2client1/nssdb/cert8.db and /dev/null differ diff --git a/ethereum/p2p/src/test/resources/keys/partner2client1/nssdb/key3.db b/ethereum/p2p/src/test/resources/keys/partner2client1/nssdb/key3.db deleted file mode 100644 index 926c078db4..0000000000 Binary files a/ethereum/p2p/src/test/resources/keys/partner2client1/nssdb/key3.db and /dev/null differ diff --git a/ethereum/p2p/src/test/resources/keys/partner2client1/nssdb/secmod.db b/ethereum/p2p/src/test/resources/keys/partner2client1/nssdb/secmod.db deleted file mode 100644 index f1e3080f2e..0000000000 Binary files a/ethereum/p2p/src/test/resources/keys/partner2client1/nssdb/secmod.db and /dev/null differ diff --git a/ethereum/p2p/src/test/resources/keys/partner2client1/nsspin.txt b/ethereum/p2p/src/test/resources/keys/partner2client1/nsspin.txt deleted file mode 100644 index 5271a52680..0000000000 --- a/ethereum/p2p/src/test/resources/keys/partner2client1/nsspin.txt +++ /dev/null @@ -1 +0,0 @@ -test123 diff --git a/ethereum/p2p/src/test/resources/keys/partner2client1/ssl-ca.pem b/ethereum/p2p/src/test/resources/keys/partner2client1/ssl-ca.pem deleted file mode 100644 index ab4622f897..0000000000 --- a/ethereum/p2p/src/test/resources/keys/partner2client1/ssl-ca.pem +++ /dev/null @@ -1,70 +0,0 @@ ------BEGIN CERTIFICATE----- -MIID8DCCAtigAwIBAgIUEJC9AdHUUw4ERLyYQmzHk6NSn6kwDQYJKoZIhvcNAQEL -BQAweDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ -BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRAwDgYDVQQDDAdpbnRlcmNhMSAwHgYJ -KoZIhvcNAQkBFhFpbnRlcmNhQGFkbWluLmNvbTAgFw0yMTA2MDcxOTE3MThaGA8y -MTIxMDUxNDE5MTcxOFowgYExCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoG -A1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDETMBEGA1UEAwwK -cGFydG5lcjJjYTEmMCQGCSqGSIb3DQEJARYXcGFydG5lcjJjYUBwYXJ0bmVyMi5j -b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQtWo8TV9BbLVD1MbK -VG2JhK188OqSKJAp2AJDVfJHyV73mR7L0KcvKvxvkIQKh6rQTD50ZAajZODt5/cI -l2Ar0PmxGWhJ2M1yyAjtRCMr8RwROejk1+nlsHwwWIhnLFS0l+G7m882OmTh+zLj -dgO9wmjfK2YcBjyZozkDHbziI1MZNpmFvh6Rq34d9IQCQJsWMPQQ46jbKCkHfp8l -IjBnQSC2N/IH66hbeEBP8UsNbkoyajhZI26oy+bp37hKF+UgGPIaByMY/vqwEjk4 -gxB95PrYuB0c+YHPWOXMKXlIk6sxsXPmcKy6R/kV2OckARJ2/PtSq2FRp0J4elBH -To1vAgMBAAGjZjBkMB0GA1UdDgQWBBRnmFzdLo0c92a+BHMhWprNvUdwjDAfBgNV -HSMEGDAWgBTI4y/EE00f+IcRV07NdF4bEg1S/TASBgNVHRMBAf8ECDAGAQH/AgEA -MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEAY3VNlUKHN0rgPABL -HHrADPuB8M+wRK/p1L28cYXw64tfpemjERMIKh7IyuX1e9vOnQQPPWMnyH0Qv+ZA -06w/lF6yWLSf8cTAKK1QAa4ZPDC+74g2TwwzLXmuQDWNKb1+zPNxgmzcqmDNdXTU -N+mAN+tAL2aVXK61TfZlfhmbBkeSvow3Usj9dMydynk0Vea9AdIwvPi/nhBgAC7M -UJ1ulR/froF+d7eIpFNPgbcR2t06da+Wm22PgU5xRM9c90zpNHKNgmXSawOoUOF7 -jrtCDf94hWnlqVJX2VUj0acqFzDIKyvCkZEHo6VqlKykbOtaTTBVEnTXMKdtp5OO -YBjw2Q== ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIID6jCCAtKgAwIBAgIUFdCzxpaFd/h+szr/7iWKsoQQAAcwDQYJKoZIhvcNAQEL -BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ -BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x -HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNjA3MTkxNzE1 -WhgPMjEyMTA1MTQxOTE3MTVaMHgxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM -MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEQMA4GA1UE -AwwHaW50ZXJjYTEgMB4GCSqGSIb3DQEJARYRaW50ZXJjYUBhZG1pbi5jb20wggEi -MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQyBkPmtfNcev4/BeiFIJJw5vk -+xrIQnIRC1FAq/Db14lWPk7L+ZnlgzR0Agc+JTpi7C2qC42KHpIvLeMFAa8ww/dI -yGHTu/ds0KEgBXDIa4amdZQuK5lNN681226jCgxz7xGEHmStNT74aXEgwajcflwe -sijn5pEIA+MIujYQ8eFWfhpkyL3l6Zzbd3NKnBGAmaWd8rE33ka9Gs6sw5KRFbjI -khgxePl9/S8Uip7Fm8DY4OUDLzhQpOUvv+sZuX+g7Hjh+rvyWULVHnHCZlkkQz2s -J4IIOB6SihgSHkTwsLGDXySymMY3GMmo4nIiu9lu5IfjZxYTkhbQLB2kC0JrAgMB -AAGjZjBkMB0GA1UdDgQWBBTI4y/EE00f+IcRV07NdF4bEg1S/TAfBgNVHSMEGDAW -gBTSXVKotGw90L784/vRRjvjCQB3tDASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1Ud -DwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEArLGs90jHg7a7vIm2igyD4+/6 -LdL8pZwdmNKSFYQLsIjre5vJcSchQPyL850pIk1aZciFtBtTxWHVt8xNsKpqmV3l -BhEk4PXtebnwVVYATZznDd97h9pd3Dmaos9JPhz8oLs4Ly5BY0JzUHQk+o3o6EAg -p5Oa/WM0ZPs2FzbcxSjq3HmKlpDyIL+5Jn43F7z1feVsEh8Fw2FbzoFYz5/4uudP -aAh9g9TH7R4At02G6XqyLgayIzj+2ZILo5nz5/ULGbwCvoFQ+HjbZ84u/X8tRQuR -5kxOTnkxEoB8wbKGz8XZddqjC9ufzM4gobsGuougMFSGaCyqrvK7xS9wiVQYPA== ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIID2zCCAsOgAwIBAgIUY6A2eCEpaP+hfVPA3mgtROGIQQ0wDQYJKoZIhvcNAQEL -BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ -BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x -HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNjA3MTkxNzE1 -WhgPMjEyMTA1MTQxOTE3MTVaMHwxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM -MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEVMBMGA1UE -AwwMcm9vdGNhLmFkbWluMR8wHQYJKoZIhvcNAQkBFhByb290Y2FAYWRtaW4uY29t -MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuw5ntBeNNq6CDlUcztnv -6MYzFpTXTdn+pqGPq032OHE/ochWxVFy1gKm0hxgFp0d6kEiKc/h9RAp9Er+N0e0 -iJyqrKUIaXjWd9P4Dlr4RnQdmajo6k9opyevI32qPXvMKX0cwtMqJO6kB8nQfPgs -U9Za5TO6mJBSJT5jPca0RZy+/ueBto+2MjvFs3K8dCjYmmZeoSrYjCljGkLTPWu+ -lsY+3raBfcj/DUkmGIz8lYAYS3N4JronOUax7E3g2iX7ERf95/sOwi1pADnwoBtm -RhhBhr8+OcWoJtLGfHHyDyFUSYPwb+0ZiE62lR6ClkFf7YJt7GsOS4/sapcV1PTj -pQIDAQABo1MwUTAdBgNVHQ4EFgQU0l1SqLRsPdC+/OP70UY74wkAd7QwHwYDVR0j -BBgwFoAU0l1SqLRsPdC+/OP70UY74wkAd7QwDwYDVR0TAQH/BAUwAwEB/zANBgkq -hkiG9w0BAQsFAAOCAQEATaIT3/UU5B8BKeKiqTKr02diC6gvNCkuAy37eq8uFUzy -5YzSkAZtKcVFBU5cEl8/mnd+a3w1EiJtzE4FtwR5J/fKHzCmsq+QTTrneUsVyx4g -02yqnik1Z7NmYzfnpol+t90Beo0Mwr1n4NEbQri9Z2qNxDX4fwlAqqfAGCAKjrWp -+scvjv/wCxfd9+EHZp5GvtORHB7ZnQUe5qY08SjxP5nbRDHdiVTCs3otHo9F+5Rq -oecPStW11C0XzH22RJMZFM8VhFBqPNeaAc+QvbXBgjLDjkftewqklHJWPc/rmFxR -Hc7m7LCRf+8X/o6uxRJ1fBDjnNfTkUwW4bEtd31efw== ------END CERTIFICATE----- diff --git a/ethereum/p2p/src/test/resources/keys/partner2client1/ssl.pem b/ethereum/p2p/src/test/resources/keys/partner2client1/ssl.pem deleted file mode 100644 index 0710f6056c..0000000000 --- a/ethereum/p2p/src/test/resources/keys/partner2client1/ssl.pem +++ /dev/null @@ -1,126 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQC/MLtfZCd98R3+ -GkHi8PW9/z0L53wdE4vrzFVE6b1AIKwxEeCYqXOVVWR1NEOiGr28xoKJit2AXJrY -7w1rv1w5sOwpDiigM8WKIDJUTYKsJV5FAGdzngFw/UQRZcxUrJ3vaFvyQ7WREWsy -dtPwohJbczRucXfdaJXJthpa8w5Idx9h+gY+uts0R0BQhGz3Wwk0ikPj4mNA6ToF -SdkDizfTnAiDvzU0LBgAmwVBGws+M3ptdpadeB8P64NGlu3NM4px9UsS7HupJ2rF -EBUJuajTqy5/IPuz2/CFu0UPH6hYSx1kcgUNqYJxE3f/ueqVZ2naahtUR/anb12d -QzlVaYonAgMBAAECggEBALVY8PGrWzY/hdZna4VqT33XYz0uZfBigP65g0vpdaQl -GY81yNalLEhChhYR6/EP8lbj6B+0gyNlM09/eDhye3URVwAeOPS0BrRck8CZANBu -ZXuHxZjKD83vvSfPakAKt4fFcilahhdC8W4dfiyqXkU2Ak6b/DkcIbABtf/8udiK -1ltLBzbwOZnRpVWvfSWGlPjs9tr7BexLC3umufEPq7US2FqO9Yv+M6/eWAKeRmbp -nJXPqMtKLLnEdD/31Kr9UxITW3Lf5MlqHk97nyJ51PJeX7ga+TJgpiTFSwkaWIuH -WIDxvaTZ24WnIJAoa7csfrEAyJvzNVlw61Dl4982gjECgYEA+o3x8qiR0y01dvLB -Gi0irmjSY+vTWYHHZCTQCThq8S/chaueH+xxaw3aJiXJ0D0H2Ynjr0rv+OnNyiQB -fKNWnVdqRF37T8Z9+3ju2UIHgJAg31TTwFMsix0p3iAi9X71VaOtD4IeNj3539mh -LdiZu3I09yhnRhQP2u3HhdAEd/kCgYEAw1h99lCC6cAZdDzLGWkxNSDqfAIMzWKA -YuGfusy6yr2ItVknyo9GnAFzfruNJ4df240R5watwaPkwpWqqzTNDN2iD7AKPYbK -CR0uvAylrWigpFPnskPDfJiqtIPI1uqucOUNypPR1S5ubr5CoM88VGwWzuWVtVZ3 -xIlNbyVl2x8CgYEAq294PxrMPHxQesT7D5gWhNPAMRJpGHNOJN1zYvuxYLno36Vf -mmRD7oYZ38Q3ZD5+IoDQw144+E2xu0ALrGZum1X2pjTQAfPEu84xT4J4c6UqeOUn -xg6jCcS4ov3GLcfiweguP9A+L8sUL/BO8nmkJresOfjxQOf1OU09GfgNNrECgYBy -qIdOw1UD5LhMDL7dTGwQliBr5zwidVWMNIhvuWlORM9wOkNr1osIWKW01lr0v7XZ -BUVjx/zG8u7786M4WIaerZxI/vgTwwDlNpbO09GPJiFcMs+FR9b/VBCmYc/Jrffz -1c4xgHAiY9137P7oqprrpoIAsKsdxAIKftjPizDs2wKBgQCeg0sOzKfeMR6cLiVl -LbvAIBsS7Jq93Ezq3MypiMzV1pUQxMVU576QmffwLvMzf6V9Z4eecOUbMgGvDDlA -OawFJ0iEuSj/wdzt688EqnU6geK7Gsfyk8VnU9OPVU9dJ0lseaDQUVdbJt+1o35Q -N3qUOWS7YAxDC/+2Lr1jK9Z3Ew== ------END PRIVATE KEY----- ------BEGIN CERTIFICATE----- -MIIEyDCCA7CgAwIBAgIULWwNz6YXVYzkQ1L6JpYBm5X/Df8wDQYJKoZIhvcNAQEL -BQAwgYExCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoGA1UEBwwDU0ZPMQsw -CQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDETMBEGA1UEAwwKcGFydG5lcjJjYTEm -MCQGCSqGSIb3DQEJARYXcGFydG5lcjJjYUBwYXJ0bmVyMi5jb20wIBcNMjEwNjA3 -MTkxNzE4WhgPMjEyMTA1MTQxOTE3MThaMIGLMQswCQYDVQQGEwJVUzELMAkGA1UE -CAwCQ0ExDDAKBgNVBAcMA1NGTzELMAkGA1UECgwCTUMxDTALBgNVBAsMBHJvb3Qx -GDAWBgNVBAMMD3BhcnRuZXIyY2xpZW50MTErMCkGCSqGSIb3DQEJARYccGFydG5l -cjJjbGllbnQxQHBhcnRuZXIyLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC -AQoCggEBAL8wu19kJ33xHf4aQeLw9b3/PQvnfB0Ti+vMVUTpvUAgrDER4Jipc5VV -ZHU0Q6IavbzGgomK3YBcmtjvDWu/XDmw7CkOKKAzxYogMlRNgqwlXkUAZ3OeAXD9 -RBFlzFSsne9oW/JDtZERazJ20/CiEltzNG5xd91olcm2GlrzDkh3H2H6Bj662zRH -QFCEbPdbCTSKQ+PiY0DpOgVJ2QOLN9OcCIO/NTQsGACbBUEbCz4zem12lp14Hw/r -g0aW7c0zinH1SxLse6knasUQFQm5qNOrLn8g+7Pb8IW7RQ8fqFhLHWRyBQ2pgnET -d/+56pVnadpqG1RH9qdvXZ1DOVVpiicCAwEAAaOCASgwggEkMBEGCWCGSAGG+EIB -AQQEAwIGwDAdBgNVHQ4EFgQU3/QmjsNlicyus6bEpaH7qP3AqFowCQYDVR0TBAIw -ADAOBgNVHQ8BAf8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC -MIG1BgNVHSMEga0wgaqAFGeYXN0ujRz3Zr4EcyFams29R3CMoXykejB4MQswCQYD -VQQGEwJVUzELMAkGA1UECAwCQ0ExDDAKBgNVBAcMA1NGTzELMAkGA1UECgwCTUMx -DTALBgNVBAsMBHJvb3QxEDAOBgNVBAMMB2ludGVyY2ExIDAeBgkqhkiG9w0BCQEW -EWludGVyY2FAYWRtaW4uY29tghQQkL0B0dRTDgREvJhCbMeTo1KfqTANBgkqhkiG -9w0BAQsFAAOCAQEAEFcKWHpwaNLg5NjRykYHpePU3LfHUDYcQ/W3WEeRJNrHonr5 -qv72eKu0Lbn80gT+YTO0ZeOez5KA5BaGYodA4dEv3O4FUiF67GYrAwyH0+vCzXmB -KBufQkL6BeWOC8PpqGoN/Ek3Iyh8a+mra59As18+6iE3ZhlAL9b4HTnBD3Yx+d7J -wNonodKBcLzvGRhMZFd8j3kw/X/UU21RnYjX5xrUoa/XTAEFLpTpbtKWKkvIycea -vtuciaZWmgJG64qigupa9QqsYnwK0+jNM4ASvuclZa5GDL8m8wJtidYDMDSGySmO -/gwZBXboh71OdBq4ra8Cm1xbKBD3y5Ts2bzp0w== ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIID8DCCAtigAwIBAgIUEJC9AdHUUw4ERLyYQmzHk6NSn6kwDQYJKoZIhvcNAQEL -BQAweDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ -BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRAwDgYDVQQDDAdpbnRlcmNhMSAwHgYJ -KoZIhvcNAQkBFhFpbnRlcmNhQGFkbWluLmNvbTAgFw0yMTA2MDcxOTE3MThaGA8y -MTIxMDUxNDE5MTcxOFowgYExCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoG -A1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDETMBEGA1UEAwwK -cGFydG5lcjJjYTEmMCQGCSqGSIb3DQEJARYXcGFydG5lcjJjYUBwYXJ0bmVyMi5j -b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQtWo8TV9BbLVD1MbK -VG2JhK188OqSKJAp2AJDVfJHyV73mR7L0KcvKvxvkIQKh6rQTD50ZAajZODt5/cI -l2Ar0PmxGWhJ2M1yyAjtRCMr8RwROejk1+nlsHwwWIhnLFS0l+G7m882OmTh+zLj -dgO9wmjfK2YcBjyZozkDHbziI1MZNpmFvh6Rq34d9IQCQJsWMPQQ46jbKCkHfp8l -IjBnQSC2N/IH66hbeEBP8UsNbkoyajhZI26oy+bp37hKF+UgGPIaByMY/vqwEjk4 -gxB95PrYuB0c+YHPWOXMKXlIk6sxsXPmcKy6R/kV2OckARJ2/PtSq2FRp0J4elBH -To1vAgMBAAGjZjBkMB0GA1UdDgQWBBRnmFzdLo0c92a+BHMhWprNvUdwjDAfBgNV -HSMEGDAWgBTI4y/EE00f+IcRV07NdF4bEg1S/TASBgNVHRMBAf8ECDAGAQH/AgEA -MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEAY3VNlUKHN0rgPABL -HHrADPuB8M+wRK/p1L28cYXw64tfpemjERMIKh7IyuX1e9vOnQQPPWMnyH0Qv+ZA -06w/lF6yWLSf8cTAKK1QAa4ZPDC+74g2TwwzLXmuQDWNKb1+zPNxgmzcqmDNdXTU -N+mAN+tAL2aVXK61TfZlfhmbBkeSvow3Usj9dMydynk0Vea9AdIwvPi/nhBgAC7M -UJ1ulR/froF+d7eIpFNPgbcR2t06da+Wm22PgU5xRM9c90zpNHKNgmXSawOoUOF7 -jrtCDf94hWnlqVJX2VUj0acqFzDIKyvCkZEHo6VqlKykbOtaTTBVEnTXMKdtp5OO -YBjw2Q== ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIID6jCCAtKgAwIBAgIUFdCzxpaFd/h+szr/7iWKsoQQAAcwDQYJKoZIhvcNAQEL -BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ -BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x -HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNjA3MTkxNzE1 -WhgPMjEyMTA1MTQxOTE3MTVaMHgxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM -MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEQMA4GA1UE -AwwHaW50ZXJjYTEgMB4GCSqGSIb3DQEJARYRaW50ZXJjYUBhZG1pbi5jb20wggEi -MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQyBkPmtfNcev4/BeiFIJJw5vk -+xrIQnIRC1FAq/Db14lWPk7L+ZnlgzR0Agc+JTpi7C2qC42KHpIvLeMFAa8ww/dI -yGHTu/ds0KEgBXDIa4amdZQuK5lNN681226jCgxz7xGEHmStNT74aXEgwajcflwe -sijn5pEIA+MIujYQ8eFWfhpkyL3l6Zzbd3NKnBGAmaWd8rE33ka9Gs6sw5KRFbjI -khgxePl9/S8Uip7Fm8DY4OUDLzhQpOUvv+sZuX+g7Hjh+rvyWULVHnHCZlkkQz2s -J4IIOB6SihgSHkTwsLGDXySymMY3GMmo4nIiu9lu5IfjZxYTkhbQLB2kC0JrAgMB -AAGjZjBkMB0GA1UdDgQWBBTI4y/EE00f+IcRV07NdF4bEg1S/TAfBgNVHSMEGDAW -gBTSXVKotGw90L784/vRRjvjCQB3tDASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1Ud -DwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEArLGs90jHg7a7vIm2igyD4+/6 -LdL8pZwdmNKSFYQLsIjre5vJcSchQPyL850pIk1aZciFtBtTxWHVt8xNsKpqmV3l -BhEk4PXtebnwVVYATZznDd97h9pd3Dmaos9JPhz8oLs4Ly5BY0JzUHQk+o3o6EAg -p5Oa/WM0ZPs2FzbcxSjq3HmKlpDyIL+5Jn43F7z1feVsEh8Fw2FbzoFYz5/4uudP -aAh9g9TH7R4At02G6XqyLgayIzj+2ZILo5nz5/ULGbwCvoFQ+HjbZ84u/X8tRQuR -5kxOTnkxEoB8wbKGz8XZddqjC9ufzM4gobsGuougMFSGaCyqrvK7xS9wiVQYPA== ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIID2zCCAsOgAwIBAgIUY6A2eCEpaP+hfVPA3mgtROGIQQ0wDQYJKoZIhvcNAQEL -BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ -BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x -HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNjA3MTkxNzE1 -WhgPMjEyMTA1MTQxOTE3MTVaMHwxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM -MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEVMBMGA1UE -AwwMcm9vdGNhLmFkbWluMR8wHQYJKoZIhvcNAQkBFhByb290Y2FAYWRtaW4uY29t -MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuw5ntBeNNq6CDlUcztnv -6MYzFpTXTdn+pqGPq032OHE/ochWxVFy1gKm0hxgFp0d6kEiKc/h9RAp9Er+N0e0 -iJyqrKUIaXjWd9P4Dlr4RnQdmajo6k9opyevI32qPXvMKX0cwtMqJO6kB8nQfPgs -U9Za5TO6mJBSJT5jPca0RZy+/ueBto+2MjvFs3K8dCjYmmZeoSrYjCljGkLTPWu+ -lsY+3raBfcj/DUkmGIz8lYAYS3N4JronOUax7E3g2iX7ERf95/sOwi1pADnwoBtm -RhhBhr8+OcWoJtLGfHHyDyFUSYPwb+0ZiE62lR6ClkFf7YJt7GsOS4/sapcV1PTj -pQIDAQABo1MwUTAdBgNVHQ4EFgQU0l1SqLRsPdC+/OP70UY74wkAd7QwHwYDVR0j -BBgwFoAU0l1SqLRsPdC+/OP70UY74wkAd7QwDwYDVR0TAQH/BAUwAwEB/zANBgkq -hkiG9w0BAQsFAAOCAQEATaIT3/UU5B8BKeKiqTKr02diC6gvNCkuAy37eq8uFUzy -5YzSkAZtKcVFBU5cEl8/mnd+a3w1EiJtzE4FtwR5J/fKHzCmsq+QTTrneUsVyx4g -02yqnik1Z7NmYzfnpol+t90Beo0Mwr1n4NEbQri9Z2qNxDX4fwlAqqfAGCAKjrWp -+scvjv/wCxfd9+EHZp5GvtORHB7ZnQUe5qY08SjxP5nbRDHdiVTCs3otHo9F+5Rq -oecPStW11C0XzH22RJMZFM8VhFBqPNeaAc+QvbXBgjLDjkftewqklHJWPc/rmFxR -Hc7m7LCRf+8X/o6uxRJ1fBDjnNfTkUwW4bEtd31efw== ------END CERTIFICATE----- diff --git a/ethereum/p2p/src/test/resources/keys/partner2client1/truststore.jks b/ethereum/p2p/src/test/resources/keys/partner2client1/truststore.jks deleted file mode 100644 index 01a14c3d9f..0000000000 Binary files a/ethereum/p2p/src/test/resources/keys/partner2client1/truststore.jks and /dev/null differ diff --git a/ethereum/p2p/src/test/resources/keys/partner2client1/truststore.p12 b/ethereum/p2p/src/test/resources/keys/partner2client1/truststore.p12 new file mode 100644 index 0000000000..9f9c81ae73 Binary files /dev/null and b/ethereum/p2p/src/test/resources/keys/partner2client1/truststore.p12 differ diff --git a/ethereum/p2p/src/test/resources/keys/partner2client2rvk/client2.p12 b/ethereum/p2p/src/test/resources/keys/partner2client2rvk/client2.p12 new file mode 100644 index 0000000000..765a8ecd8a Binary files /dev/null and b/ethereum/p2p/src/test/resources/keys/partner2client2rvk/client2.p12 differ diff --git a/ethereum/p2p/src/test/resources/keys/partner2client2rvk/crl.pem b/ethereum/p2p/src/test/resources/keys/partner2client2rvk/crl.pem deleted file mode 100644 index 48552756f2..0000000000 --- a/ethereum/p2p/src/test/resources/keys/partner2client2rvk/crl.pem +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN X509 CRL----- -MIICBDCB7QIBATANBgkqhkiG9w0BAQsFADCBgTELMAkGA1UEBhMCVVMxCzAJBgNV -BAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJBgNVBAoMAk1DMQ0wCwYDVQQLDARyb290 -MRMwEQYDVQQDDApwYXJ0bmVyMWNhMSYwJAYJKoZIhvcNAQkBFhdwYXJ0bmVyMWNh -QHBhcnRuZXIxLmNvbRcNMjEwNjA3MTkxNzI4WhcNMjIwNjA3MTkxNzI4WjAnMCUC -FFFuSkrE8m/dVEcso4PkZUFYmvFBFw0yMTA2MDcxOTE3MjhaoA4wDDAKBgNVHRQE -AwIBADANBgkqhkiG9w0BAQsFAAOCAQEAQujFul5rvGr4yytm/mjPQdcbeSTM3uT/ -aFM6WbPE6DHx5/R1ItNCyA7YdfxzojfZ+kzR7j0WsSydWT2TngHD/2C6tIhXZRcG -UG6E473xniLFctn0FYyKZL03pOwdQgWk4dCUd3Ko8Qbos+vTRClXPMnPANPwJjYG -7x1UlEPShHaoQNiDakuUa6fGZyyFGbTWuH1zltH3aUKh/L2w1/Sndkv66Cmr4VQ0 -s/ZsMnjJNPrjZJs32BzjxVaWYToe6vpwiQ6+UGyaZ3GTfv6r/oTWeRxcmQeXAT03 -kxbwywkQwFndeC9NlrOQRM+TipsOybeiJToQskmPiEJ/7xfUAHOV3w== ------END X509 CRL----- ------BEGIN X509 CRL----- -MIICLDCCARQCAQEwDQYJKoZIhvcNAQELBQAwgYExCzAJBgNVBAYTAlVTMQswCQYD -VQQIDAJDQTEMMAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9v -dDETMBEGA1UEAwwKcGFydG5lcjJjYTEmMCQGCSqGSIb3DQEJARYXcGFydG5lcjJj -YUBwYXJ0bmVyMi5jb20XDTIxMDYwNzE5MTcyOFoXDTIyMDYwNzE5MTcyOFowTjAl -AhQtbA3PphdVjORDUvomlgGblf8OABcNMjEwNjA3MTkxNzI4WjAlAhRRbkpKxPJv -3VRHLKOD5GVBWJrxQRcNMjEwNjA3MTkxNzI4WqAOMAwwCgYDVR0UBAMCAQEwDQYJ -KoZIhvcNAQELBQADggEBAJXmtYDcF+sA0zQiRiCOIALVUQ4i0t4UwREEL7SEzD9C -hAOas0uFwkPef1hQWNkvx+OghFb3fStKS1zh9zbJx0fxyKttfsaaW2dQX4H8tyRR -vtuNtZBv/PT2ouWdpumSh9TmQUxKr/Uer5gGaqOm1S5MOemOVEYfsNqAzSnGI7f9 -v5yMDywigHfv2dmM7xpttSZG3WCd5w0PJisndyAV/qga3CQMI5X6DIpWHmHbcD3k -sSps2YggdueW7y61uoi61jvpOGTbr6UAWLjHRyL35txC9xOMGJgJqBgebw/hGmW9 -syY2loiEfzWX0A/9KGPo6Q8PB2YJbMmc7WT04g5W++8= ------END X509 CRL----- diff --git a/ethereum/p2p/src/test/resources/keys/partner2client2rvk/keys.p12 b/ethereum/p2p/src/test/resources/keys/partner2client2rvk/keys.p12 deleted file mode 100644 index 5da2c34850..0000000000 Binary files a/ethereum/p2p/src/test/resources/keys/partner2client2rvk/keys.p12 and /dev/null differ diff --git a/ethereum/p2p/src/test/resources/keys/partner2client2rvk/keystore.jks b/ethereum/p2p/src/test/resources/keys/partner2client2rvk/keystore.jks deleted file mode 100644 index 4a26bf55cc..0000000000 Binary files a/ethereum/p2p/src/test/resources/keys/partner2client2rvk/keystore.jks and /dev/null differ diff --git a/ethereum/p2p/src/test/resources/keys/partner2client2rvk/nss.cfg b/ethereum/p2p/src/test/resources/keys/partner2client2rvk/nss.cfg deleted file mode 100644 index 346520ceb1..0000000000 --- a/ethereum/p2p/src/test/resources/keys/partner2client2rvk/nss.cfg +++ /dev/null @@ -1,6 +0,0 @@ - -name = NSScrypto-partner2client2rvk -nssSecmodDirectory = ./src/test/resources/keys/partner2client2rvk/nssdb -nssDbMode = readOnly -nssModule = keystore - diff --git a/ethereum/p2p/src/test/resources/keys/partner2client2rvk/nssdb/cert8.db b/ethereum/p2p/src/test/resources/keys/partner2client2rvk/nssdb/cert8.db deleted file mode 100644 index c6671f556b..0000000000 Binary files a/ethereum/p2p/src/test/resources/keys/partner2client2rvk/nssdb/cert8.db and /dev/null differ diff --git a/ethereum/p2p/src/test/resources/keys/partner2client2rvk/nssdb/key3.db b/ethereum/p2p/src/test/resources/keys/partner2client2rvk/nssdb/key3.db deleted file mode 100644 index 8196471efe..0000000000 Binary files a/ethereum/p2p/src/test/resources/keys/partner2client2rvk/nssdb/key3.db and /dev/null differ diff --git a/ethereum/p2p/src/test/resources/keys/partner2client2rvk/nssdb/secmod.db b/ethereum/p2p/src/test/resources/keys/partner2client2rvk/nssdb/secmod.db deleted file mode 100644 index 1a6de49b75..0000000000 Binary files a/ethereum/p2p/src/test/resources/keys/partner2client2rvk/nssdb/secmod.db and /dev/null differ diff --git a/ethereum/p2p/src/test/resources/keys/partner2client2rvk/nsspin.txt b/ethereum/p2p/src/test/resources/keys/partner2client2rvk/nsspin.txt deleted file mode 100644 index 5271a52680..0000000000 --- a/ethereum/p2p/src/test/resources/keys/partner2client2rvk/nsspin.txt +++ /dev/null @@ -1 +0,0 @@ -test123 diff --git a/ethereum/p2p/src/test/resources/keys/partner2client2rvk/ssl-ca.pem b/ethereum/p2p/src/test/resources/keys/partner2client2rvk/ssl-ca.pem deleted file mode 100644 index ab4622f897..0000000000 --- a/ethereum/p2p/src/test/resources/keys/partner2client2rvk/ssl-ca.pem +++ /dev/null @@ -1,70 +0,0 @@ ------BEGIN CERTIFICATE----- -MIID8DCCAtigAwIBAgIUEJC9AdHUUw4ERLyYQmzHk6NSn6kwDQYJKoZIhvcNAQEL -BQAweDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ -BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRAwDgYDVQQDDAdpbnRlcmNhMSAwHgYJ -KoZIhvcNAQkBFhFpbnRlcmNhQGFkbWluLmNvbTAgFw0yMTA2MDcxOTE3MThaGA8y -MTIxMDUxNDE5MTcxOFowgYExCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoG -A1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDETMBEGA1UEAwwK -cGFydG5lcjJjYTEmMCQGCSqGSIb3DQEJARYXcGFydG5lcjJjYUBwYXJ0bmVyMi5j -b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQtWo8TV9BbLVD1MbK -VG2JhK188OqSKJAp2AJDVfJHyV73mR7L0KcvKvxvkIQKh6rQTD50ZAajZODt5/cI -l2Ar0PmxGWhJ2M1yyAjtRCMr8RwROejk1+nlsHwwWIhnLFS0l+G7m882OmTh+zLj -dgO9wmjfK2YcBjyZozkDHbziI1MZNpmFvh6Rq34d9IQCQJsWMPQQ46jbKCkHfp8l -IjBnQSC2N/IH66hbeEBP8UsNbkoyajhZI26oy+bp37hKF+UgGPIaByMY/vqwEjk4 -gxB95PrYuB0c+YHPWOXMKXlIk6sxsXPmcKy6R/kV2OckARJ2/PtSq2FRp0J4elBH -To1vAgMBAAGjZjBkMB0GA1UdDgQWBBRnmFzdLo0c92a+BHMhWprNvUdwjDAfBgNV -HSMEGDAWgBTI4y/EE00f+IcRV07NdF4bEg1S/TASBgNVHRMBAf8ECDAGAQH/AgEA -MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEAY3VNlUKHN0rgPABL -HHrADPuB8M+wRK/p1L28cYXw64tfpemjERMIKh7IyuX1e9vOnQQPPWMnyH0Qv+ZA -06w/lF6yWLSf8cTAKK1QAa4ZPDC+74g2TwwzLXmuQDWNKb1+zPNxgmzcqmDNdXTU -N+mAN+tAL2aVXK61TfZlfhmbBkeSvow3Usj9dMydynk0Vea9AdIwvPi/nhBgAC7M -UJ1ulR/froF+d7eIpFNPgbcR2t06da+Wm22PgU5xRM9c90zpNHKNgmXSawOoUOF7 -jrtCDf94hWnlqVJX2VUj0acqFzDIKyvCkZEHo6VqlKykbOtaTTBVEnTXMKdtp5OO -YBjw2Q== ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIID6jCCAtKgAwIBAgIUFdCzxpaFd/h+szr/7iWKsoQQAAcwDQYJKoZIhvcNAQEL -BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ -BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x -HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNjA3MTkxNzE1 -WhgPMjEyMTA1MTQxOTE3MTVaMHgxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM -MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEQMA4GA1UE -AwwHaW50ZXJjYTEgMB4GCSqGSIb3DQEJARYRaW50ZXJjYUBhZG1pbi5jb20wggEi -MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQyBkPmtfNcev4/BeiFIJJw5vk -+xrIQnIRC1FAq/Db14lWPk7L+ZnlgzR0Agc+JTpi7C2qC42KHpIvLeMFAa8ww/dI -yGHTu/ds0KEgBXDIa4amdZQuK5lNN681226jCgxz7xGEHmStNT74aXEgwajcflwe -sijn5pEIA+MIujYQ8eFWfhpkyL3l6Zzbd3NKnBGAmaWd8rE33ka9Gs6sw5KRFbjI -khgxePl9/S8Uip7Fm8DY4OUDLzhQpOUvv+sZuX+g7Hjh+rvyWULVHnHCZlkkQz2s -J4IIOB6SihgSHkTwsLGDXySymMY3GMmo4nIiu9lu5IfjZxYTkhbQLB2kC0JrAgMB -AAGjZjBkMB0GA1UdDgQWBBTI4y/EE00f+IcRV07NdF4bEg1S/TAfBgNVHSMEGDAW -gBTSXVKotGw90L784/vRRjvjCQB3tDASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1Ud -DwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEArLGs90jHg7a7vIm2igyD4+/6 -LdL8pZwdmNKSFYQLsIjre5vJcSchQPyL850pIk1aZciFtBtTxWHVt8xNsKpqmV3l -BhEk4PXtebnwVVYATZznDd97h9pd3Dmaos9JPhz8oLs4Ly5BY0JzUHQk+o3o6EAg -p5Oa/WM0ZPs2FzbcxSjq3HmKlpDyIL+5Jn43F7z1feVsEh8Fw2FbzoFYz5/4uudP -aAh9g9TH7R4At02G6XqyLgayIzj+2ZILo5nz5/ULGbwCvoFQ+HjbZ84u/X8tRQuR -5kxOTnkxEoB8wbKGz8XZddqjC9ufzM4gobsGuougMFSGaCyqrvK7xS9wiVQYPA== ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIID2zCCAsOgAwIBAgIUY6A2eCEpaP+hfVPA3mgtROGIQQ0wDQYJKoZIhvcNAQEL -BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ -BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x -HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNjA3MTkxNzE1 -WhgPMjEyMTA1MTQxOTE3MTVaMHwxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM -MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEVMBMGA1UE -AwwMcm9vdGNhLmFkbWluMR8wHQYJKoZIhvcNAQkBFhByb290Y2FAYWRtaW4uY29t -MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuw5ntBeNNq6CDlUcztnv -6MYzFpTXTdn+pqGPq032OHE/ochWxVFy1gKm0hxgFp0d6kEiKc/h9RAp9Er+N0e0 -iJyqrKUIaXjWd9P4Dlr4RnQdmajo6k9opyevI32qPXvMKX0cwtMqJO6kB8nQfPgs -U9Za5TO6mJBSJT5jPca0RZy+/ueBto+2MjvFs3K8dCjYmmZeoSrYjCljGkLTPWu+ -lsY+3raBfcj/DUkmGIz8lYAYS3N4JronOUax7E3g2iX7ERf95/sOwi1pADnwoBtm -RhhBhr8+OcWoJtLGfHHyDyFUSYPwb+0ZiE62lR6ClkFf7YJt7GsOS4/sapcV1PTj -pQIDAQABo1MwUTAdBgNVHQ4EFgQU0l1SqLRsPdC+/OP70UY74wkAd7QwHwYDVR0j -BBgwFoAU0l1SqLRsPdC+/OP70UY74wkAd7QwDwYDVR0TAQH/BAUwAwEB/zANBgkq -hkiG9w0BAQsFAAOCAQEATaIT3/UU5B8BKeKiqTKr02diC6gvNCkuAy37eq8uFUzy -5YzSkAZtKcVFBU5cEl8/mnd+a3w1EiJtzE4FtwR5J/fKHzCmsq+QTTrneUsVyx4g -02yqnik1Z7NmYzfnpol+t90Beo0Mwr1n4NEbQri9Z2qNxDX4fwlAqqfAGCAKjrWp -+scvjv/wCxfd9+EHZp5GvtORHB7ZnQUe5qY08SjxP5nbRDHdiVTCs3otHo9F+5Rq -oecPStW11C0XzH22RJMZFM8VhFBqPNeaAc+QvbXBgjLDjkftewqklHJWPc/rmFxR -Hc7m7LCRf+8X/o6uxRJ1fBDjnNfTkUwW4bEtd31efw== ------END CERTIFICATE----- diff --git a/ethereum/p2p/src/test/resources/keys/partner2client2rvk/ssl.pem b/ethereum/p2p/src/test/resources/keys/partner2client2rvk/ssl.pem deleted file mode 100644 index e9c86cfec1..0000000000 --- a/ethereum/p2p/src/test/resources/keys/partner2client2rvk/ssl.pem +++ /dev/null @@ -1,126 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDGJRex+n1aHeLL -xZ2bRCuTJxsWMkK4XkHjvj1RVLF1/pIQKmr349a0YHj2K+eFc764mLFCJKpTTG0x -OqNjiGeEIelDRCF9wPo9+uGtJh4Mx+NFZ/xIwMnw6SY5UFiV4cBwzA/ENacUQbO0 -pScDUqaDBT1K0jQdGlBEeBiTsUfHqcAC4RZkVli6uA9pVMiAsU5cCDXYMzrXO/O9 -5pvTxHWdlC06awpncvAW4XAklqRt0Mo6Wj8v+5MWhDbxz+ytIUJu2sXX9Niy4PC0 -vTU+z7J1mgrDuRm52CzMl+swMT5ZzW7knHneXjy+6cMKCUQqjiy187Zy8CdmG5jO -kYdCbkqTAgMBAAECggEBAIYvTHKtLgK/Rn204Fzrt4655vALLX/p5Tkz9haEAoHj -2kq0Tyh81UPmKUScyvdnQPuF/FTMu8QZd8Dk8w1OrLugs3VoSD3/V/htVDOMIsGJ -BHJWT1V9qcRKQCaEMNmfvlElAHBh3TosnGRzi44GhNkpzS5EWCJ1VXJo2kv6vJ+L -NPVlrvJx/w1omO6pGhP2mfjuynBDteGtQorbzEq5y32fMVu2ykSmf/CiDtyQXyS2 -iFZoEKxH9zusGIv026m6ccF2bpkiApI+l+OR8c40Wrxjfxfum++OfO3gHcTvOFZP -hVRWjUsC5LUixNwhZtT1WtittxpJbMGfotp6VhvNX9ECgYEA+P8FYpZG1B3yhIAd -3DWDf0tXJeWeu5JXDVe7N0TWklfgC2rtaZQ1SY3RhoxqQh2FOrZEcvsdIe/D2fE5 -r65gtD/MkR/Pdgqe3/n3XtMXnoSW5D44NOTW1bw3QmE8gwseXQOb3EC7RhYA5Cjf -d2mnG1CbbW3kb7UlfHYLlPR+3WUCgYEAy7fmbdZKwmRoYsH6zbdxPQT9Ufx9Iq7b -8lag1hg7kkS1JEA+qehKO641cVNsB+7IDaW+19JMw/vChPC6XzJUds/egNxdwMSn -S3iUOVTUjizByg/kwIbSaHJq86Y3RtcraL9UMpjNRLav2OAikpX8oVgwupUGsXqN -6bZ0qXDhpJcCgYEA4T0wDeKK586/VwTd/hmafkgU6X8xe9QBU1yNSo3G3FMJpMpx -QRSEr6jOZLwYUv6JSncerDRkQhK2RCxmVnmTmPotfwobjVhGJ63jC7BAqXCfXpC6 -H37yqB2+jxmOt6wTJ2jgUPltbxTwcXRX0ZmNRLRCJVdHUZW390KBb5lMOdECgYBt -SwQ8+TKyh9vY3+kGZNxDuGGPkr4v1U/6+67eLbIIDwR/plf4H79ztUrGudLDjr+V -Us7ISvMUUgVR/TR/ziiydWMSDyfdO6PlQZOEDpbaj/iHx28aOzq2/muSvCH7x4Rq -dfteCcxWiQxediEWM5GNnhrGfx1QKkfokxKTtRPZkQKBgQClz6/o1c3lpNcSqiuD -I4m89SqmiQtC/+21YXC4Xv1dQX3WQezg0AOm5rQuFlcDOtuVWskygxDoNGtmJmsh -lGJwOebeD/P83TY9RQVLWMcyYU6IrD91PT84ck24Me5MafeS2dJNzPlDcwNhj1QM -s1LRab/ivz8LzC5Tw8ab4PjJfg== ------END PRIVATE KEY----- ------BEGIN CERTIFICATE----- -MIIEzjCCA7agAwIBAgIULWwNz6YXVYzkQ1L6JpYBm5X/DgAwDQYJKoZIhvcNAQEL -BQAwgYExCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoGA1UEBwwDU0ZPMQsw -CQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDETMBEGA1UEAwwKcGFydG5lcjJjYTEm -MCQGCSqGSIb3DQEJARYXcGFydG5lcjJjYUBwYXJ0bmVyMi5jb20wIBcNMjEwNjA3 -MTkxNzI2WhgPMjEyMTA1MTQxOTE3MjZaMIGRMQswCQYDVQQGEwJVUzELMAkGA1UE -CAwCQ0ExDDAKBgNVBAcMA1NGTzELMAkGA1UECgwCTUMxDTALBgNVBAsMBHJvb3Qx -GzAZBgNVBAMMEnBhcnRuZXIyY2xpZW50MnJ2azEuMCwGCSqGSIb3DQEJARYfcGFy -dG5lcjJjbGllbnQycnZrQHBhcnRuZXIyLmNvbTCCASIwDQYJKoZIhvcNAQEBBQAD -ggEPADCCAQoCggEBAMYlF7H6fVod4svFnZtEK5MnGxYyQrheQeO+PVFUsXX+khAq -avfj1rRgePYr54VzvriYsUIkqlNMbTE6o2OIZ4Qh6UNEIX3A+j364a0mHgzH40Vn -/EjAyfDpJjlQWJXhwHDMD8Q1pxRBs7SlJwNSpoMFPUrSNB0aUER4GJOxR8epwALh -FmRWWLq4D2lUyICxTlwINdgzOtc7873mm9PEdZ2ULTprCmdy8BbhcCSWpG3Qyjpa -Py/7kxaENvHP7K0hQm7axdf02LLg8LS9NT7PsnWaCsO5GbnYLMyX6zAxPlnNbuSc -ed5ePL7pwwoJRCqOLLXztnLwJ2YbmM6Rh0JuSpMCAwEAAaOCASgwggEkMBEGCWCG -SAGG+EIBAQQEAwIGwDAdBgNVHQ4EFgQUqSjPa5CIQg8I/sqi64Zo1TSG3FowCQYD -VR0TBAIwADAOBgNVHQ8BAf8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG -AQUFBwMCMIG1BgNVHSMEga0wgaqAFGeYXN0ujRz3Zr4EcyFams29R3CMoXykejB4 -MQswCQYDVQQGEwJVUzELMAkGA1UECAwCQ0ExDDAKBgNVBAcMA1NGTzELMAkGA1UE -CgwCTUMxDTALBgNVBAsMBHJvb3QxEDAOBgNVBAMMB2ludGVyY2ExIDAeBgkqhkiG -9w0BCQEWEWludGVyY2FAYWRtaW4uY29tghQQkL0B0dRTDgREvJhCbMeTo1KfqTAN -BgkqhkiG9w0BAQsFAAOCAQEAYYW9CcVbC92BmRHh4w93w6eK7z+Uxu4s8EuCMDzv -Lts/NfEN/wF8eLkO/VEv/Q6q/79/+RbbCsVzAFNTld3CWw34/zdCWxn/wbD9We37 -YICxqDlGGHgf6GBN7Eq97uBxjEPZ3p0RT1aSv9D1nOfG9rpZDqaNsnga4whT5reV -5aLB2b8Qsqakj+V/cv+8l1XW+xlb6vBnbushhg98rB7xZSNaT/EpM7GmJqKzyvhI -YyGDCVWqrPlEOT9wB4rtOXY07TELyRGOa52T+EfwqDSGNYdKvB1PBFwfUaiwVOfL -uveNWs/GqTnm97KTZFpDQgrzsJ7px86YEfmTB9MthVuSfA== ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIID8DCCAtigAwIBAgIUEJC9AdHUUw4ERLyYQmzHk6NSn6kwDQYJKoZIhvcNAQEL -BQAweDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ -BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRAwDgYDVQQDDAdpbnRlcmNhMSAwHgYJ -KoZIhvcNAQkBFhFpbnRlcmNhQGFkbWluLmNvbTAgFw0yMTA2MDcxOTE3MThaGA8y -MTIxMDUxNDE5MTcxOFowgYExCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoG -A1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDETMBEGA1UEAwwK -cGFydG5lcjJjYTEmMCQGCSqGSIb3DQEJARYXcGFydG5lcjJjYUBwYXJ0bmVyMi5j -b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQtWo8TV9BbLVD1MbK -VG2JhK188OqSKJAp2AJDVfJHyV73mR7L0KcvKvxvkIQKh6rQTD50ZAajZODt5/cI -l2Ar0PmxGWhJ2M1yyAjtRCMr8RwROejk1+nlsHwwWIhnLFS0l+G7m882OmTh+zLj -dgO9wmjfK2YcBjyZozkDHbziI1MZNpmFvh6Rq34d9IQCQJsWMPQQ46jbKCkHfp8l -IjBnQSC2N/IH66hbeEBP8UsNbkoyajhZI26oy+bp37hKF+UgGPIaByMY/vqwEjk4 -gxB95PrYuB0c+YHPWOXMKXlIk6sxsXPmcKy6R/kV2OckARJ2/PtSq2FRp0J4elBH -To1vAgMBAAGjZjBkMB0GA1UdDgQWBBRnmFzdLo0c92a+BHMhWprNvUdwjDAfBgNV -HSMEGDAWgBTI4y/EE00f+IcRV07NdF4bEg1S/TASBgNVHRMBAf8ECDAGAQH/AgEA -MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEAY3VNlUKHN0rgPABL -HHrADPuB8M+wRK/p1L28cYXw64tfpemjERMIKh7IyuX1e9vOnQQPPWMnyH0Qv+ZA -06w/lF6yWLSf8cTAKK1QAa4ZPDC+74g2TwwzLXmuQDWNKb1+zPNxgmzcqmDNdXTU -N+mAN+tAL2aVXK61TfZlfhmbBkeSvow3Usj9dMydynk0Vea9AdIwvPi/nhBgAC7M -UJ1ulR/froF+d7eIpFNPgbcR2t06da+Wm22PgU5xRM9c90zpNHKNgmXSawOoUOF7 -jrtCDf94hWnlqVJX2VUj0acqFzDIKyvCkZEHo6VqlKykbOtaTTBVEnTXMKdtp5OO -YBjw2Q== ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIID6jCCAtKgAwIBAgIUFdCzxpaFd/h+szr/7iWKsoQQAAcwDQYJKoZIhvcNAQEL -BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ -BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x -HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNjA3MTkxNzE1 -WhgPMjEyMTA1MTQxOTE3MTVaMHgxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM -MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEQMA4GA1UE -AwwHaW50ZXJjYTEgMB4GCSqGSIb3DQEJARYRaW50ZXJjYUBhZG1pbi5jb20wggEi -MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQyBkPmtfNcev4/BeiFIJJw5vk -+xrIQnIRC1FAq/Db14lWPk7L+ZnlgzR0Agc+JTpi7C2qC42KHpIvLeMFAa8ww/dI -yGHTu/ds0KEgBXDIa4amdZQuK5lNN681226jCgxz7xGEHmStNT74aXEgwajcflwe -sijn5pEIA+MIujYQ8eFWfhpkyL3l6Zzbd3NKnBGAmaWd8rE33ka9Gs6sw5KRFbjI -khgxePl9/S8Uip7Fm8DY4OUDLzhQpOUvv+sZuX+g7Hjh+rvyWULVHnHCZlkkQz2s -J4IIOB6SihgSHkTwsLGDXySymMY3GMmo4nIiu9lu5IfjZxYTkhbQLB2kC0JrAgMB -AAGjZjBkMB0GA1UdDgQWBBTI4y/EE00f+IcRV07NdF4bEg1S/TAfBgNVHSMEGDAW -gBTSXVKotGw90L784/vRRjvjCQB3tDASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1Ud -DwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEArLGs90jHg7a7vIm2igyD4+/6 -LdL8pZwdmNKSFYQLsIjre5vJcSchQPyL850pIk1aZciFtBtTxWHVt8xNsKpqmV3l -BhEk4PXtebnwVVYATZznDd97h9pd3Dmaos9JPhz8oLs4Ly5BY0JzUHQk+o3o6EAg -p5Oa/WM0ZPs2FzbcxSjq3HmKlpDyIL+5Jn43F7z1feVsEh8Fw2FbzoFYz5/4uudP -aAh9g9TH7R4At02G6XqyLgayIzj+2ZILo5nz5/ULGbwCvoFQ+HjbZ84u/X8tRQuR -5kxOTnkxEoB8wbKGz8XZddqjC9ufzM4gobsGuougMFSGaCyqrvK7xS9wiVQYPA== ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIID2zCCAsOgAwIBAgIUY6A2eCEpaP+hfVPA3mgtROGIQQ0wDQYJKoZIhvcNAQEL -BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ -BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x -HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNjA3MTkxNzE1 -WhgPMjEyMTA1MTQxOTE3MTVaMHwxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM -MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEVMBMGA1UE -AwwMcm9vdGNhLmFkbWluMR8wHQYJKoZIhvcNAQkBFhByb290Y2FAYWRtaW4uY29t -MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuw5ntBeNNq6CDlUcztnv -6MYzFpTXTdn+pqGPq032OHE/ochWxVFy1gKm0hxgFp0d6kEiKc/h9RAp9Er+N0e0 -iJyqrKUIaXjWd9P4Dlr4RnQdmajo6k9opyevI32qPXvMKX0cwtMqJO6kB8nQfPgs -U9Za5TO6mJBSJT5jPca0RZy+/ueBto+2MjvFs3K8dCjYmmZeoSrYjCljGkLTPWu+ -lsY+3raBfcj/DUkmGIz8lYAYS3N4JronOUax7E3g2iX7ERf95/sOwi1pADnwoBtm -RhhBhr8+OcWoJtLGfHHyDyFUSYPwb+0ZiE62lR6ClkFf7YJt7GsOS4/sapcV1PTj -pQIDAQABo1MwUTAdBgNVHQ4EFgQU0l1SqLRsPdC+/OP70UY74wkAd7QwHwYDVR0j -BBgwFoAU0l1SqLRsPdC+/OP70UY74wkAd7QwDwYDVR0TAQH/BAUwAwEB/zANBgkq -hkiG9w0BAQsFAAOCAQEATaIT3/UU5B8BKeKiqTKr02diC6gvNCkuAy37eq8uFUzy -5YzSkAZtKcVFBU5cEl8/mnd+a3w1EiJtzE4FtwR5J/fKHzCmsq+QTTrneUsVyx4g -02yqnik1Z7NmYzfnpol+t90Beo0Mwr1n4NEbQri9Z2qNxDX4fwlAqqfAGCAKjrWp -+scvjv/wCxfd9+EHZp5GvtORHB7ZnQUe5qY08SjxP5nbRDHdiVTCs3otHo9F+5Rq -oecPStW11C0XzH22RJMZFM8VhFBqPNeaAc+QvbXBgjLDjkftewqklHJWPc/rmFxR -Hc7m7LCRf+8X/o6uxRJ1fBDjnNfTkUwW4bEtd31efw== ------END CERTIFICATE----- diff --git a/ethereum/p2p/src/test/resources/keys/partner2client2rvk/truststore.jks b/ethereum/p2p/src/test/resources/keys/partner2client2rvk/truststore.jks deleted file mode 100644 index b64631aee6..0000000000 Binary files a/ethereum/p2p/src/test/resources/keys/partner2client2rvk/truststore.jks and /dev/null differ diff --git a/ethereum/p2p/src/test/resources/keys/partner2client2rvk/truststore.p12 b/ethereum/p2p/src/test/resources/keys/partner2client2rvk/truststore.p12 new file mode 100644 index 0000000000..9f9c81ae73 Binary files /dev/null and b/ethereum/p2p/src/test/resources/keys/partner2client2rvk/truststore.p12 differ diff --git a/ethereum/referencetests/src/reference-test/external-resources b/ethereum/referencetests/src/reference-test/external-resources index 638da7ca7b..69c4c2a98d 160000 --- a/ethereum/referencetests/src/reference-test/external-resources +++ b/ethereum/referencetests/src/reference-test/external-resources @@ -1 +1 @@ -Subproject commit 638da7ca7b2ca371ebb33d7d7d2562981aafd9b2 +Subproject commit 69c4c2a98dc8a712d4c6f5a817da4f21ff719006 diff --git a/evm/src/main/java/org/hyperledger/besu/evm/precompile/MainnetPrecompiledContracts.java b/evm/src/main/java/org/hyperledger/besu/evm/precompile/MainnetPrecompiledContracts.java index 40ef77d55a..b6a5f950f4 100644 --- a/evm/src/main/java/org/hyperledger/besu/evm/precompile/MainnetPrecompiledContracts.java +++ b/evm/src/main/java/org/hyperledger/besu/evm/precompile/MainnetPrecompiledContracts.java @@ -18,9 +18,7 @@ import org.hyperledger.besu.datatypes.Address; import org.hyperledger.besu.evm.gascalculator.GasCalculator; /** Provides the various precompiled contracts used on mainnet hard forks. */ -public abstract class MainnetPrecompiledContracts { - - private MainnetPrecompiledContracts() {} +public interface MainnetPrecompiledContracts { /** * Frontier precompile contract registry. @@ -28,7 +26,7 @@ public abstract class MainnetPrecompiledContracts { * @param gasCalculator the gas calculator * @return the precompile contract registry */ - public static PrecompileContractRegistry frontier(final GasCalculator gasCalculator) { + static PrecompileContractRegistry frontier(final GasCalculator gasCalculator) { PrecompileContractRegistry precompileContractRegistry = new PrecompileContractRegistry(); populateForFrontier(precompileContractRegistry, gasCalculator); return precompileContractRegistry; @@ -40,7 +38,7 @@ public abstract class MainnetPrecompiledContracts { * @param registry the registry * @param gasCalculator the gas calculator */ - public static void populateForFrontier( + static void populateForFrontier( final PrecompileContractRegistry registry, final GasCalculator gasCalculator) { registry.put(Address.ECREC, new ECRECPrecompiledContract(gasCalculator)); registry.put(Address.SHA256, new SHA256PrecompiledContract(gasCalculator)); @@ -54,7 +52,7 @@ public abstract class MainnetPrecompiledContracts { * @param gasCalculator the gas calculator * @return the precompile contract registry */ - public static PrecompileContractRegistry homestead(final GasCalculator gasCalculator) { + static PrecompileContractRegistry homestead(final GasCalculator gasCalculator) { return frontier(gasCalculator); } @@ -64,7 +62,7 @@ public abstract class MainnetPrecompiledContracts { * @param gasCalculator the gas calculator * @return the precompile contract registry */ - public static PrecompileContractRegistry byzantium(final GasCalculator gasCalculator) { + static PrecompileContractRegistry byzantium(final GasCalculator gasCalculator) { PrecompileContractRegistry precompileContractRegistry = new PrecompileContractRegistry(); populateForByzantium(precompileContractRegistry, gasCalculator); return precompileContractRegistry; @@ -76,7 +74,7 @@ public abstract class MainnetPrecompiledContracts { * @param registry the registry * @param gasCalculator the gas calculator */ - public static void populateForByzantium( + static void populateForByzantium( final PrecompileContractRegistry registry, final GasCalculator gasCalculator) { populateForFrontier(registry, gasCalculator); registry.put( @@ -93,7 +91,7 @@ public abstract class MainnetPrecompiledContracts { * @param gasCalculator the gas calculator * @return the precompile contract registry */ - public static PrecompileContractRegistry istanbul(final GasCalculator gasCalculator) { + static PrecompileContractRegistry istanbul(final GasCalculator gasCalculator) { PrecompileContractRegistry precompileContractRegistry = new PrecompileContractRegistry(); populateForIstanbul(precompileContractRegistry, gasCalculator); return precompileContractRegistry; @@ -105,7 +103,7 @@ public abstract class MainnetPrecompiledContracts { * @param registry the registry * @param gasCalculator the gas calculator */ - public static void populateForIstanbul( + static void populateForIstanbul( final PrecompileContractRegistry registry, final GasCalculator gasCalculator) { populateForByzantium(registry, gasCalculator); registry.put(Address.ALTBN128_ADD, AltBN128AddPrecompiledContract.istanbul(gasCalculator)); @@ -116,14 +114,16 @@ public abstract class MainnetPrecompiledContracts { } /** - * Populate registry for bls12. + * Populate registry for Cancun. * * @param registry the registry * @param gasCalculator the gas calculator */ - public static void populateForBLS12( + static void populateForCancun( final PrecompileContractRegistry registry, final GasCalculator gasCalculator) { populateForIstanbul(registry, gasCalculator); + + // EIP-2537 - BLS12-381 curve operations registry.put(Address.BLS12_G1ADD, new BLS12G1AddPrecompiledContract()); registry.put(Address.BLS12_G1MUL, new BLS12G1MulPrecompiledContract()); registry.put(Address.BLS12_G1MULTIEXP, new BLS12G1MultiExpPrecompiledContract()); @@ -133,17 +133,8 @@ public abstract class MainnetPrecompiledContracts { registry.put(Address.BLS12_PAIRING, new BLS12PairingPrecompiledContract()); registry.put(Address.BLS12_MAP_FP_TO_G1, new BLS12MapFpToG1PrecompiledContract()); registry.put(Address.BLS12_MAP_FP2_TO_G2, new BLS12MapFp2ToG2PrecompiledContract()); - } - /** - * Populate registry for Cancun. - * - * @param registry the registry - * @param gasCalculator the gas calculator - */ - public static void populateForCancun( - final PrecompileContractRegistry registry, final GasCalculator gasCalculator) { - populateForIstanbul(registry, gasCalculator); + // EIP-4844 - shard blob transactions // TODO: allow override to be configured? registry.put(Address.KZG_POINT_EVAL, new KZGPointEvalPrecompiledContract()); } diff --git a/gradle.properties b/gradle.properties index 1f1e3c081b..db50a3d4dd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,16 @@ version=23.1.0-SNAPSHOT org.gradle.welcome=never -org.gradle.jvmargs=-Xmx4g +# Set exports/opens flags required by Google Java Format and ErrorProne plugins. (JEP-396) +org.gradle.jvmargs=-Xmx2g \ + --add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \ + --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \ + --add-exports jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED \ + --add-exports jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED \ + --add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \ + --add-exports jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED \ + --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \ + --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED \ + --add-opens jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED \ + --add-opens jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED \ + --add-opens jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED diff --git a/pki/src/main/java/org/hyperledger/besu/pki/cms/CmsCreator.java b/pki/src/main/java/org/hyperledger/besu/pki/cms/CmsCreator.java index 12f246443e..57bc78908e 100644 --- a/pki/src/main/java/org/hyperledger/besu/pki/cms/CmsCreator.java +++ b/pki/src/main/java/org/hyperledger/besu/pki/cms/CmsCreator.java @@ -17,12 +17,16 @@ package org.hyperledger.besu.pki.cms; import org.hyperledger.besu.pki.keystore.KeyStoreWrapper; import java.security.PrivateKey; +import java.security.PublicKey; import java.security.Security; import java.security.cert.X509Certificate; +import java.security.interfaces.ECPublicKey; +import java.security.spec.EllipticCurve; import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; +import com.google.common.annotations.VisibleForTesting; import org.apache.tuweni.bytes.Bytes; import org.bouncycastle.cert.jcajce.JcaCertStore; import org.bouncycastle.cms.CMSProcessableByteArray; @@ -83,11 +87,13 @@ public class CmsCreator { final PrivateKey privateKey = keyStore.getPrivateKey(certificateAlias); final ContentSigner contentSigner = - new JcaContentSignerBuilder("SHA256withRSA").build(privateKey); + new JcaContentSignerBuilder( + getPreferredSignatureAlgorithm(keyStore.getPublicKey(certificateAlias))) + .build(privateKey); final CMSSignedDataGenerator cmsGenerator = new CMSSignedDataGenerator(); - // Aditional intermediate certificates for path building + // Additional intermediate certificates for path building cmsGenerator.addCertificates(certs); final DigestCalculatorProvider digestCalculatorProvider = @@ -106,4 +112,30 @@ public class CmsCreator { throw new RuntimeException("Error creating CMS data", e); } } + + /** + * Gets preferred signature algorithm for EC or RSA keys + * + * @param pub the public key + * @return the preferred signature algorithm + */ + @VisibleForTesting + public static String getPreferredSignatureAlgorithm(final PublicKey pub) { + switch (pub.getAlgorithm()) { + case "EC" -> { + final EllipticCurve curve = ((ECPublicKey) pub).getParams().getCurve(); + return switch (curve.getField().getFieldSize()) { + case 224, 256 -> "SHA256withECDSA"; + case 384 -> "SHA384withECDSA"; + case 521 -> "SHA512withECDSA"; + default -> throw new IllegalArgumentException("Elliptic curve not supported: " + curve); + }; + } + case "RSA" -> { + return "SHA256WithRSAEncryption"; + } + default -> throw new UnsupportedOperationException( + "Private key algorithm not supported: " + pub.getAlgorithm()); + } + } } diff --git a/pki/src/main/java/org/hyperledger/besu/pki/keystore/AbstractKeyStoreWrapper.java b/pki/src/main/java/org/hyperledger/besu/pki/keystore/AbstractKeyStoreWrapper.java index e113a89493..54cc163101 100644 --- a/pki/src/main/java/org/hyperledger/besu/pki/keystore/AbstractKeyStoreWrapper.java +++ b/pki/src/main/java/org/hyperledger/besu/pki/keystore/AbstractKeyStoreWrapper.java @@ -52,6 +52,15 @@ public abstract class AbstractKeyStoreWrapper implements KeyStoreWrapper { } } + /** + * Instantiates a new Abstract key store wrapper. + * + * @param crls the collection of X509CRL instances + */ + protected AbstractKeyStoreWrapper(final Collection crls) { + this.crls = crls; + } + @Override public Collection getCRLs() { return crls; diff --git a/pki/src/main/java/org/hyperledger/besu/pki/keystore/HardwareKeyStoreWrapper.java b/pki/src/main/java/org/hyperledger/besu/pki/keystore/HardwareKeyStoreWrapper.java index 93d8196247..74217f272b 100644 --- a/pki/src/main/java/org/hyperledger/besu/pki/keystore/HardwareKeyStoreWrapper.java +++ b/pki/src/main/java/org/hyperledger/besu/pki/keystore/HardwareKeyStoreWrapper.java @@ -26,6 +26,8 @@ import java.security.Provider; import java.security.PublicKey; import java.security.Security; import java.security.cert.Certificate; +import java.security.cert.X509CRL; +import java.util.Collection; import java.util.Optional; import java.util.Properties; import java.util.stream.Stream; @@ -122,12 +124,14 @@ public class HardwareKeyStoreWrapper extends AbstractKeyStoreWrapper { /** * Instantiates a new Hardware key store wrapper. * + * @param crls the collection of X509CRL crls * @param keystore the keystore * @param password the password */ @VisibleForTesting - HardwareKeyStoreWrapper(final KeyStore keystore, final String password) { - super(null); + HardwareKeyStoreWrapper( + final Collection crls, final KeyStore keystore, final String password) { + super(crls); this.keystore = keystore; this.keystorePassword = password.toCharArray(); this.provider = null; diff --git a/pki/src/main/java/org/hyperledger/besu/pki/keystore/SoftwareKeyStoreWrapper.java b/pki/src/main/java/org/hyperledger/besu/pki/keystore/SoftwareKeyStoreWrapper.java index 40cf1cda15..d3d892dfc4 100644 --- a/pki/src/main/java/org/hyperledger/besu/pki/keystore/SoftwareKeyStoreWrapper.java +++ b/pki/src/main/java/org/hyperledger/besu/pki/keystore/SoftwareKeyStoreWrapper.java @@ -25,6 +25,8 @@ import java.security.KeyStore; import java.security.PrivateKey; import java.security.PublicKey; import java.security.cert.Certificate; +import java.security.cert.X509CRL; +import java.util.Collection; import java.util.HashMap; import java.util.Map; @@ -123,7 +125,7 @@ public class SoftwareKeyStoreWrapper extends AbstractKeyStoreWrapper { final String keystorePassword, final KeyStore truststore, final String truststorePassword) { - super(null); + super((Path) null); this.keystore = keystore; this.keystorePassword = keystorePassword.toCharArray(); this.truststore = truststore; @@ -133,12 +135,14 @@ public class SoftwareKeyStoreWrapper extends AbstractKeyStoreWrapper { /** * Instantiates a new Software key store wrapper. * + * @param crls the collection of X509CRL crls * @param keystore the keystore * @param keystorePassword the keystore password */ @VisibleForTesting - public SoftwareKeyStoreWrapper(final KeyStore keystore, final String keystorePassword) { - super(null); + public SoftwareKeyStoreWrapper( + final Collection crls, final KeyStore keystore, final String keystorePassword) { + super(crls); this.keystore = keystore; this.keystorePassword = keystorePassword.toCharArray(); this.truststore = null; diff --git a/pki/src/test/java/org/hyperledger/besu/pki/cms/CmsCreationAndValidationTest.java b/pki/src/test/java/org/hyperledger/besu/pki/cms/CmsCreationAndValidationTest.java index 72628d39c4..ceb30e1e00 100644 --- a/pki/src/test/java/org/hyperledger/besu/pki/cms/CmsCreationAndValidationTest.java +++ b/pki/src/test/java/org/hyperledger/besu/pki/cms/CmsCreationAndValidationTest.java @@ -16,27 +16,14 @@ package org.hyperledger.besu.pki.cms; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; -import static org.hyperledger.besu.pki.util.TestCertificateUtils.createCRL; -import static org.hyperledger.besu.pki.util.TestCertificateUtils.createKeyPair; -import static org.hyperledger.besu.pki.util.TestCertificateUtils.createSelfSignedCertificate; -import static org.hyperledger.besu.pki.util.TestCertificateUtils.issueCertificate; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.when; - -import org.hyperledger.besu.pki.keystore.KeyStoreWrapper; -import org.hyperledger.besu.pki.keystore.SoftwareKeyStoreWrapper; - -import java.security.KeyPair; -import java.security.KeyStore; +import static org.hyperledger.besu.pki.util.TestCertificateUtils.Algorithm.EC; +import static org.hyperledger.besu.pki.util.TestCertificateUtils.Algorithm.RSA; + +import org.hyperledger.besu.pki.util.TestCertificateUtils.Algorithm; + import java.security.PrivateKey; -import java.security.cert.Certificate; -import java.security.cert.X509CRL; +import java.security.PublicKey; import java.security.cert.X509Certificate; -import java.time.Instant; -import java.time.temporal.ChronoUnit; -import java.util.Collections; -import java.util.List; -import java.util.Set; import org.apache.tuweni.bytes.Bytes; import org.bouncycastle.cert.jcajce.JcaX509CertificateHolder; @@ -49,284 +36,152 @@ import org.bouncycastle.operator.ContentSigner; import org.bouncycastle.operator.DigestCalculatorProvider; import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder; import org.bouncycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.EnumSource; public class CmsCreationAndValidationTest { - private static KeyStore keystore; - private static KeyStore truststore; - private static List CRLs; - - private KeyStoreWrapper keystoreWrapper; - private KeyStoreWrapper truststoreWrapper; - private CmsValidator cmsValidator; - - @BeforeClass - public static void beforeAll() throws Exception { - final Instant notBefore = Instant.now().minus(1, ChronoUnit.DAYS); - final Instant notAfter = Instant.now().plus(1, ChronoUnit.DAYS); - - /* - Create self-signed certificate - */ - final KeyPair selfsignedKeyPair = createKeyPair(); - final X509Certificate selfsignedCertificate = - createSelfSignedCertificate("selfsigned", notBefore, notAfter, selfsignedKeyPair); - - /* - Create trusted chain (ca -> interca -> partneraca -> partneravalidator) - */ - final KeyPair caKeyPair = createKeyPair(); - final X509Certificate caCertificate = - createSelfSignedCertificate("ca", notBefore, notAfter, caKeyPair); - - final KeyPair interCAKeyPair = createKeyPair(); - final X509Certificate interCACertificate = - issueCertificate( - caCertificate, caKeyPair, "interca", notBefore, notAfter, interCAKeyPair, true); - - final KeyPair partnerACAPair = createKeyPair(); - final X509Certificate partnerACACertificate = - issueCertificate( - interCACertificate, - interCAKeyPair, - "partneraca", - notBefore, - notAfter, - partnerACAPair, - true); - - final KeyPair parterAValidatorKeyPair = createKeyPair(); - final X509Certificate partnerAValidatorCertificate = - issueCertificate( - partnerACACertificate, - partnerACAPair, - "partneravalidator", - notBefore, - notAfter, - parterAValidatorKeyPair, - false); - - /* - Create expired certificate - */ - final KeyPair expiredKeyPair = createKeyPair(); - final X509Certificate expiredCertificate = - issueCertificate( - caCertificate, - caKeyPair, - "expired", - notBefore, - notBefore.plus(1, ChronoUnit.SECONDS), - expiredKeyPair, - true); - - /* - Create revoked and revoked certificates - */ - final KeyPair revokedKeyPair = createKeyPair(); - final X509Certificate revokedCertificate = - issueCertificate( - caCertificate, caKeyPair, "revoked", notBefore, notAfter, revokedKeyPair, true); - - /* - Create untrusted chain (untrusted_selfsigned -> unstrusted_partner) - */ - final KeyPair untrustedSelfSignedKeyPair = createKeyPair(); - final X509Certificate untrustedSelfsignedCertificate = - createSelfSignedCertificate( - "untrusted_selfsigned", notBefore, notAfter, untrustedSelfSignedKeyPair); - - final KeyPair untrustedIntermediateKeyPair = createKeyPair(); - final X509Certificate untrustedIntermediateCertificate = - issueCertificate( - untrustedSelfsignedCertificate, - untrustedSelfSignedKeyPair, - "unstrusted_partner", - notBefore, - notAfter, - untrustedIntermediateKeyPair, - true); - - /* - Create truststore wrapper with 3 trusted certificates: 'ca', 'interca' and 'selfsigned' - */ - truststore = KeyStore.getInstance("PKCS12"); - truststore.load(null, null); - - truststore.setCertificateEntry("ca", caCertificate); - truststore.setCertificateEntry("interca", interCACertificate); - truststore.setCertificateEntry("selfsigned", selfsignedCertificate); - - /* - Create keystore with certificates used in tests - */ - keystore = KeyStore.getInstance("PKCS12"); - keystore.load(null, null); - - keystore.setKeyEntry( - "trusted_selfsigned", - selfsignedKeyPair.getPrivate(), - "".toCharArray(), - new Certificate[] {selfsignedCertificate}); - keystore.setKeyEntry( - "untrusted_selfsigned", - untrustedSelfSignedKeyPair.getPrivate(), - "".toCharArray(), - new Certificate[] {untrustedSelfsignedCertificate}); - keystore.setKeyEntry( - "expired", - expiredKeyPair.getPrivate(), - "".toCharArray(), - new Certificate[] {expiredCertificate}); - keystore.setKeyEntry( - "revoked", - revokedKeyPair.getPrivate(), - "".toCharArray(), - new Certificate[] {revokedCertificate}); - keystore.setKeyEntry( - "trusted", - parterAValidatorKeyPair.getPrivate(), - "".toCharArray(), - new Certificate[] {partnerAValidatorCertificate, partnerACACertificate}); - keystore.setKeyEntry( - "untrusted", - untrustedIntermediateKeyPair.getPrivate(), - "".toCharArray(), - new Certificate[] {untrustedIntermediateCertificate, untrustedSelfsignedCertificate}); - - /* - Create CRLs for all CA certificates (mostly empty, only ca has one revoked certificate) - */ - final X509CRL caCRL = createCRL(caCertificate, caKeyPair, Set.of(revokedCertificate)); - final X509CRL intercaCRL = - createCRL(interCACertificate, interCAKeyPair, Collections.emptyList()); - final X509CRL partnerACACRL = - createCRL(partnerACACertificate, partnerACAPair, Collections.emptyList()); - final X509CRL selfsignedCRL = - createCRL(selfsignedCertificate, selfsignedKeyPair, Collections.emptyList()); - CRLs = List.of(caCRL, intercaCRL, partnerACACRL, selfsignedCRL); - } - - @Before - public void before() { - keystoreWrapper = new SoftwareKeyStoreWrapper(keystore, ""); + private static final CmsTestKeystores rsaTestKeystores = new CmsTestKeystores(RSA); + private static final CmsTestKeystores ecTestKeystores = new CmsTestKeystores(EC); - truststoreWrapper = spy(new SoftwareKeyStoreWrapper(truststore, "")); - when(truststoreWrapper.getCRLs()).thenReturn(CRLs); - - cmsValidator = new CmsValidator(truststoreWrapper); + private CmsTestKeystores getCmsTestKeystores(final Algorithm algorithm) { + return switch (algorithm) { + case RSA -> rsaTestKeystores; + case EC -> ecTestKeystores; + }; } - @Test - public void cmsValidationWithEmptyCmsMessage() { + @ParameterizedTest + @EnumSource(value = Algorithm.class) + public void cmsValidationWithEmptyCmsMessage(final Algorithm algorithm) { final Bytes data = Bytes.random(32); - assertThat(cmsValidator.validate(Bytes.EMPTY, data)).isFalse(); + assertThat(getCmsTestKeystores(algorithm).getCmsValidator().validate(Bytes.EMPTY, data)) + .isFalse(); } - @Test - public void cmsValidationWithTrustedSelfSignedCertificate() { - final CmsCreator cmsCreator = new CmsCreator(keystoreWrapper, "trusted_selfsigned"); + @ParameterizedTest + @EnumSource(value = Algorithm.class) + public void cmsValidationWithTrustedSelfSignedCertificate(final Algorithm algorithm) { + final CmsCreator cmsCreator = + new CmsCreator(getCmsTestKeystores(algorithm).getKeystoreWrapper(), "trusted_selfsigned"); final Bytes data = Bytes.random(32); final Bytes cms = cmsCreator.create(data); - assertThat(cmsValidator.validate(cms, data)).isTrue(); + assertThat(getCmsTestKeystores(algorithm).getCmsValidator().validate(cms, data)).isTrue(); } - @Test - public void cmsValidationWithUntrustedSelfSignedCertificate() { - final CmsCreator cmsCreator = new CmsCreator(keystoreWrapper, "untrusted_selfsigned"); + @ParameterizedTest + @EnumSource(value = Algorithm.class) + public void cmsValidationWithUntrustedSelfSignedCertificate(final Algorithm algorithm) { + final CmsCreator cmsCreator = + new CmsCreator(getCmsTestKeystores(algorithm).getKeystoreWrapper(), "untrusted_selfsigned"); final Bytes data = Bytes.random(32); final Bytes cms = cmsCreator.create(data); - assertThat(cmsValidator.validate(cms, data)).isFalse(); + assertThat(getCmsTestKeystores(algorithm).getCmsValidator().validate(cms, data)).isFalse(); } - @Test - public void cmsValidationWithTrustedChain() { - final CmsCreator cmsCreator = new CmsCreator(keystoreWrapper, "trusted"); + @ParameterizedTest + @EnumSource(value = Algorithm.class) + public void cmsValidationWithTrustedChain(final Algorithm algorithm) { + final CmsCreator cmsCreator = + new CmsCreator(getCmsTestKeystores(algorithm).getKeystoreWrapper(), "trusted"); final Bytes data = Bytes.random(32); final Bytes cms = cmsCreator.create(data); - assertThat(cmsValidator.validate(cms, data)).isTrue(); + assertThat(getCmsTestKeystores(algorithm).getCmsValidator().validate(cms, data)).isTrue(); } - @Test - public void cmsValidationWithUntrustedChain() { - final CmsCreator cmsCreator = new CmsCreator(keystoreWrapper, "untrusted"); + @ParameterizedTest + @EnumSource(value = Algorithm.class) + public void cmsValidationWithUntrustedChain(final Algorithm algorithm) { + final CmsCreator cmsCreator = + new CmsCreator(getCmsTestKeystores(algorithm).getKeystoreWrapper(), "untrusted"); final Bytes data = Bytes.random(32); final Bytes cms = cmsCreator.create(data); - assertThat(cmsValidator.validate(cms, data)).isFalse(); + assertThat(getCmsTestKeystores(algorithm).getCmsValidator().validate(cms, data)).isFalse(); } - @Test - public void cmsValidationWithExpiredCertificate() { - final CmsCreator cmsCreator = new CmsCreator(keystoreWrapper, "expired"); + @ParameterizedTest + @EnumSource(value = Algorithm.class) + public void cmsValidationWithExpiredCertificate(final Algorithm algorithm) { + final CmsCreator cmsCreator = + new CmsCreator(getCmsTestKeystores(algorithm).getKeystoreWrapper(), "expired"); final Bytes data = Bytes.random(32); final Bytes cms = cmsCreator.create(data); - assertThat(cmsValidator.validate(cms, data)).isFalse(); + assertThat(getCmsTestKeystores(algorithm).getCmsValidator().validate(cms, data)).isFalse(); } - @Test - public void cmsValidationWithRevokedCertificate() { - final CmsCreator cmsCreator = new CmsCreator(keystoreWrapper, "revoked"); + @ParameterizedTest + @EnumSource(value = Algorithm.class) + public void cmsValidationWithRevokedCertificate(final Algorithm algorithm) { + final CmsCreator cmsCreator = + new CmsCreator(getCmsTestKeystores(algorithm).getKeystoreWrapper(), "revoked"); final Bytes data = Bytes.random(32); final Bytes cms = cmsCreator.create(data); - assertThat(cmsValidator.validate(cms, data)).isFalse(); + assertThat(getCmsTestKeystores(algorithm).getCmsValidator().validate(cms, data)).isFalse(); } - @Test - public void cmsValidationWithoutCRLConfigDisablesCRLCheck() { - final CmsCreator cmsCreator = new CmsCreator(keystoreWrapper, "revoked"); + @ParameterizedTest + @EnumSource(value = Algorithm.class) + public void cmsValidationWithoutCRLConfigDisablesCRLCheck(final Algorithm algorithm) { + final CmsCreator cmsCreator = + new CmsCreator(getCmsTestKeystores(algorithm).getKeystoreWrapper(), "revoked"); final Bytes data = Bytes.random(32); - // Removing CRLs - when(truststoreWrapper.getCRLs()).thenReturn(null); - final Bytes cms = cmsCreator.create(data); - // Overriding validator with instance without CRL CertStore - cmsValidator = new CmsValidator(truststoreWrapper); + CmsValidator cmsValidator = getCmsTestKeystores(algorithm).getCmsValidatorWithoutCrl(); // Because we don't have a CRL CertStore, revocation is not checked assertThat(cmsValidator.validate(cms, data)).isTrue(); } - @Test - public void cmsValidationWithWrongSignedData() { - final CmsCreator cmsCreator = new CmsCreator(keystoreWrapper, "trusted"); + @ParameterizedTest + @EnumSource(value = Algorithm.class) + public void cmsValidationWithWrongSignedData(final Algorithm algorithm) { + final CmsCreator cmsCreator = + new CmsCreator(getCmsTestKeystores(algorithm).getKeystoreWrapper(), "trusted"); final Bytes otherData = Bytes.random(32); final Bytes cms = cmsCreator.create(otherData); final Bytes expectedData = Bytes.random(32); - assertThat(cmsValidator.validate(cms, expectedData)).isFalse(); + assertThat(getCmsTestKeystores(algorithm).getCmsValidator().validate(cms, expectedData)) + .isFalse(); } - @Test - public void cmsValidationWithInvalidSignature() throws Exception { + @ParameterizedTest + @EnumSource(value = Algorithm.class) + public void cmsValidationWithInvalidSignature(final Algorithm algorithm) throws Exception { // Create a CMS message signed with a certificate, but create SignerInfo using another // certificate to trigger the signature verification to fail. - final PrivateKey privateKey = keystoreWrapper.getPrivateKey("trusted"); + final PrivateKey privateKey = + getCmsTestKeystores(algorithm).getKeystoreWrapper().getPrivateKey("trusted"); + final PublicKey publicKey = + getCmsTestKeystores(algorithm).getKeystoreWrapper().getPublicKey("trusted"); final X509Certificate signerCertificate = - (X509Certificate) keystoreWrapper.getCertificate("trusted"); + (X509Certificate) + getCmsTestKeystores(algorithm).getKeystoreWrapper().getCertificate("trusted"); final X509Certificate otherCertificate = - (X509Certificate) keystoreWrapper.getCertificate("trusted_selfsigned"); + (X509Certificate) + getCmsTestKeystores(algorithm) + .getKeystoreWrapper() + .getCertificate("trusted_selfsigned"); final ContentSigner contentSigner = - new JcaContentSignerBuilder("SHA256withRSA").build(privateKey); + new JcaContentSignerBuilder(CmsCreator.getPreferredSignatureAlgorithm(publicKey)) + .build(privateKey); final CMSSignedDataGenerator cmsGenerator = new CMSSignedDataGenerator(); cmsGenerator.addCertificate(new JcaX509CertificateHolder(signerCertificate)); @@ -343,6 +198,7 @@ public class CmsCreationAndValidationTest { final CMSSignedData cmsSignedData = cmsGenerator.generate(cmsData, true); final Bytes cmsBytes = Bytes.wrap(cmsSignedData.getEncoded()); - assertThat(cmsValidator.validate(cmsBytes, expectedData)).isFalse(); + assertThat(getCmsTestKeystores(algorithm).getCmsValidator().validate(cmsBytes, expectedData)) + .isFalse(); } } diff --git a/pki/src/test/java/org/hyperledger/besu/pki/cms/CmsTestKeystores.java b/pki/src/test/java/org/hyperledger/besu/pki/cms/CmsTestKeystores.java new file mode 100644 index 0000000000..3a2d4c04f8 --- /dev/null +++ b/pki/src/test/java/org/hyperledger/besu/pki/cms/CmsTestKeystores.java @@ -0,0 +1,243 @@ +/* + * Copyright Hyperledger Besu Contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on + * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * + * SPDX-License-Identifier: Apache-2.0 + */ +package org.hyperledger.besu.pki.cms; + +import static org.hyperledger.besu.pki.util.TestCertificateUtils.createCRL; +import static org.hyperledger.besu.pki.util.TestCertificateUtils.createKeyPair; +import static org.hyperledger.besu.pki.util.TestCertificateUtils.createSelfSignedCertificate; +import static org.hyperledger.besu.pki.util.TestCertificateUtils.issueCertificate; + +import org.hyperledger.besu.pki.keystore.KeyStoreWrapper; +import org.hyperledger.besu.pki.keystore.SoftwareKeyStoreWrapper; +import org.hyperledger.besu.pki.util.TestCertificateUtils.Algorithm; + +import java.security.KeyPair; +import java.security.KeyStore; +import java.security.cert.Certificate; +import java.security.cert.X509CRL; +import java.security.cert.X509Certificate; +import java.time.Instant; +import java.time.temporal.ChronoUnit; +import java.util.Collections; +import java.util.List; +import java.util.Set; + +public class CmsTestKeystores { + private KeyStore keystore; + private KeyStore truststore; + private List CRLs; + + private KeyStoreWrapper keystoreWrapper; + private KeyStoreWrapper truststoreWrapper; + private KeyStoreWrapper truststoreWrapperWithoutCrl; + private CmsValidator cmsValidator; + private CmsValidator cmsValidatorWithoutCrl; + + public CmsTestKeystores(final Algorithm algorithm) { + try { + init(algorithm); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + public void init(final Algorithm algorithm) throws Exception { + final Instant notBefore = Instant.now().minus(1, ChronoUnit.DAYS); + final Instant notAfter = Instant.now().plus(1, ChronoUnit.DAYS); + + /* + Create self-signed certificate + */ + final KeyPair selfsignedKeyPair = createKeyPair(algorithm); + final X509Certificate selfsignedCertificate = + createSelfSignedCertificate("selfsigned", notBefore, notAfter, selfsignedKeyPair); + + /* + Create trusted chain (ca -> interca -> partneraca -> partneravalidator) + */ + final KeyPair caKeyPair = createKeyPair(algorithm); + final X509Certificate caCertificate = + createSelfSignedCertificate("ca", notBefore, notAfter, caKeyPair); + + final KeyPair interCAKeyPair = createKeyPair(algorithm); + final X509Certificate interCACertificate = + issueCertificate( + caCertificate, caKeyPair, "interca", notBefore, notAfter, interCAKeyPair, true); + + final KeyPair partnerACAPair = createKeyPair(algorithm); + final X509Certificate partnerACACertificate = + issueCertificate( + interCACertificate, + interCAKeyPair, + "partneraca", + notBefore, + notAfter, + partnerACAPair, + true); + + final KeyPair parterAValidatorKeyPair = createKeyPair(algorithm); + final X509Certificate partnerAValidatorCertificate = + issueCertificate( + partnerACACertificate, + partnerACAPair, + "partneravalidator", + notBefore, + notAfter, + parterAValidatorKeyPair, + false); + + /* + Create expired certificate + */ + final KeyPair expiredKeyPair = createKeyPair(algorithm); + final X509Certificate expiredCertificate = + issueCertificate( + caCertificate, + caKeyPair, + "expired", + notBefore, + notBefore.plus(1, ChronoUnit.SECONDS), + expiredKeyPair, + true); + + /* + Create revoked and revoked certificates + */ + final KeyPair revokedKeyPair = createKeyPair(algorithm); + final X509Certificate revokedCertificate = + issueCertificate( + caCertificate, caKeyPair, "revoked", notBefore, notAfter, revokedKeyPair, true); + + /* + Create untrusted chain (untrusted_selfsigned -> unstrusted_partner) + */ + final KeyPair untrustedSelfSignedKeyPair = createKeyPair(algorithm); + final X509Certificate untrustedSelfsignedCertificate = + createSelfSignedCertificate( + "untrusted_selfsigned", notBefore, notAfter, untrustedSelfSignedKeyPair); + + final KeyPair untrustedIntermediateKeyPair = createKeyPair(algorithm); + final X509Certificate untrustedIntermediateCertificate = + issueCertificate( + untrustedSelfsignedCertificate, + untrustedSelfSignedKeyPair, + "unstrusted_partner", + notBefore, + notAfter, + untrustedIntermediateKeyPair, + true); + + /* + Create truststore wrapper with 3 trusted certificates: 'ca', 'interca' and 'selfsigned' + */ + truststore = KeyStore.getInstance("PKCS12"); + truststore.load(null, null); + + truststore.setCertificateEntry("ca", caCertificate); + truststore.setCertificateEntry("interca", interCACertificate); + truststore.setCertificateEntry("selfsigned", selfsignedCertificate); + + /* + Create keystore with certificates used in tests + */ + keystore = KeyStore.getInstance("PKCS12"); + keystore.load(null, null); + + keystore.setKeyEntry( + "trusted_selfsigned", + selfsignedKeyPair.getPrivate(), + "".toCharArray(), + new Certificate[] {selfsignedCertificate}); + keystore.setKeyEntry( + "untrusted_selfsigned", + untrustedSelfSignedKeyPair.getPrivate(), + "".toCharArray(), + new Certificate[] {untrustedSelfsignedCertificate}); + keystore.setKeyEntry( + "expired", + expiredKeyPair.getPrivate(), + "".toCharArray(), + new Certificate[] {expiredCertificate}); + keystore.setKeyEntry( + "revoked", + revokedKeyPair.getPrivate(), + "".toCharArray(), + new Certificate[] {revokedCertificate}); + keystore.setKeyEntry( + "trusted", + parterAValidatorKeyPair.getPrivate(), + "".toCharArray(), + new Certificate[] {partnerAValidatorCertificate, partnerACACertificate}); + keystore.setKeyEntry( + "untrusted", + untrustedIntermediateKeyPair.getPrivate(), + "".toCharArray(), + new Certificate[] {untrustedIntermediateCertificate, untrustedSelfsignedCertificate}); + + /* + Create CRLs for all CA certificates (mostly empty, only ca has one revoked certificate) + */ + final X509CRL caCRL = createCRL(caCertificate, caKeyPair, Set.of(revokedCertificate)); + final X509CRL intercaCRL = + createCRL(interCACertificate, interCAKeyPair, Collections.emptyList()); + final X509CRL partnerACACRL = + createCRL(partnerACACertificate, partnerACAPair, Collections.emptyList()); + final X509CRL selfsignedCRL = + createCRL(selfsignedCertificate, selfsignedKeyPair, Collections.emptyList()); + CRLs = List.of(caCRL, intercaCRL, partnerACACRL, selfsignedCRL); + + keystoreWrapper = new SoftwareKeyStoreWrapper(null, keystore, ""); + + truststoreWrapper = new SoftwareKeyStoreWrapper(CRLs, truststore, ""); + + truststoreWrapperWithoutCrl = new SoftwareKeyStoreWrapper(null, truststore, ""); + + cmsValidator = new CmsValidator(truststoreWrapper); + + cmsValidatorWithoutCrl = new CmsValidator(truststoreWrapperWithoutCrl); + } + + public KeyStore getKeystore() { + return keystore; + } + + public KeyStore getTruststore() { + return truststore; + } + + public List getCRLs() { + return CRLs; + } + + public KeyStoreWrapper getKeystoreWrapper() { + return keystoreWrapper; + } + + public KeyStoreWrapper getTruststoreWrapper() { + return truststoreWrapper; + } + + public CmsValidator getCmsValidator() { + return cmsValidator; + } + + public KeyStoreWrapper getTruststoreWrapperWithoutCrl() { + return truststoreWrapperWithoutCrl; + } + + public CmsValidator getCmsValidatorWithoutCrl() { + return cmsValidatorWithoutCrl; + } +} diff --git a/pki/src/test/java/org/hyperledger/besu/pki/keystore/HardwareKeyStoreWrapperTest.java b/pki/src/test/java/org/hyperledger/besu/pki/keystore/HardwareKeyStoreWrapperTest.java index bf533c79fb..bbbe68f823 100644 --- a/pki/src/test/java/org/hyperledger/besu/pki/keystore/HardwareKeyStoreWrapperTest.java +++ b/pki/src/test/java/org/hyperledger/besu/pki/keystore/HardwareKeyStoreWrapperTest.java @@ -45,7 +45,7 @@ public class HardwareKeyStoreWrapperTest { @Before public void before() { - keyStoreWrapper = new HardwareKeyStoreWrapper(keyStore, new String(PASSWORD)); + keyStoreWrapper = new HardwareKeyStoreWrapper(null, keyStore, new String(PASSWORD)); } @Test diff --git a/pki/src/test/java/org/hyperledger/besu/pki/util/TestCertificateUtils.java b/pki/src/test/java/org/hyperledger/besu/pki/util/TestCertificateUtils.java index 3097007e5a..190e90213c 100644 --- a/pki/src/test/java/org/hyperledger/besu/pki/util/TestCertificateUtils.java +++ b/pki/src/test/java/org/hyperledger/besu/pki/util/TestCertificateUtils.java @@ -15,8 +15,11 @@ package org.hyperledger.besu.pki.util; +import org.hyperledger.besu.pki.cms.CmsCreator; + import java.io.IOException; import java.math.BigInteger; +import java.security.InvalidAlgorithmParameterException; import java.security.KeyPair; import java.security.KeyPairGenerator; import java.security.NoSuchAlgorithmException; @@ -26,6 +29,7 @@ import java.security.cert.CRLReason; import java.security.cert.CertificateEncodingException; import java.security.cert.X509CRL; import java.security.cert.X509Certificate; +import java.security.spec.ECGenParameterSpec; import java.sql.Date; import java.time.Instant; import java.time.temporal.ChronoUnit; @@ -62,20 +66,33 @@ public class TestCertificateUtils { } } - public static KeyPair createKeyPair() { + public enum Algorithm { + RSA, + EC + } + + public static KeyPair createKeyPair(final Algorithm algorithm) { try { - final KeyPairGenerator kpg = KeyPairGenerator.getInstance("RSA"); + @SuppressWarnings("InsecureCryptoUsage") + final KeyPairGenerator kpg = KeyPairGenerator.getInstance(algorithm.name()); + if (algorithm == Algorithm.EC) { + kpg.initialize(new ECGenParameterSpec("secp256r1")); + } return kpg.generateKeyPair(); } catch (NoSuchAlgorithmException e) { throw new RuntimeException("Error creating KeyPair", e); + } catch (InvalidAlgorithmParameterException e) { + throw new RuntimeException(e); } } public static X509Certificate createSelfSignedCertificate( final String name, final Instant notBefore, final Instant notAfter, final KeyPair keyPair) { try { + final String signatureAlgorithm = + CmsCreator.getPreferredSignatureAlgorithm(keyPair.getPublic()); final ContentSigner signer = - new JcaContentSignerBuilder("SHA256WithRSAEncryption").build(keyPair.getPrivate()); + new JcaContentSignerBuilder(signatureAlgorithm).build(keyPair.getPrivate()); final X509v3CertificateBuilder certificateBuilder = new JcaX509v3CertificateBuilder( @@ -123,8 +140,10 @@ public class TestCertificateUtils { final boolean isCa) { try { + final String signatureAlgorithm = + CmsCreator.getPreferredSignatureAlgorithm(keyPair.getPublic()); final ContentSigner signer = - new JcaContentSignerBuilder("SHA256WithRSAEncryption").build(issuerKeyPair.getPrivate()); + new JcaContentSignerBuilder(signatureAlgorithm).build(issuerKeyPair.getPrivate()); final X509v3CertificateBuilder certificateBuilder = new JcaX509v3CertificateBuilder( @@ -181,9 +200,10 @@ public class TestCertificateUtils { c.getSerialNumber(), Date.from(Instant.now()), CRLReason.UNSPECIFIED.ordinal())); crlBuilder.setNextUpdate(Date.from(Instant.now().plus(1, ChronoUnit.DAYS))); - + final String signatureAlgorithm = + CmsCreator.getPreferredSignatureAlgorithm(issuerKeyPair.getPublic()); final ContentSigner signer = - new JcaContentSignerBuilder("SHA256WithRSAEncryption").build(issuerKeyPair.getPrivate()); + new JcaContentSignerBuilder(signatureAlgorithm).build(issuerKeyPair.getPrivate()); final X509CRLHolder crlHolder = crlBuilder.build(signer); return new JcaX509CRLConverter() .setProvider(BouncyCastleProvider.PROVIDER_NAME)