diff --git a/CHANGELOG.md b/CHANGELOG.md index bc6ee6fb56a..756494b8f92 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ ### Additions and Improvements - Add CLI autocomplete scripts. [#2854](https://github.com/hyperledger/besu/pull/2854) +- Added support for PKCS11 keystore on PKI Block Creation. [#2865](https://github.com/hyperledger/besu/pull/2865) ### Bug Fixes 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 85181ea1b33..51fd544a5e5 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 @@ -34,11 +34,10 @@ 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; import java.io.File; -import java.io.IOException; import java.net.URISyntaxException; -import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.ArrayList; @@ -46,8 +45,6 @@ import java.util.List; import java.util.Optional; -import com.google.common.base.Charsets; - public class BesuNodeConfigurationBuilder { private String name; @@ -273,14 +270,14 @@ private static Path toPath(final String path) throws Exception { public BesuNodeConfigurationBuilder p2pTLSEnabled(final String name, final String type) { final TLSConfiguration.Builder builder = TLSConfiguration.Builder.tlsConfiguration(); try { - final String nsspin = "/p2p-tls/%s/nsspin.txt"; - final String truststore = "/p2p-tls/%s/truststore.jks"; - final String crl = "/p2p-tls/%s/crl.pem"; + final String nsspin = "/pki-certs/%s/nsspin.txt"; + final String truststore = "/pki-certs/%s/truststore.jks"; + final String crl = "/pki-certs/%s/crl.pem"; switch (type) { case KeyStoreWrapper.KEYSTORE_TYPE_JKS: builder .withKeyStoreType(type) - .withKeyStorePath(toPath(String.format("/p2p-tls/%s/keystore.jks", name))) + .withKeyStorePath(toPath(String.format("/pki-certs/%s/keystore.jks", name))) .withKeyStorePasswordSupplier( new FileBasedPasswordProvider(toPath(String.format(nsspin, name)))) .withKeyStorePasswordPath(toPath(String.format(nsspin, name))) @@ -294,7 +291,7 @@ public BesuNodeConfigurationBuilder p2pTLSEnabled(final String name, final Strin case KeyStoreWrapper.KEYSTORE_TYPE_PKCS12: builder .withKeyStoreType(type) - .withKeyStorePath(toPath(String.format("/p2p-tls/%s/keys.p12", name))) + .withKeyStorePath(toPath(String.format("/pki-certs/%s/keys.p12", name))) .withKeyStorePasswordSupplier( new FileBasedPasswordProvider(toPath(String.format(nsspin, name)))) .withKeyStorePasswordPath(toPath(String.format(nsspin, name))) @@ -309,7 +306,8 @@ public BesuNodeConfigurationBuilder p2pTLSEnabled(final String name, final Strin builder .withKeyStoreType(type) .withKeyStorePath( - initNSSConfigFile(toPath(String.format("/p2p-tls/%s/nss.cfg", name)))) + PKCS11Utils.initNSSConfigFile( + toPath(String.format("/pki-certs/%s/nss.cfg", name)))) .withKeyStorePasswordSupplier( new FileBasedPasswordProvider(toPath(String.format(nsspin, name)))) .withKeyStorePasswordPath(toPath(String.format(nsspin, name))) @@ -323,34 +321,6 @@ public BesuNodeConfigurationBuilder p2pTLSEnabled(final String name, final Strin return this; } - private Path initNSSConfigFile(final Path srcFilePath) { - Path ret = null; - try { - final String content = Files.readString(srcFilePath); - final String updated = - content.replaceAll( - "(nssSecmodDirectory\\W*)(\\.\\/.*)", - "$1".concat(srcFilePath.toAbsolutePath().toString().replace("nss.cfg", "nssdb"))); - final Path targetFilePath = createTemporaryFile("nsscfg"); - Files.write(targetFilePath, updated.getBytes(Charsets.UTF_8)); - ret = targetFilePath; - } catch (IOException e) { - throw new RuntimeException("Error populating nss config file", e); - } - return ret; - } - - private Path createTemporaryFile(final String suffix) { - final File tempFile; - try { - tempFile = File.createTempFile("temp", suffix); - tempFile.deleteOnExit(); - } catch (IOException e) { - throw new RuntimeException("Error creating temporary file", e); - } - return tempFile.toPath(); - } - public BesuNodeConfigurationBuilder pkiBlockCreationEnabled( final PkiKeyStoreConfiguration pkiKeyStoreConfiguration) { this.pkiKeyStoreConfiguration = Optional.of(pkiKeyStoreConfiguration); diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeFactory.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeFactory.java index 95234f15c85..d5bc83245fc 100644 --- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeFactory.java +++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeFactory.java @@ -397,7 +397,19 @@ public BesuNode createQbftNode(final String name) throws IOException { .build()); } - public BesuNode createPkiQbftNode(final String name) throws IOException { + public BesuNode createPkiQbftJKSNode(final String name) throws IOException { + return createPkiQbftNode(KeyStoreWrapper.KEYSTORE_TYPE_JKS, name); + } + + public BesuNode createPkiQbftPKCS11Node(final String name) throws IOException { + return createPkiQbftNode(KeyStoreWrapper.KEYSTORE_TYPE_PKCS11, name); + } + + public BesuNode createPkiQbftPKCS12Node(final String name) throws IOException { + return createPkiQbftNode(KeyStoreWrapper.KEYSTORE_TYPE_PKCS12, name); + } + + public BesuNode createPkiQbftNode(final String type, final String name) throws IOException { return create( new BesuNodeConfigurationBuilder() .name(name) @@ -406,7 +418,7 @@ public BesuNode createPkiQbftNode(final String name) throws IOException { .webSocketConfiguration(node.createWebSocketEnabledConfig()) .devMode(false) .genesisConfigProvider(genesis::createQbftGenesisConfig) - .pkiBlockCreationEnabled(pkiKeystoreConfigurationFactory.createPkiConfig()) + .pkiBlockCreationEnabled(pkiKeystoreConfigurationFactory.createPkiConfig(type, name)) .build()); } @@ -522,8 +534,23 @@ public BesuNode createQbftNodeWithValidators(final String name, final String... .build()); } - public BesuNode createPkiQbftNodeWithValidators(final String name, final String... validators) + public BesuNode createPkiQbftJKSNodeWithValidators(final String name, final String... validators) throws IOException { + return createPkiQbftNodeWithValidators(KeyStoreWrapper.KEYSTORE_TYPE_JKS, name, validators); + } + + public BesuNode createPkiQbftPKCS11NodeWithValidators( + final String name, final String... validators) throws IOException { + return createPkiQbftNodeWithValidators(KeyStoreWrapper.KEYSTORE_TYPE_PKCS11, name, validators); + } + + public BesuNode createPkiQbftPKCS12NodeWithValidators( + final String name, final String... validators) throws IOException { + return createPkiQbftNodeWithValidators(KeyStoreWrapper.KEYSTORE_TYPE_PKCS12, name, validators); + } + + public BesuNode createPkiQbftNodeWithValidators( + final String type, final String name, final String... validators) throws IOException { return create( new BesuNodeConfigurationBuilder() @@ -532,7 +559,7 @@ public BesuNode createPkiQbftNodeWithValidators(final String name, final String. .jsonRpcConfiguration(node.createJsonRpcWithQbftEnabledConfig(false)) .webSocketConfiguration(node.createWebSocketEnabledConfig()) .devMode(false) - .pkiBlockCreationEnabled(pkiKeystoreConfigurationFactory.createPkiConfig()) + .pkiBlockCreationEnabled(pkiKeystoreConfigurationFactory.createPkiConfig(type, name)) .genesisConfigProvider( nodes -> node.createGenesisConfigForValidators( diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/pki/PKCS11Utils.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/pki/PKCS11Utils.java new file mode 100644 index 00000000000..0140ad1271f --- /dev/null +++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/pki/PKCS11Utils.java @@ -0,0 +1,54 @@ +/* + * 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.tests.acceptance.dsl.node.configuration.pki; + +import java.io.File; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; + +import com.google.common.base.Charsets; + +public class PKCS11Utils { + + public static Path initNSSConfigFile(final Path srcFilePath) { + Path ret = null; + try { + final String content = Files.readString(srcFilePath); + final String updated = + content.replaceAll( + "(nssSecmodDirectory\\W*)(\\.\\/.*)", + "$1".concat(srcFilePath.toAbsolutePath().toString().replace("nss.cfg", "nssdb"))); + final Path targetFilePath = createTemporaryFile("nsscfg"); + Files.write(targetFilePath, updated.getBytes(Charsets.UTF_8)); + ret = targetFilePath; + } catch (IOException e) { + throw new RuntimeException("Error populating nss config file", e); + } + return ret; + } + + private static Path createTemporaryFile(final String suffix) { + final File tempFile; + try { + tempFile = File.createTempFile("temp", suffix); + tempFile.deleteOnExit(); + } catch (IOException e) { + throw new RuntimeException("Error creating temporary file", e); + } + return tempFile.toPath(); + } +} diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/pki/PkiKeystoreConfigurationFactory.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/pki/PkiKeystoreConfigurationFactory.java index cba037c4a86..de12f31bba4 100644 --- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/pki/PkiKeystoreConfigurationFactory.java +++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/pki/PkiKeystoreConfigurationFactory.java @@ -23,6 +23,7 @@ import static org.hyperledger.besu.pki.util.TestCertificateUtils.issueCertificate; import org.hyperledger.besu.pki.config.PkiKeyStoreConfiguration; +import org.hyperledger.besu.pki.keystore.KeyStoreWrapper; import java.io.FileOutputStream; import java.io.IOException; @@ -35,44 +36,87 @@ import java.security.cert.X509Certificate; import java.time.Instant; import java.time.temporal.ChronoUnit; +import java.util.Objects; import java.util.UUID; public class PkiKeystoreConfigurationFactory { - public static final String KEYSTORE_DEFAULT_TYPE = "PKCS12"; + /* + PKCS11 config files + */ + final String NSSCONFIG_PATH_STRING = "/pki-certs/%s/nss.cfg"; + final String NSSPIN_PATH_STRING = "/pki-certs/%s/nsspin.txt"; + final String TRUSTSTORE_PATH_STRING = "/pki-certs/%s/truststore.jks"; + final String CRL_PATH_STRING = "/pki-certs/%s/crl.pem"; + + /* + Software keystore config + */ public static final String KEYSTORE_DEFAULT_PASSWORD = "password"; - public static final String KEYSTORE_DEFAULT_CERT_ALIAS = "validator"; private KeyPair caKeyPair; private X509Certificate caCertificate; private Path trustStoreFile; private Path passwordFile; - public PkiKeyStoreConfiguration createPkiConfig() { + public PkiKeyStoreConfiguration createPkiConfig(final String type, final String name) { + if (KeyStoreWrapper.KEYSTORE_TYPE_PKCS11.equals(type)) { + return createPKCS11PkiConfig(name); + } else { + return createSoftwareKeyStorePkiConfig(type, name); + } + } + + private PkiKeyStoreConfiguration createPKCS11PkiConfig(final String name) { + final PkiKeyStoreConfiguration.Builder pkiKeyStoreConfigBuilder = + new PkiKeyStoreConfiguration.Builder(); + + try { + pkiKeyStoreConfigBuilder + .withKeyStoreType(KeyStoreWrapper.KEYSTORE_TYPE_PKCS11) + .withKeyStorePath( + PKCS11Utils.initNSSConfigFile( + readResourceAsPath(String.format(NSSCONFIG_PATH_STRING, name)))) + .withKeyStorePasswordPath(readResourceAsPath(String.format(NSSPIN_PATH_STRING, name))) + .withTrustStoreType(KeyStoreWrapper.KEYSTORE_TYPE_JKS) + .withTrustStorePath(readResourceAsPath(String.format(TRUSTSTORE_PATH_STRING, name))) + .withTrustStorePasswordPath(readResourceAsPath(String.format(NSSPIN_PATH_STRING, name))) + .withCrlFilePath(readResourceAsPath(String.format(CRL_PATH_STRING, name))) + .withCertificateAlias(name); + + } catch (Exception e) { + throw new RuntimeException(e); + } + + return pkiKeyStoreConfigBuilder.build(); + } + + private PkiKeyStoreConfiguration createSoftwareKeyStorePkiConfig( + final String type, final String name) { PkiKeyStoreConfiguration.Builder pkiKeyStoreConfigBuilder = new PkiKeyStoreConfiguration.Builder(); - pkiKeyStoreConfigBuilder.withTrustStoreType(KEYSTORE_DEFAULT_TYPE); - pkiKeyStoreConfigBuilder.withTrustStorePath(createTrustStore()); + pkiKeyStoreConfigBuilder.withTrustStoreType(type); + pkiKeyStoreConfigBuilder.withTrustStorePath(createTrustStore(type)); pkiKeyStoreConfigBuilder.withTrustStorePasswordPath(passwordFile); - pkiKeyStoreConfigBuilder.withKeyStoreType(KEYSTORE_DEFAULT_TYPE); - pkiKeyStoreConfigBuilder.withKeyStorePath(createKeyStore()); + pkiKeyStoreConfigBuilder.withKeyStoreType(type); + pkiKeyStoreConfigBuilder.withKeyStorePath(createKeyStore(type, name)); pkiKeyStoreConfigBuilder.withKeyStorePasswordPath(passwordFile); - pkiKeyStoreConfigBuilder.withCertificateAlias(KEYSTORE_DEFAULT_CERT_ALIAS); + pkiKeyStoreConfigBuilder.withCertificateAlias(name); return pkiKeyStoreConfigBuilder.build(); } - private Path createTrustStore() { + private Path createTrustStore(final String type) { // Only create the truststore if this is the first time this method is being called if (caKeyPair == null) { try { caKeyPair = createKeyPair(); caCertificate = createSelfSignedCertificate("ca", notBefore(), notAfter(), caKeyPair); - final KeyStore truststore = KeyStore.getInstance(KEYSTORE_DEFAULT_TYPE); + final KeyStore truststore = KeyStore.getInstance(type); truststore.load(null, null); truststore.setCertificateEntry("ca", caCertificate); @@ -87,9 +131,9 @@ private Path createTrustStore() { return trustStoreFile; } - private Path createKeyStore() { + private Path createKeyStore(final String type, final String alias) { if (caKeyPair == null) { - createTrustStore(); + createTrustStore(type); } final KeyPair kp = createKeyPair(); @@ -97,10 +141,10 @@ private Path createKeyStore() { issueCertificate(caCertificate, caKeyPair, "validator", notBefore(), notAfter(), kp, false); try { - final KeyStore keyStore = KeyStore.getInstance(KEYSTORE_DEFAULT_TYPE); + final KeyStore keyStore = KeyStore.getInstance(type); keyStore.load(null, null); keyStore.setKeyEntry( - "validator", + alias, kp.getPrivate(), KEYSTORE_DEFAULT_PASSWORD.toCharArray(), new Certificate[] {certificate, caCertificate}); @@ -144,4 +188,8 @@ private Instant notBefore() { private Instant notAfter() { return Instant.now().plus(10, ChronoUnit.DAYS); } + + private Path readResourceAsPath(final String path) throws Exception { + return Path.of(Objects.requireNonNull(this.getClass().getResource(path)).toURI()); + } } diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/bft/pki/PkiQbftAcceptanceTestParameterization.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/bft/pki/PkiQbftAcceptanceTestParameterization.java index 96ffa7e4c31..10d4866fef7 100644 --- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/bft/pki/PkiQbftAcceptanceTestParameterization.java +++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/bft/pki/PkiQbftAcceptanceTestParameterization.java @@ -27,26 +27,57 @@ public class PkiQbftAcceptanceTestParameterization { public static List getFactories() { final List ret = new ArrayList<>(); - ret.addAll( - List.of( - new Object[] { - "qbft-pki", - new PkiQbftAcceptanceTestParameterization( - BesuNodeFactory::createPkiQbftNode, - BesuNodeFactory::createPkiQbftNodeWithValidators) - }, - new Object[] { - "qbft-tls-jks", - new PkiQbftAcceptanceTestParameterization( - BesuNodeFactory::createQbftNodeWithTLSJKS, - BesuNodeFactory::createQbftTLSJKSNodeWithValidators) - }, - new Object[] { - "qbft-tls-pkcs12", - new PkiQbftAcceptanceTestParameterization( - BesuNodeFactory::createQbftNodeWithTLSPKCS12, - BesuNodeFactory::createQbftTLSPKCS12NodeWithValidators) - })); + + /* + BLOCK CREATION + */ + + ret.add( + new Object[] { + "qbft-pki-jks", + new PkiQbftAcceptanceTestParameterization( + BesuNodeFactory::createPkiQbftJKSNode, + BesuNodeFactory::createPkiQbftJKSNodeWithValidators) + }); + + ret.add( + new Object[] { + "qbft-pki-pkcs12", + new PkiQbftAcceptanceTestParameterization( + BesuNodeFactory::createPkiQbftPKCS12Node, + BesuNodeFactory::createPkiQbftPKCS12NodeWithValidators) + }); + + if (Boolean.getBoolean("acctests.runBesuAsProcess")) { + ret.add( + new Object[] { + "qbft-pki-pkcs11", + new PkiQbftAcceptanceTestParameterization( + BesuNodeFactory::createPkiQbftPKCS11Node, + BesuNodeFactory::createPkiQbftPKCS11NodeWithValidators) + }); + } + + /* + TLS + */ + + ret.add( + new Object[] { + "qbft-tls-jks", + new PkiQbftAcceptanceTestParameterization( + BesuNodeFactory::createQbftNodeWithTLSJKS, + BesuNodeFactory::createQbftTLSJKSNodeWithValidators) + }); + + ret.add( + new Object[] { + "qbft-tls-pkcs12", + new PkiQbftAcceptanceTestParameterization( + BesuNodeFactory::createQbftNodeWithTLSPKCS12, + BesuNodeFactory::createQbftTLSPKCS12NodeWithValidators) + }); + if (Boolean.getBoolean("acctests.runBesuAsProcess")) { ret.add( new Object[] { diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/miner1/crl.pem b/acceptance-tests/tests/src/test/resources/pki-certs/miner1/crl.pem similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/miner1/crl.pem rename to acceptance-tests/tests/src/test/resources/pki-certs/miner1/crl.pem diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/miner1/keys.p12 b/acceptance-tests/tests/src/test/resources/pki-certs/miner1/keys.p12 similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/miner1/keys.p12 rename to acceptance-tests/tests/src/test/resources/pki-certs/miner1/keys.p12 diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/miner1/keystore.jks b/acceptance-tests/tests/src/test/resources/pki-certs/miner1/keystore.jks similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/miner1/keystore.jks rename to acceptance-tests/tests/src/test/resources/pki-certs/miner1/keystore.jks diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/miner1/nss.cfg b/acceptance-tests/tests/src/test/resources/pki-certs/miner1/nss.cfg similarity index 52% rename from acceptance-tests/tests/src/test/resources/p2p-tls/miner1/nss.cfg rename to acceptance-tests/tests/src/test/resources/pki-certs/miner1/nss.cfg index 4006c960951..5a046a9aed3 100644 --- a/acceptance-tests/tests/src/test/resources/p2p-tls/miner1/nss.cfg +++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner1/nss.cfg @@ -1,6 +1,6 @@ name = NSScrypto-miner1 -nssSecmodDirectory = ./src/test/resources/p2p-tls/miner1/nssdb +nssSecmodDirectory = ./src/test/resources/pki-certs/miner1/nssdb nssDbMode = readOnly nssModule = keystore diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/miner1/nssdb/cert8.db b/acceptance-tests/tests/src/test/resources/pki-certs/miner1/nssdb/cert8.db similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/miner1/nssdb/cert8.db rename to acceptance-tests/tests/src/test/resources/pki-certs/miner1/nssdb/cert8.db diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/miner1/nssdb/key3.db b/acceptance-tests/tests/src/test/resources/pki-certs/miner1/nssdb/key3.db similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/miner1/nssdb/key3.db rename to acceptance-tests/tests/src/test/resources/pki-certs/miner1/nssdb/key3.db diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/miner1/nssdb/secmod.db b/acceptance-tests/tests/src/test/resources/pki-certs/miner1/nssdb/secmod.db similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/miner1/nssdb/secmod.db rename to acceptance-tests/tests/src/test/resources/pki-certs/miner1/nssdb/secmod.db diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/miner1/nsspin.txt b/acceptance-tests/tests/src/test/resources/pki-certs/miner1/nsspin.txt similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/miner1/nsspin.txt rename to acceptance-tests/tests/src/test/resources/pki-certs/miner1/nsspin.txt diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/miner1/ssl-ca.pem b/acceptance-tests/tests/src/test/resources/pki-certs/miner1/ssl-ca.pem similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/miner1/ssl-ca.pem rename to acceptance-tests/tests/src/test/resources/pki-certs/miner1/ssl-ca.pem diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/miner1/ssl.pem b/acceptance-tests/tests/src/test/resources/pki-certs/miner1/ssl.pem similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/miner1/ssl.pem rename to acceptance-tests/tests/src/test/resources/pki-certs/miner1/ssl.pem diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/miner1/truststore.jks b/acceptance-tests/tests/src/test/resources/pki-certs/miner1/truststore.jks similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/miner1/truststore.jks rename to acceptance-tests/tests/src/test/resources/pki-certs/miner1/truststore.jks diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/miner2/crl.pem b/acceptance-tests/tests/src/test/resources/pki-certs/miner2/crl.pem similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/miner2/crl.pem rename to acceptance-tests/tests/src/test/resources/pki-certs/miner2/crl.pem diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/miner2/keys.p12 b/acceptance-tests/tests/src/test/resources/pki-certs/miner2/keys.p12 similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/miner2/keys.p12 rename to acceptance-tests/tests/src/test/resources/pki-certs/miner2/keys.p12 diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/miner2/keystore.jks b/acceptance-tests/tests/src/test/resources/pki-certs/miner2/keystore.jks similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/miner2/keystore.jks rename to acceptance-tests/tests/src/test/resources/pki-certs/miner2/keystore.jks diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/miner2/nss.cfg b/acceptance-tests/tests/src/test/resources/pki-certs/miner2/nss.cfg similarity index 52% rename from acceptance-tests/tests/src/test/resources/p2p-tls/miner2/nss.cfg rename to acceptance-tests/tests/src/test/resources/pki-certs/miner2/nss.cfg index c7c6e529a26..749298c5172 100644 --- a/acceptance-tests/tests/src/test/resources/p2p-tls/miner2/nss.cfg +++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner2/nss.cfg @@ -1,6 +1,6 @@ name = NSScrypto-miner2 -nssSecmodDirectory = ./src/test/resources/p2p-tls/miner2/nssdb +nssSecmodDirectory = ./src/test/resources/pki-certs/miner2/nssdb nssDbMode = readOnly nssModule = keystore diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/miner2/nssdb/cert8.db b/acceptance-tests/tests/src/test/resources/pki-certs/miner2/nssdb/cert8.db similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/miner2/nssdb/cert8.db rename to acceptance-tests/tests/src/test/resources/pki-certs/miner2/nssdb/cert8.db diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/miner2/nssdb/key3.db b/acceptance-tests/tests/src/test/resources/pki-certs/miner2/nssdb/key3.db similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/miner2/nssdb/key3.db rename to acceptance-tests/tests/src/test/resources/pki-certs/miner2/nssdb/key3.db diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/miner2/nssdb/secmod.db b/acceptance-tests/tests/src/test/resources/pki-certs/miner2/nssdb/secmod.db similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/miner2/nssdb/secmod.db rename to acceptance-tests/tests/src/test/resources/pki-certs/miner2/nssdb/secmod.db diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/miner2/nsspin.txt b/acceptance-tests/tests/src/test/resources/pki-certs/miner2/nsspin.txt similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/miner2/nsspin.txt rename to acceptance-tests/tests/src/test/resources/pki-certs/miner2/nsspin.txt diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/miner2/ssl-ca.pem b/acceptance-tests/tests/src/test/resources/pki-certs/miner2/ssl-ca.pem similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/miner2/ssl-ca.pem rename to acceptance-tests/tests/src/test/resources/pki-certs/miner2/ssl-ca.pem diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/miner2/ssl.pem b/acceptance-tests/tests/src/test/resources/pki-certs/miner2/ssl.pem similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/miner2/ssl.pem rename to acceptance-tests/tests/src/test/resources/pki-certs/miner2/ssl.pem diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/miner2/truststore.jks b/acceptance-tests/tests/src/test/resources/pki-certs/miner2/truststore.jks similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/miner2/truststore.jks rename to acceptance-tests/tests/src/test/resources/pki-certs/miner2/truststore.jks diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/miner3/crl.pem b/acceptance-tests/tests/src/test/resources/pki-certs/miner3/crl.pem similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/miner3/crl.pem rename to acceptance-tests/tests/src/test/resources/pki-certs/miner3/crl.pem diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/miner3/keys.p12 b/acceptance-tests/tests/src/test/resources/pki-certs/miner3/keys.p12 similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/miner3/keys.p12 rename to acceptance-tests/tests/src/test/resources/pki-certs/miner3/keys.p12 diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/miner3/keystore.jks b/acceptance-tests/tests/src/test/resources/pki-certs/miner3/keystore.jks similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/miner3/keystore.jks rename to acceptance-tests/tests/src/test/resources/pki-certs/miner3/keystore.jks diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/miner3/nss.cfg b/acceptance-tests/tests/src/test/resources/pki-certs/miner3/nss.cfg similarity index 52% rename from acceptance-tests/tests/src/test/resources/p2p-tls/miner3/nss.cfg rename to acceptance-tests/tests/src/test/resources/pki-certs/miner3/nss.cfg index 585e1b26df0..96ce4654b30 100644 --- a/acceptance-tests/tests/src/test/resources/p2p-tls/miner3/nss.cfg +++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner3/nss.cfg @@ -1,6 +1,6 @@ name = NSScrypto-miner3 -nssSecmodDirectory = ./src/test/resources/p2p-tls/miner3/nssdb +nssSecmodDirectory = ./src/test/resources/pki-certs/miner3/nssdb nssDbMode = readOnly nssModule = keystore diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/miner3/nssdb/cert8.db b/acceptance-tests/tests/src/test/resources/pki-certs/miner3/nssdb/cert8.db similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/miner3/nssdb/cert8.db rename to acceptance-tests/tests/src/test/resources/pki-certs/miner3/nssdb/cert8.db diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/miner3/nssdb/key3.db b/acceptance-tests/tests/src/test/resources/pki-certs/miner3/nssdb/key3.db similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/miner3/nssdb/key3.db rename to acceptance-tests/tests/src/test/resources/pki-certs/miner3/nssdb/key3.db diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/miner3/nssdb/secmod.db b/acceptance-tests/tests/src/test/resources/pki-certs/miner3/nssdb/secmod.db similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/miner3/nssdb/secmod.db rename to acceptance-tests/tests/src/test/resources/pki-certs/miner3/nssdb/secmod.db diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/miner3/nsspin.txt b/acceptance-tests/tests/src/test/resources/pki-certs/miner3/nsspin.txt similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/miner3/nsspin.txt rename to acceptance-tests/tests/src/test/resources/pki-certs/miner3/nsspin.txt diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/miner3/ssl-ca.pem b/acceptance-tests/tests/src/test/resources/pki-certs/miner3/ssl-ca.pem similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/miner3/ssl-ca.pem rename to acceptance-tests/tests/src/test/resources/pki-certs/miner3/ssl-ca.pem diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/miner3/ssl.pem b/acceptance-tests/tests/src/test/resources/pki-certs/miner3/ssl.pem similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/miner3/ssl.pem rename to acceptance-tests/tests/src/test/resources/pki-certs/miner3/ssl.pem diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/miner3/truststore.jks b/acceptance-tests/tests/src/test/resources/pki-certs/miner3/truststore.jks similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/miner3/truststore.jks rename to acceptance-tests/tests/src/test/resources/pki-certs/miner3/truststore.jks diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/miner4/crl.pem b/acceptance-tests/tests/src/test/resources/pki-certs/miner4/crl.pem similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/miner4/crl.pem rename to acceptance-tests/tests/src/test/resources/pki-certs/miner4/crl.pem diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/miner4/keys.p12 b/acceptance-tests/tests/src/test/resources/pki-certs/miner4/keys.p12 similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/miner4/keys.p12 rename to acceptance-tests/tests/src/test/resources/pki-certs/miner4/keys.p12 diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/miner4/keystore.jks b/acceptance-tests/tests/src/test/resources/pki-certs/miner4/keystore.jks similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/miner4/keystore.jks rename to acceptance-tests/tests/src/test/resources/pki-certs/miner4/keystore.jks diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/miner4/nss.cfg b/acceptance-tests/tests/src/test/resources/pki-certs/miner4/nss.cfg similarity index 52% rename from acceptance-tests/tests/src/test/resources/p2p-tls/miner4/nss.cfg rename to acceptance-tests/tests/src/test/resources/pki-certs/miner4/nss.cfg index 22f3ac3a245..c072465abb7 100644 --- a/acceptance-tests/tests/src/test/resources/p2p-tls/miner4/nss.cfg +++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner4/nss.cfg @@ -1,6 +1,6 @@ name = NSScrypto-miner4 -nssSecmodDirectory = ./src/test/resources/p2p-tls/miner4/nssdb +nssSecmodDirectory = ./src/test/resources/pki-certs/miner4/nssdb nssDbMode = readOnly nssModule = keystore diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/miner4/nssdb/cert8.db b/acceptance-tests/tests/src/test/resources/pki-certs/miner4/nssdb/cert8.db similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/miner4/nssdb/cert8.db rename to acceptance-tests/tests/src/test/resources/pki-certs/miner4/nssdb/cert8.db diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/miner4/nssdb/key3.db b/acceptance-tests/tests/src/test/resources/pki-certs/miner4/nssdb/key3.db similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/miner4/nssdb/key3.db rename to acceptance-tests/tests/src/test/resources/pki-certs/miner4/nssdb/key3.db diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/miner4/nssdb/secmod.db b/acceptance-tests/tests/src/test/resources/pki-certs/miner4/nssdb/secmod.db similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/miner4/nssdb/secmod.db rename to acceptance-tests/tests/src/test/resources/pki-certs/miner4/nssdb/secmod.db diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/miner4/nsspin.txt b/acceptance-tests/tests/src/test/resources/pki-certs/miner4/nsspin.txt similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/miner4/nsspin.txt rename to acceptance-tests/tests/src/test/resources/pki-certs/miner4/nsspin.txt diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/miner4/ssl-ca.pem b/acceptance-tests/tests/src/test/resources/pki-certs/miner4/ssl-ca.pem similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/miner4/ssl-ca.pem rename to acceptance-tests/tests/src/test/resources/pki-certs/miner4/ssl-ca.pem diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/miner4/ssl.pem b/acceptance-tests/tests/src/test/resources/pki-certs/miner4/ssl.pem similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/miner4/ssl.pem rename to acceptance-tests/tests/src/test/resources/pki-certs/miner4/ssl.pem diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/miner4/truststore.jks b/acceptance-tests/tests/src/test/resources/pki-certs/miner4/truststore.jks similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/miner4/truststore.jks rename to acceptance-tests/tests/src/test/resources/pki-certs/miner4/truststore.jks diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/miner5/crl.pem b/acceptance-tests/tests/src/test/resources/pki-certs/miner5/crl.pem similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/miner5/crl.pem rename to acceptance-tests/tests/src/test/resources/pki-certs/miner5/crl.pem diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/miner5/keys.p12 b/acceptance-tests/tests/src/test/resources/pki-certs/miner5/keys.p12 similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/miner5/keys.p12 rename to acceptance-tests/tests/src/test/resources/pki-certs/miner5/keys.p12 diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/miner5/keystore.jks b/acceptance-tests/tests/src/test/resources/pki-certs/miner5/keystore.jks similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/miner5/keystore.jks rename to acceptance-tests/tests/src/test/resources/pki-certs/miner5/keystore.jks diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/miner5/nss.cfg b/acceptance-tests/tests/src/test/resources/pki-certs/miner5/nss.cfg similarity index 52% rename from acceptance-tests/tests/src/test/resources/p2p-tls/miner5/nss.cfg rename to acceptance-tests/tests/src/test/resources/pki-certs/miner5/nss.cfg index e353171310e..e56635e2ab6 100644 --- a/acceptance-tests/tests/src/test/resources/p2p-tls/miner5/nss.cfg +++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner5/nss.cfg @@ -1,6 +1,6 @@ name = NSScrypto-miner5 -nssSecmodDirectory = ./src/test/resources/p2p-tls/miner5/nssdb +nssSecmodDirectory = ./src/test/resources/pki-certs/miner5/nssdb nssDbMode = readOnly nssModule = keystore diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/miner5/nssdb/cert8.db b/acceptance-tests/tests/src/test/resources/pki-certs/miner5/nssdb/cert8.db similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/miner5/nssdb/cert8.db rename to acceptance-tests/tests/src/test/resources/pki-certs/miner5/nssdb/cert8.db diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/miner5/nssdb/key3.db b/acceptance-tests/tests/src/test/resources/pki-certs/miner5/nssdb/key3.db similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/miner5/nssdb/key3.db rename to acceptance-tests/tests/src/test/resources/pki-certs/miner5/nssdb/key3.db diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/miner5/nssdb/secmod.db b/acceptance-tests/tests/src/test/resources/pki-certs/miner5/nssdb/secmod.db similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/miner5/nssdb/secmod.db rename to acceptance-tests/tests/src/test/resources/pki-certs/miner5/nssdb/secmod.db diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/miner5/nsspin.txt b/acceptance-tests/tests/src/test/resources/pki-certs/miner5/nsspin.txt similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/miner5/nsspin.txt rename to acceptance-tests/tests/src/test/resources/pki-certs/miner5/nsspin.txt diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/miner5/ssl-ca.pem b/acceptance-tests/tests/src/test/resources/pki-certs/miner5/ssl-ca.pem similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/miner5/ssl-ca.pem rename to acceptance-tests/tests/src/test/resources/pki-certs/miner5/ssl-ca.pem diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/miner5/ssl.pem b/acceptance-tests/tests/src/test/resources/pki-certs/miner5/ssl.pem similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/miner5/ssl.pem rename to acceptance-tests/tests/src/test/resources/pki-certs/miner5/ssl.pem diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/miner5/truststore.jks b/acceptance-tests/tests/src/test/resources/pki-certs/miner5/truststore.jks similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/miner5/truststore.jks rename to acceptance-tests/tests/src/test/resources/pki-certs/miner5/truststore.jks diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/miner6/crl.pem b/acceptance-tests/tests/src/test/resources/pki-certs/miner6/crl.pem similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/miner6/crl.pem rename to acceptance-tests/tests/src/test/resources/pki-certs/miner6/crl.pem diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/miner6/keys.p12 b/acceptance-tests/tests/src/test/resources/pki-certs/miner6/keys.p12 similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/miner6/keys.p12 rename to acceptance-tests/tests/src/test/resources/pki-certs/miner6/keys.p12 diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/miner6/keystore.jks b/acceptance-tests/tests/src/test/resources/pki-certs/miner6/keystore.jks similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/miner6/keystore.jks rename to acceptance-tests/tests/src/test/resources/pki-certs/miner6/keystore.jks diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/miner6/nss.cfg b/acceptance-tests/tests/src/test/resources/pki-certs/miner6/nss.cfg similarity index 52% rename from acceptance-tests/tests/src/test/resources/p2p-tls/miner6/nss.cfg rename to acceptance-tests/tests/src/test/resources/pki-certs/miner6/nss.cfg index 361ecfa8180..bf3d54b4db7 100644 --- a/acceptance-tests/tests/src/test/resources/p2p-tls/miner6/nss.cfg +++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner6/nss.cfg @@ -1,6 +1,6 @@ name = NSScrypto-miner6 -nssSecmodDirectory = ./src/test/resources/p2p-tls/miner6/nssdb +nssSecmodDirectory = ./src/test/resources/pki-certs/miner6/nssdb nssDbMode = readOnly nssModule = keystore diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/miner6/nssdb/cert8.db b/acceptance-tests/tests/src/test/resources/pki-certs/miner6/nssdb/cert8.db similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/miner6/nssdb/cert8.db rename to acceptance-tests/tests/src/test/resources/pki-certs/miner6/nssdb/cert8.db diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/miner6/nssdb/key3.db b/acceptance-tests/tests/src/test/resources/pki-certs/miner6/nssdb/key3.db similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/miner6/nssdb/key3.db rename to acceptance-tests/tests/src/test/resources/pki-certs/miner6/nssdb/key3.db diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/miner6/nssdb/secmod.db b/acceptance-tests/tests/src/test/resources/pki-certs/miner6/nssdb/secmod.db similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/miner6/nssdb/secmod.db rename to acceptance-tests/tests/src/test/resources/pki-certs/miner6/nssdb/secmod.db diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/miner6/nsspin.txt b/acceptance-tests/tests/src/test/resources/pki-certs/miner6/nsspin.txt similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/miner6/nsspin.txt rename to acceptance-tests/tests/src/test/resources/pki-certs/miner6/nsspin.txt diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/miner6/ssl-ca.pem b/acceptance-tests/tests/src/test/resources/pki-certs/miner6/ssl-ca.pem similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/miner6/ssl-ca.pem rename to acceptance-tests/tests/src/test/resources/pki-certs/miner6/ssl-ca.pem diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/miner6/ssl.pem b/acceptance-tests/tests/src/test/resources/pki-certs/miner6/ssl.pem similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/miner6/ssl.pem rename to acceptance-tests/tests/src/test/resources/pki-certs/miner6/ssl.pem diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/miner6/truststore.jks b/acceptance-tests/tests/src/test/resources/pki-certs/miner6/truststore.jks similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/miner6/truststore.jks rename to acceptance-tests/tests/src/test/resources/pki-certs/miner6/truststore.jks diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/node1/crl.pem b/acceptance-tests/tests/src/test/resources/pki-certs/node1/crl.pem similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/node1/crl.pem rename to acceptance-tests/tests/src/test/resources/pki-certs/node1/crl.pem diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/node1/keys.p12 b/acceptance-tests/tests/src/test/resources/pki-certs/node1/keys.p12 similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/node1/keys.p12 rename to acceptance-tests/tests/src/test/resources/pki-certs/node1/keys.p12 diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/node1/keystore.jks b/acceptance-tests/tests/src/test/resources/pki-certs/node1/keystore.jks similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/node1/keystore.jks rename to acceptance-tests/tests/src/test/resources/pki-certs/node1/keystore.jks diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/node1/nss.cfg b/acceptance-tests/tests/src/test/resources/pki-certs/node1/nss.cfg similarity index 52% rename from acceptance-tests/tests/src/test/resources/p2p-tls/node1/nss.cfg rename to acceptance-tests/tests/src/test/resources/pki-certs/node1/nss.cfg index 8856a409be4..320163767f8 100644 --- a/acceptance-tests/tests/src/test/resources/p2p-tls/node1/nss.cfg +++ b/acceptance-tests/tests/src/test/resources/pki-certs/node1/nss.cfg @@ -1,6 +1,6 @@ name = NSScrypto-node1 -nssSecmodDirectory = ./src/test/resources/p2p-tls/node1/nssdb +nssSecmodDirectory = ./src/test/resources/pki-certs/node1/nssdb nssDbMode = readOnly nssModule = keystore diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/node1/nssdb/cert8.db b/acceptance-tests/tests/src/test/resources/pki-certs/node1/nssdb/cert8.db similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/node1/nssdb/cert8.db rename to acceptance-tests/tests/src/test/resources/pki-certs/node1/nssdb/cert8.db diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/node1/nssdb/key3.db b/acceptance-tests/tests/src/test/resources/pki-certs/node1/nssdb/key3.db similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/node1/nssdb/key3.db rename to acceptance-tests/tests/src/test/resources/pki-certs/node1/nssdb/key3.db diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/node1/nssdb/secmod.db b/acceptance-tests/tests/src/test/resources/pki-certs/node1/nssdb/secmod.db similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/node1/nssdb/secmod.db rename to acceptance-tests/tests/src/test/resources/pki-certs/node1/nssdb/secmod.db diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/node1/nsspin.txt b/acceptance-tests/tests/src/test/resources/pki-certs/node1/nsspin.txt similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/node1/nsspin.txt rename to acceptance-tests/tests/src/test/resources/pki-certs/node1/nsspin.txt diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/node1/ssl-ca.pem b/acceptance-tests/tests/src/test/resources/pki-certs/node1/ssl-ca.pem similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/node1/ssl-ca.pem rename to acceptance-tests/tests/src/test/resources/pki-certs/node1/ssl-ca.pem diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/node1/ssl.pem b/acceptance-tests/tests/src/test/resources/pki-certs/node1/ssl.pem similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/node1/ssl.pem rename to acceptance-tests/tests/src/test/resources/pki-certs/node1/ssl.pem diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/node1/truststore.jks b/acceptance-tests/tests/src/test/resources/pki-certs/node1/truststore.jks similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/node1/truststore.jks rename to acceptance-tests/tests/src/test/resources/pki-certs/node1/truststore.jks diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/node2/crl.pem b/acceptance-tests/tests/src/test/resources/pki-certs/node2/crl.pem similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/node2/crl.pem rename to acceptance-tests/tests/src/test/resources/pki-certs/node2/crl.pem diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/node2/keys.p12 b/acceptance-tests/tests/src/test/resources/pki-certs/node2/keys.p12 similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/node2/keys.p12 rename to acceptance-tests/tests/src/test/resources/pki-certs/node2/keys.p12 diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/node2/keystore.jks b/acceptance-tests/tests/src/test/resources/pki-certs/node2/keystore.jks similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/node2/keystore.jks rename to acceptance-tests/tests/src/test/resources/pki-certs/node2/keystore.jks diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/node2/nss.cfg b/acceptance-tests/tests/src/test/resources/pki-certs/node2/nss.cfg similarity index 52% rename from acceptance-tests/tests/src/test/resources/p2p-tls/node2/nss.cfg rename to acceptance-tests/tests/src/test/resources/pki-certs/node2/nss.cfg index a3a9fb23a62..a0db3bdc995 100644 --- a/acceptance-tests/tests/src/test/resources/p2p-tls/node2/nss.cfg +++ b/acceptance-tests/tests/src/test/resources/pki-certs/node2/nss.cfg @@ -1,6 +1,6 @@ name = NSScrypto-node2 -nssSecmodDirectory = ./src/test/resources/p2p-tls/node2/nssdb +nssSecmodDirectory = ./src/test/resources/pki-certs/node2/nssdb nssDbMode = readOnly nssModule = keystore diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/node2/nssdb/cert8.db b/acceptance-tests/tests/src/test/resources/pki-certs/node2/nssdb/cert8.db similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/node2/nssdb/cert8.db rename to acceptance-tests/tests/src/test/resources/pki-certs/node2/nssdb/cert8.db diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/node2/nssdb/key3.db b/acceptance-tests/tests/src/test/resources/pki-certs/node2/nssdb/key3.db similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/node2/nssdb/key3.db rename to acceptance-tests/tests/src/test/resources/pki-certs/node2/nssdb/key3.db diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/node2/nssdb/secmod.db b/acceptance-tests/tests/src/test/resources/pki-certs/node2/nssdb/secmod.db similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/node2/nssdb/secmod.db rename to acceptance-tests/tests/src/test/resources/pki-certs/node2/nssdb/secmod.db diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/node2/nsspin.txt b/acceptance-tests/tests/src/test/resources/pki-certs/node2/nsspin.txt similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/node2/nsspin.txt rename to acceptance-tests/tests/src/test/resources/pki-certs/node2/nsspin.txt diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/node2/ssl-ca.pem b/acceptance-tests/tests/src/test/resources/pki-certs/node2/ssl-ca.pem similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/node2/ssl-ca.pem rename to acceptance-tests/tests/src/test/resources/pki-certs/node2/ssl-ca.pem diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/node2/ssl.pem b/acceptance-tests/tests/src/test/resources/pki-certs/node2/ssl.pem similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/node2/ssl.pem rename to acceptance-tests/tests/src/test/resources/pki-certs/node2/ssl.pem diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/node2/truststore.jks b/acceptance-tests/tests/src/test/resources/pki-certs/node2/truststore.jks similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/node2/truststore.jks rename to acceptance-tests/tests/src/test/resources/pki-certs/node2/truststore.jks diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/non-validator/crl.pem b/acceptance-tests/tests/src/test/resources/pki-certs/non-validator/crl.pem similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/non-validator/crl.pem rename to acceptance-tests/tests/src/test/resources/pki-certs/non-validator/crl.pem diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/non-validator/keys.p12 b/acceptance-tests/tests/src/test/resources/pki-certs/non-validator/keys.p12 similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/non-validator/keys.p12 rename to acceptance-tests/tests/src/test/resources/pki-certs/non-validator/keys.p12 diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/non-validator/keystore.jks b/acceptance-tests/tests/src/test/resources/pki-certs/non-validator/keystore.jks similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/non-validator/keystore.jks rename to acceptance-tests/tests/src/test/resources/pki-certs/non-validator/keystore.jks diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/non-validator/nss.cfg b/acceptance-tests/tests/src/test/resources/pki-certs/non-validator/nss.cfg similarity index 52% rename from acceptance-tests/tests/src/test/resources/p2p-tls/non-validator/nss.cfg rename to acceptance-tests/tests/src/test/resources/pki-certs/non-validator/nss.cfg index c4de8fb7acd..3615d46bd88 100644 --- a/acceptance-tests/tests/src/test/resources/p2p-tls/non-validator/nss.cfg +++ b/acceptance-tests/tests/src/test/resources/pki-certs/non-validator/nss.cfg @@ -1,6 +1,6 @@ name = NSScrypto-non-validator -nssSecmodDirectory = ./src/test/resources/p2p-tls/non-validator/nssdb +nssSecmodDirectory = ./src/test/resources/pki-certs/non-validator/nssdb nssDbMode = readOnly nssModule = keystore diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/non-validator/nssdb/cert8.db b/acceptance-tests/tests/src/test/resources/pki-certs/non-validator/nssdb/cert8.db similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/non-validator/nssdb/cert8.db rename to acceptance-tests/tests/src/test/resources/pki-certs/non-validator/nssdb/cert8.db diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/non-validator/nssdb/key3.db b/acceptance-tests/tests/src/test/resources/pki-certs/non-validator/nssdb/key3.db similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/non-validator/nssdb/key3.db rename to acceptance-tests/tests/src/test/resources/pki-certs/non-validator/nssdb/key3.db diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/non-validator/nssdb/secmod.db b/acceptance-tests/tests/src/test/resources/pki-certs/non-validator/nssdb/secmod.db similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/non-validator/nssdb/secmod.db rename to acceptance-tests/tests/src/test/resources/pki-certs/non-validator/nssdb/secmod.db diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/non-validator/nsspin.txt b/acceptance-tests/tests/src/test/resources/pki-certs/non-validator/nsspin.txt similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/non-validator/nsspin.txt rename to acceptance-tests/tests/src/test/resources/pki-certs/non-validator/nsspin.txt diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/non-validator/ssl-ca.pem b/acceptance-tests/tests/src/test/resources/pki-certs/non-validator/ssl-ca.pem similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/non-validator/ssl-ca.pem rename to acceptance-tests/tests/src/test/resources/pki-certs/non-validator/ssl-ca.pem diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/non-validator/ssl.pem b/acceptance-tests/tests/src/test/resources/pki-certs/non-validator/ssl.pem similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/non-validator/ssl.pem rename to acceptance-tests/tests/src/test/resources/pki-certs/non-validator/ssl.pem diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/non-validator/truststore.jks b/acceptance-tests/tests/src/test/resources/pki-certs/non-validator/truststore.jks similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/non-validator/truststore.jks rename to acceptance-tests/tests/src/test/resources/pki-certs/non-validator/truststore.jks diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/nonValidator/crl.pem b/acceptance-tests/tests/src/test/resources/pki-certs/nonValidator/crl.pem similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/nonValidator/crl.pem rename to acceptance-tests/tests/src/test/resources/pki-certs/nonValidator/crl.pem diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/nonValidator/keys.p12 b/acceptance-tests/tests/src/test/resources/pki-certs/nonValidator/keys.p12 similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/nonValidator/keys.p12 rename to acceptance-tests/tests/src/test/resources/pki-certs/nonValidator/keys.p12 diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/nonValidator/keystore.jks b/acceptance-tests/tests/src/test/resources/pki-certs/nonValidator/keystore.jks similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/nonValidator/keystore.jks rename to acceptance-tests/tests/src/test/resources/pki-certs/nonValidator/keystore.jks diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/nonValidator/nss.cfg b/acceptance-tests/tests/src/test/resources/pki-certs/nonValidator/nss.cfg similarity index 52% rename from acceptance-tests/tests/src/test/resources/p2p-tls/nonValidator/nss.cfg rename to acceptance-tests/tests/src/test/resources/pki-certs/nonValidator/nss.cfg index 894a81b686b..afe2f17e0f2 100644 --- a/acceptance-tests/tests/src/test/resources/p2p-tls/nonValidator/nss.cfg +++ b/acceptance-tests/tests/src/test/resources/pki-certs/nonValidator/nss.cfg @@ -1,6 +1,6 @@ name = NSScrypto-nonValidator -nssSecmodDirectory = ./src/test/resources/p2p-tls/nonValidator/nssdb +nssSecmodDirectory = ./src/test/resources/pki-certs/nonValidator/nssdb nssDbMode = readOnly nssModule = keystore diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/nonValidator/nssdb/cert8.db b/acceptance-tests/tests/src/test/resources/pki-certs/nonValidator/nssdb/cert8.db similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/nonValidator/nssdb/cert8.db rename to acceptance-tests/tests/src/test/resources/pki-certs/nonValidator/nssdb/cert8.db diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/nonValidator/nssdb/key3.db b/acceptance-tests/tests/src/test/resources/pki-certs/nonValidator/nssdb/key3.db similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/nonValidator/nssdb/key3.db rename to acceptance-tests/tests/src/test/resources/pki-certs/nonValidator/nssdb/key3.db diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/nonValidator/nssdb/secmod.db b/acceptance-tests/tests/src/test/resources/pki-certs/nonValidator/nssdb/secmod.db similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/nonValidator/nssdb/secmod.db rename to acceptance-tests/tests/src/test/resources/pki-certs/nonValidator/nssdb/secmod.db diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/nonValidator/nsspin.txt b/acceptance-tests/tests/src/test/resources/pki-certs/nonValidator/nsspin.txt similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/nonValidator/nsspin.txt rename to acceptance-tests/tests/src/test/resources/pki-certs/nonValidator/nsspin.txt diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/nonValidator/ssl-ca.pem b/acceptance-tests/tests/src/test/resources/pki-certs/nonValidator/ssl-ca.pem similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/nonValidator/ssl-ca.pem rename to acceptance-tests/tests/src/test/resources/pki-certs/nonValidator/ssl-ca.pem diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/nonValidator/ssl.pem b/acceptance-tests/tests/src/test/resources/pki-certs/nonValidator/ssl.pem similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/nonValidator/ssl.pem rename to acceptance-tests/tests/src/test/resources/pki-certs/nonValidator/ssl.pem diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/nonValidator/truststore.jks b/acceptance-tests/tests/src/test/resources/pki-certs/nonValidator/truststore.jks similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/nonValidator/truststore.jks rename to acceptance-tests/tests/src/test/resources/pki-certs/nonValidator/truststore.jks diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/validator/crl.pem b/acceptance-tests/tests/src/test/resources/pki-certs/validator/crl.pem similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/validator/crl.pem rename to acceptance-tests/tests/src/test/resources/pki-certs/validator/crl.pem diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/validator/keys.p12 b/acceptance-tests/tests/src/test/resources/pki-certs/validator/keys.p12 similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/validator/keys.p12 rename to acceptance-tests/tests/src/test/resources/pki-certs/validator/keys.p12 diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/validator/keystore.jks b/acceptance-tests/tests/src/test/resources/pki-certs/validator/keystore.jks similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/validator/keystore.jks rename to acceptance-tests/tests/src/test/resources/pki-certs/validator/keystore.jks diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/validator/nss.cfg b/acceptance-tests/tests/src/test/resources/pki-certs/validator/nss.cfg similarity index 52% rename from acceptance-tests/tests/src/test/resources/p2p-tls/validator/nss.cfg rename to acceptance-tests/tests/src/test/resources/pki-certs/validator/nss.cfg index 2505203bafc..f3849919caa 100644 --- a/acceptance-tests/tests/src/test/resources/p2p-tls/validator/nss.cfg +++ b/acceptance-tests/tests/src/test/resources/pki-certs/validator/nss.cfg @@ -1,6 +1,6 @@ name = NSScrypto-validator -nssSecmodDirectory = ./src/test/resources/p2p-tls/validator/nssdb +nssSecmodDirectory = ./src/test/resources/pki-certs/validator/nssdb nssDbMode = readOnly nssModule = keystore diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/validator/nssdb/cert8.db b/acceptance-tests/tests/src/test/resources/pki-certs/validator/nssdb/cert8.db similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/validator/nssdb/cert8.db rename to acceptance-tests/tests/src/test/resources/pki-certs/validator/nssdb/cert8.db diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/validator/nssdb/key3.db b/acceptance-tests/tests/src/test/resources/pki-certs/validator/nssdb/key3.db similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/validator/nssdb/key3.db rename to acceptance-tests/tests/src/test/resources/pki-certs/validator/nssdb/key3.db diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/validator/nssdb/secmod.db b/acceptance-tests/tests/src/test/resources/pki-certs/validator/nssdb/secmod.db similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/validator/nssdb/secmod.db rename to acceptance-tests/tests/src/test/resources/pki-certs/validator/nssdb/secmod.db diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/validator/nsspin.txt b/acceptance-tests/tests/src/test/resources/pki-certs/validator/nsspin.txt similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/validator/nsspin.txt rename to acceptance-tests/tests/src/test/resources/pki-certs/validator/nsspin.txt diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/validator/ssl-ca.pem b/acceptance-tests/tests/src/test/resources/pki-certs/validator/ssl-ca.pem similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/validator/ssl-ca.pem rename to acceptance-tests/tests/src/test/resources/pki-certs/validator/ssl-ca.pem diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/validator/ssl.pem b/acceptance-tests/tests/src/test/resources/pki-certs/validator/ssl.pem similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/validator/ssl.pem rename to acceptance-tests/tests/src/test/resources/pki-certs/validator/ssl.pem diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/validator/truststore.jks b/acceptance-tests/tests/src/test/resources/pki-certs/validator/truststore.jks similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/validator/truststore.jks rename to acceptance-tests/tests/src/test/resources/pki-certs/validator/truststore.jks diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/validator1/crl.pem b/acceptance-tests/tests/src/test/resources/pki-certs/validator1/crl.pem similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/validator1/crl.pem rename to acceptance-tests/tests/src/test/resources/pki-certs/validator1/crl.pem diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/validator1/keys.p12 b/acceptance-tests/tests/src/test/resources/pki-certs/validator1/keys.p12 similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/validator1/keys.p12 rename to acceptance-tests/tests/src/test/resources/pki-certs/validator1/keys.p12 diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/validator1/keystore.jks b/acceptance-tests/tests/src/test/resources/pki-certs/validator1/keystore.jks similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/validator1/keystore.jks rename to acceptance-tests/tests/src/test/resources/pki-certs/validator1/keystore.jks diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/validator1/nss.cfg b/acceptance-tests/tests/src/test/resources/pki-certs/validator1/nss.cfg similarity index 52% rename from acceptance-tests/tests/src/test/resources/p2p-tls/validator1/nss.cfg rename to acceptance-tests/tests/src/test/resources/pki-certs/validator1/nss.cfg index 9d40944e511..b908a6800f8 100644 --- a/acceptance-tests/tests/src/test/resources/p2p-tls/validator1/nss.cfg +++ b/acceptance-tests/tests/src/test/resources/pki-certs/validator1/nss.cfg @@ -1,6 +1,6 @@ name = NSScrypto-validator1 -nssSecmodDirectory = ./src/test/resources/p2p-tls/validator1/nssdb +nssSecmodDirectory = ./src/test/resources/pki-certs/validator1/nssdb nssDbMode = readOnly nssModule = keystore diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/validator1/nssdb/cert8.db b/acceptance-tests/tests/src/test/resources/pki-certs/validator1/nssdb/cert8.db similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/validator1/nssdb/cert8.db rename to acceptance-tests/tests/src/test/resources/pki-certs/validator1/nssdb/cert8.db diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/validator1/nssdb/key3.db b/acceptance-tests/tests/src/test/resources/pki-certs/validator1/nssdb/key3.db similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/validator1/nssdb/key3.db rename to acceptance-tests/tests/src/test/resources/pki-certs/validator1/nssdb/key3.db diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/validator1/nssdb/secmod.db b/acceptance-tests/tests/src/test/resources/pki-certs/validator1/nssdb/secmod.db similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/validator1/nssdb/secmod.db rename to acceptance-tests/tests/src/test/resources/pki-certs/validator1/nssdb/secmod.db diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/validator1/nsspin.txt b/acceptance-tests/tests/src/test/resources/pki-certs/validator1/nsspin.txt similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/validator1/nsspin.txt rename to acceptance-tests/tests/src/test/resources/pki-certs/validator1/nsspin.txt diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/validator1/ssl-ca.pem b/acceptance-tests/tests/src/test/resources/pki-certs/validator1/ssl-ca.pem similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/validator1/ssl-ca.pem rename to acceptance-tests/tests/src/test/resources/pki-certs/validator1/ssl-ca.pem diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/validator1/ssl.pem b/acceptance-tests/tests/src/test/resources/pki-certs/validator1/ssl.pem similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/validator1/ssl.pem rename to acceptance-tests/tests/src/test/resources/pki-certs/validator1/ssl.pem diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/validator1/truststore.jks b/acceptance-tests/tests/src/test/resources/pki-certs/validator1/truststore.jks similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/validator1/truststore.jks rename to acceptance-tests/tests/src/test/resources/pki-certs/validator1/truststore.jks diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/validator2/crl.pem b/acceptance-tests/tests/src/test/resources/pki-certs/validator2/crl.pem similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/validator2/crl.pem rename to acceptance-tests/tests/src/test/resources/pki-certs/validator2/crl.pem diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/validator2/keys.p12 b/acceptance-tests/tests/src/test/resources/pki-certs/validator2/keys.p12 similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/validator2/keys.p12 rename to acceptance-tests/tests/src/test/resources/pki-certs/validator2/keys.p12 diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/validator2/keystore.jks b/acceptance-tests/tests/src/test/resources/pki-certs/validator2/keystore.jks similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/validator2/keystore.jks rename to acceptance-tests/tests/src/test/resources/pki-certs/validator2/keystore.jks diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/validator2/nss.cfg b/acceptance-tests/tests/src/test/resources/pki-certs/validator2/nss.cfg similarity index 52% rename from acceptance-tests/tests/src/test/resources/p2p-tls/validator2/nss.cfg rename to acceptance-tests/tests/src/test/resources/pki-certs/validator2/nss.cfg index 58114032650..a6725a100fe 100644 --- a/acceptance-tests/tests/src/test/resources/p2p-tls/validator2/nss.cfg +++ b/acceptance-tests/tests/src/test/resources/pki-certs/validator2/nss.cfg @@ -1,6 +1,6 @@ name = NSScrypto-validator2 -nssSecmodDirectory = ./src/test/resources/p2p-tls/validator2/nssdb +nssSecmodDirectory = ./src/test/resources/pki-certs/validator2/nssdb nssDbMode = readOnly nssModule = keystore diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/validator2/nssdb/cert8.db b/acceptance-tests/tests/src/test/resources/pki-certs/validator2/nssdb/cert8.db similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/validator2/nssdb/cert8.db rename to acceptance-tests/tests/src/test/resources/pki-certs/validator2/nssdb/cert8.db diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/validator2/nssdb/key3.db b/acceptance-tests/tests/src/test/resources/pki-certs/validator2/nssdb/key3.db similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/validator2/nssdb/key3.db rename to acceptance-tests/tests/src/test/resources/pki-certs/validator2/nssdb/key3.db diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/validator2/nssdb/secmod.db b/acceptance-tests/tests/src/test/resources/pki-certs/validator2/nssdb/secmod.db similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/validator2/nssdb/secmod.db rename to acceptance-tests/tests/src/test/resources/pki-certs/validator2/nssdb/secmod.db diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/validator2/nsspin.txt b/acceptance-tests/tests/src/test/resources/pki-certs/validator2/nsspin.txt similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/validator2/nsspin.txt rename to acceptance-tests/tests/src/test/resources/pki-certs/validator2/nsspin.txt diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/validator2/ssl-ca.pem b/acceptance-tests/tests/src/test/resources/pki-certs/validator2/ssl-ca.pem similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/validator2/ssl-ca.pem rename to acceptance-tests/tests/src/test/resources/pki-certs/validator2/ssl-ca.pem diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/validator2/ssl.pem b/acceptance-tests/tests/src/test/resources/pki-certs/validator2/ssl.pem similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/validator2/ssl.pem rename to acceptance-tests/tests/src/test/resources/pki-certs/validator2/ssl.pem diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/validator2/truststore.jks b/acceptance-tests/tests/src/test/resources/pki-certs/validator2/truststore.jks similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/validator2/truststore.jks rename to acceptance-tests/tests/src/test/resources/pki-certs/validator2/truststore.jks diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/validator3/crl.pem b/acceptance-tests/tests/src/test/resources/pki-certs/validator3/crl.pem similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/validator3/crl.pem rename to acceptance-tests/tests/src/test/resources/pki-certs/validator3/crl.pem diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/validator3/keys.p12 b/acceptance-tests/tests/src/test/resources/pki-certs/validator3/keys.p12 similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/validator3/keys.p12 rename to acceptance-tests/tests/src/test/resources/pki-certs/validator3/keys.p12 diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/validator3/keystore.jks b/acceptance-tests/tests/src/test/resources/pki-certs/validator3/keystore.jks similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/validator3/keystore.jks rename to acceptance-tests/tests/src/test/resources/pki-certs/validator3/keystore.jks diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/validator3/nss.cfg b/acceptance-tests/tests/src/test/resources/pki-certs/validator3/nss.cfg similarity index 52% rename from acceptance-tests/tests/src/test/resources/p2p-tls/validator3/nss.cfg rename to acceptance-tests/tests/src/test/resources/pki-certs/validator3/nss.cfg index 3f9be85925c..d2c68dae6c4 100644 --- a/acceptance-tests/tests/src/test/resources/p2p-tls/validator3/nss.cfg +++ b/acceptance-tests/tests/src/test/resources/pki-certs/validator3/nss.cfg @@ -1,6 +1,6 @@ name = NSScrypto-validator3 -nssSecmodDirectory = ./src/test/resources/p2p-tls/validator3/nssdb +nssSecmodDirectory = ./src/test/resources/pki-certs/validator3/nssdb nssDbMode = readOnly nssModule = keystore diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/validator3/nssdb/cert8.db b/acceptance-tests/tests/src/test/resources/pki-certs/validator3/nssdb/cert8.db similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/validator3/nssdb/cert8.db rename to acceptance-tests/tests/src/test/resources/pki-certs/validator3/nssdb/cert8.db diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/validator3/nssdb/key3.db b/acceptance-tests/tests/src/test/resources/pki-certs/validator3/nssdb/key3.db similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/validator3/nssdb/key3.db rename to acceptance-tests/tests/src/test/resources/pki-certs/validator3/nssdb/key3.db diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/validator3/nssdb/secmod.db b/acceptance-tests/tests/src/test/resources/pki-certs/validator3/nssdb/secmod.db similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/validator3/nssdb/secmod.db rename to acceptance-tests/tests/src/test/resources/pki-certs/validator3/nssdb/secmod.db diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/validator3/nsspin.txt b/acceptance-tests/tests/src/test/resources/pki-certs/validator3/nsspin.txt similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/validator3/nsspin.txt rename to acceptance-tests/tests/src/test/resources/pki-certs/validator3/nsspin.txt diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/validator3/ssl-ca.pem b/acceptance-tests/tests/src/test/resources/pki-certs/validator3/ssl-ca.pem similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/validator3/ssl-ca.pem rename to acceptance-tests/tests/src/test/resources/pki-certs/validator3/ssl-ca.pem diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/validator3/ssl.pem b/acceptance-tests/tests/src/test/resources/pki-certs/validator3/ssl.pem similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/validator3/ssl.pem rename to acceptance-tests/tests/src/test/resources/pki-certs/validator3/ssl.pem diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/validator3/truststore.jks b/acceptance-tests/tests/src/test/resources/pki-certs/validator3/truststore.jks similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/validator3/truststore.jks rename to acceptance-tests/tests/src/test/resources/pki-certs/validator3/truststore.jks diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/validator4/crl.pem b/acceptance-tests/tests/src/test/resources/pki-certs/validator4/crl.pem similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/validator4/crl.pem rename to acceptance-tests/tests/src/test/resources/pki-certs/validator4/crl.pem diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/validator4/keys.p12 b/acceptance-tests/tests/src/test/resources/pki-certs/validator4/keys.p12 similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/validator4/keys.p12 rename to acceptance-tests/tests/src/test/resources/pki-certs/validator4/keys.p12 diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/validator4/keystore.jks b/acceptance-tests/tests/src/test/resources/pki-certs/validator4/keystore.jks similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/validator4/keystore.jks rename to acceptance-tests/tests/src/test/resources/pki-certs/validator4/keystore.jks diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/validator4/nss.cfg b/acceptance-tests/tests/src/test/resources/pki-certs/validator4/nss.cfg similarity index 52% rename from acceptance-tests/tests/src/test/resources/p2p-tls/validator4/nss.cfg rename to acceptance-tests/tests/src/test/resources/pki-certs/validator4/nss.cfg index 6c56b214a8f..c114f78b09d 100644 --- a/acceptance-tests/tests/src/test/resources/p2p-tls/validator4/nss.cfg +++ b/acceptance-tests/tests/src/test/resources/pki-certs/validator4/nss.cfg @@ -1,6 +1,6 @@ name = NSScrypto-validator4 -nssSecmodDirectory = ./src/test/resources/p2p-tls/validator4/nssdb +nssSecmodDirectory = ./src/test/resources/pki-certs/validator4/nssdb nssDbMode = readOnly nssModule = keystore diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/validator4/nssdb/cert8.db b/acceptance-tests/tests/src/test/resources/pki-certs/validator4/nssdb/cert8.db similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/validator4/nssdb/cert8.db rename to acceptance-tests/tests/src/test/resources/pki-certs/validator4/nssdb/cert8.db diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/validator4/nssdb/key3.db b/acceptance-tests/tests/src/test/resources/pki-certs/validator4/nssdb/key3.db similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/validator4/nssdb/key3.db rename to acceptance-tests/tests/src/test/resources/pki-certs/validator4/nssdb/key3.db diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/validator4/nssdb/secmod.db b/acceptance-tests/tests/src/test/resources/pki-certs/validator4/nssdb/secmod.db similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/validator4/nssdb/secmod.db rename to acceptance-tests/tests/src/test/resources/pki-certs/validator4/nssdb/secmod.db diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/validator4/nsspin.txt b/acceptance-tests/tests/src/test/resources/pki-certs/validator4/nsspin.txt similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/validator4/nsspin.txt rename to acceptance-tests/tests/src/test/resources/pki-certs/validator4/nsspin.txt diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/validator4/ssl-ca.pem b/acceptance-tests/tests/src/test/resources/pki-certs/validator4/ssl-ca.pem similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/validator4/ssl-ca.pem rename to acceptance-tests/tests/src/test/resources/pki-certs/validator4/ssl-ca.pem diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/validator4/ssl.pem b/acceptance-tests/tests/src/test/resources/pki-certs/validator4/ssl.pem similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/validator4/ssl.pem rename to acceptance-tests/tests/src/test/resources/pki-certs/validator4/ssl.pem diff --git a/acceptance-tests/tests/src/test/resources/p2p-tls/validator4/truststore.jks b/acceptance-tests/tests/src/test/resources/pki-certs/validator4/truststore.jks similarity index 100% rename from acceptance-tests/tests/src/test/resources/p2p-tls/validator4/truststore.jks rename to acceptance-tests/tests/src/test/resources/pki-certs/validator4/truststore.jks diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/pki/DefaultKeyStoreWrapperProvider.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/pki/DefaultKeyStoreWrapperProvider.java new file mode 100644 index 00000000000..914349271f1 --- /dev/null +++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/pki/DefaultKeyStoreWrapperProvider.java @@ -0,0 +1,73 @@ +/* + * Copyright Copyright contributors to Hyperledger Besu. + * + * 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.consensus.qbft.pki; + +import org.hyperledger.besu.pki.keystore.HardwareKeyStoreWrapper; +import org.hyperledger.besu.pki.keystore.KeyStoreWrapper; +import org.hyperledger.besu.pki.keystore.SoftwareKeyStoreWrapper; + +import java.nio.file.Path; + +import com.google.common.annotations.VisibleForTesting; + +public class DefaultKeyStoreWrapperProvider implements KeyStoreWrapperProvider { + + private final HardwareKeyStoreWrapperProvider hardwareKeyStoreWrapperProvider; + private final SoftwareKeyStoreWrapperProvider softwareKeyStoreWrapperProvider; + + DefaultKeyStoreWrapperProvider() { + this(HardwareKeyStoreWrapper::new, SoftwareKeyStoreWrapper::new); + } + + @VisibleForTesting + DefaultKeyStoreWrapperProvider( + final HardwareKeyStoreWrapperProvider hardwareKeyStoreWrapperProvider, + final SoftwareKeyStoreWrapperProvider softwareKeyStoreWrapperProvider) { + this.hardwareKeyStoreWrapperProvider = hardwareKeyStoreWrapperProvider; + this.softwareKeyStoreWrapperProvider = softwareKeyStoreWrapperProvider; + } + + @Override + public KeyStoreWrapper apply( + final String keyStoreType, + final Path keyStorePath, + final String keyStorePassword, + final Path crl) { + if (KeyStoreWrapper.KEYSTORE_TYPE_PKCS11.equalsIgnoreCase(keyStoreType)) { + return hardwareKeyStoreWrapperProvider.get(keyStorePassword, keyStorePath, crl); + } else { + return softwareKeyStoreWrapperProvider.get(keyStoreType, keyStorePath, keyStorePassword, crl); + } + } + + interface HardwareKeyStoreWrapperProvider { + + HardwareKeyStoreWrapper get( + final String keystorePassword, final Path config, final Path crlLocation); + } + + interface SoftwareKeyStoreWrapperProvider { + + SoftwareKeyStoreWrapper get( + final String keystoreType, + final Path keystoreLocation, + final String keystorePassword, + final Path crlLocation); + } +} diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/pki/KeyStoreWrapperProvider.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/pki/KeyStoreWrapperProvider.java new file mode 100644 index 00000000000..9fd7adde0c5 --- /dev/null +++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/pki/KeyStoreWrapperProvider.java @@ -0,0 +1,30 @@ +/* + * Copyright ConsenSys AG. + * + * 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.consensus.qbft.pki; + +import org.hyperledger.besu.pki.keystore.KeyStoreWrapper; + +import java.nio.file.Path; + +@FunctionalInterface +interface KeyStoreWrapperProvider { + + KeyStoreWrapper apply( + final String keyStoreType, + final Path keyStorePath, + final String keyStorePassword, + final Path crl); +} diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/pki/PkiBlockCreationConfigurationProvider.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/pki/PkiBlockCreationConfigurationProvider.java index 6fd89a93c29..8d5e53e2106 100644 --- a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/pki/PkiBlockCreationConfigurationProvider.java +++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/pki/PkiBlockCreationConfigurationProvider.java @@ -19,9 +19,6 @@ import org.hyperledger.besu.pki.config.PkiKeyStoreConfiguration; import org.hyperledger.besu.pki.keystore.KeyStoreWrapper; -import org.hyperledger.besu.pki.keystore.SoftwareKeyStoreWrapper; - -import java.nio.file.Path; import com.google.common.annotations.VisibleForTesting; import org.apache.logging.log4j.LogManager; @@ -34,7 +31,7 @@ public class PkiBlockCreationConfigurationProvider { private final KeyStoreWrapperProvider keyStoreWrapperProvider; public PkiBlockCreationConfigurationProvider() { - this(SoftwareKeyStoreWrapper::new); + this(new DefaultKeyStoreWrapperProvider()); } @VisibleForTesting @@ -78,14 +75,4 @@ public PkiBlockCreationConfiguration load( return new PkiBlockCreationConfiguration( keyStore, trustStore, pkiKeyStoreConfiguration.getCertificateAlias()); } - - @FunctionalInterface - interface KeyStoreWrapperProvider { - - KeyStoreWrapper apply( - final String keyStoreType, - final Path keyStorePath, - final String keyStorePassword, - final Path crl); - } } diff --git a/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/pki/DefaultKeyStoreWrapperProviderTest.java b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/pki/DefaultKeyStoreWrapperProviderTest.java new file mode 100644 index 00000000000..e0289759970 --- /dev/null +++ b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/pki/DefaultKeyStoreWrapperProviderTest.java @@ -0,0 +1,85 @@ +/* + * Copyright ConsenSys AG. + * + * 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.consensus.qbft.pki; + +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoInteractions; + +import org.hyperledger.besu.consensus.qbft.pki.DefaultKeyStoreWrapperProvider.HardwareKeyStoreWrapperProvider; +import org.hyperledger.besu.consensus.qbft.pki.DefaultKeyStoreWrapperProvider.SoftwareKeyStoreWrapperProvider; +import org.hyperledger.besu.pki.keystore.KeyStoreWrapper; + +import java.nio.file.Path; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnitRunner; + +@RunWith(MockitoJUnitRunner.class) +public class DefaultKeyStoreWrapperProviderTest { + + @Mock private HardwareKeyStoreWrapperProvider hardwareKeyStoreWrapperProvider; + @Mock private SoftwareKeyStoreWrapperProvider softwareKeyStoreWrapperProvider; + @InjectMocks private DefaultKeyStoreWrapperProvider keyStoreWrapperProvider; + + private final Path keystorePath = Path.of("/keystore"); + private final String keystorePassword = "pwd"; + private final Path crlPath = Path.of("/crl"); + + @Test + public void configWithTypePKCS11UsesHardwareKeyStoreProvider() { + keyStoreWrapperProvider.apply( + KeyStoreWrapper.KEYSTORE_TYPE_PKCS11, keystorePath, keystorePassword, crlPath); + + verify(hardwareKeyStoreWrapperProvider) + .get(eq(keystorePassword), eq(keystorePath), eq(crlPath)); + verifyNoInteractions(softwareKeyStoreWrapperProvider); + } + + @Test + public void configWithTypePKCS12UsesSoftwareKeyStoreProvider() { + keyStoreWrapperProvider.apply( + KeyStoreWrapper.KEYSTORE_TYPE_PKCS12, keystorePath, keystorePassword, crlPath); + + verify(softwareKeyStoreWrapperProvider) + .get( + eq(KeyStoreWrapper.KEYSTORE_TYPE_PKCS12), + eq(keystorePath), + eq(keystorePassword), + eq(crlPath)); + verifyNoInteractions(hardwareKeyStoreWrapperProvider); + } + + @Test + public void configWithTypeJKSUsesSoftwareKeyStoreProvider() { + keyStoreWrapperProvider.apply( + KeyStoreWrapper.KEYSTORE_TYPE_JKS, keystorePath, keystorePassword, crlPath); + + verify(softwareKeyStoreWrapperProvider) + .get( + eq(KeyStoreWrapper.KEYSTORE_TYPE_JKS), + eq(keystorePath), + eq(keystorePassword), + eq(crlPath)); + verifyNoInteractions(hardwareKeyStoreWrapperProvider); + } +} diff --git a/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/pki/PkiBlockCreationConfigurationProviderTest.java b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/pki/PkiBlockCreationConfigurationProviderTest.java index e0b7ae219ec..c740d2825e0 100644 --- a/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/pki/PkiBlockCreationConfigurationProviderTest.java +++ b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/pki/PkiBlockCreationConfigurationProviderTest.java @@ -23,7 +23,6 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; -import org.hyperledger.besu.consensus.qbft.pki.PkiBlockCreationConfigurationProvider.KeyStoreWrapperProvider; import org.hyperledger.besu.pki.config.PkiKeyStoreConfiguration; import org.hyperledger.besu.pki.keystore.KeyStoreWrapper;