Using only non-obfuscated passwords in tests.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
This commit is contained in:
Simone Bordet 2020-01-30 18:47:37 +01:00
parent 4b9fec0cf3
commit 8bd1a7f5bc
4 changed files with 5 additions and 11 deletions

View File

@ -81,7 +81,7 @@ public class ConscryptHTTP2ServerTest
Path path = Paths.get("src", "test", "resources"); Path path = Paths.get("src", "test", "resources");
File keys = path.resolve("keystore.p12").toFile(); File keys = path.resolve("keystore.p12").toFile();
sslContextFactory.setKeyStorePath(keys.getAbsolutePath()); sslContextFactory.setKeyStorePath(keys.getAbsolutePath());
sslContextFactory.setKeyStorePassword("OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"); sslContextFactory.setKeyStorePassword("storepwd");
sslContextFactory.setProvider("Conscrypt"); sslContextFactory.setProvider("Conscrypt");
if (JavaVersion.VERSION.getPlatform() < 9) if (JavaVersion.VERSION.getPlatform() < 9)
{ {

View File

@ -140,9 +140,7 @@ public class TestJettyOSGiBootHTTP2Conscrypt
ClientConnector clientConnector = new ClientConnector(); ClientConnector clientConnector = new ClientConnector();
SslContextFactory.Client sslContextFactory = new SslContextFactory.Client(); SslContextFactory.Client sslContextFactory = new SslContextFactory.Client();
sslContextFactory.setKeyStorePath(keys.getAbsolutePath()); sslContextFactory.setKeyStorePath(keys.getAbsolutePath());
sslContextFactory.setKeyStorePassword("OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"); sslContextFactory.setKeyStorePassword("storepwd");
sslContextFactory.setTrustStorePath(keys.getAbsolutePath());
sslContextFactory.setTrustStorePassword("OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4");
sslContextFactory.setProvider("Conscrypt"); sslContextFactory.setProvider("Conscrypt");
sslContextFactory.setEndpointIdentificationAlgorithm(null); sslContextFactory.setEndpointIdentificationAlgorithm(null);
if (JavaVersion.VERSION.getPlatform() < 9) if (JavaVersion.VERSION.getPlatform() < 9)

View File

@ -134,9 +134,7 @@ public class TestJettyOSGiBootHTTP2JDK9
ClientConnector clientConnector = new ClientConnector(); ClientConnector clientConnector = new ClientConnector();
SslContextFactory.Client sslContextFactory = new SslContextFactory.Client(); SslContextFactory.Client sslContextFactory = new SslContextFactory.Client();
sslContextFactory.setKeyStorePath(keys.getAbsolutePath()); sslContextFactory.setKeyStorePath(keys.getAbsolutePath());
sslContextFactory.setKeyStorePassword("OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"); sslContextFactory.setKeyStorePassword("storepwd");
sslContextFactory.setTrustStorePath(keys.getAbsolutePath());
sslContextFactory.setTrustStorePassword("OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4");
sslContextFactory.setEndpointIdentificationAlgorithm(null); sslContextFactory.setEndpointIdentificationAlgorithm(null);
clientConnector.setSslContextFactory(sslContextFactory); clientConnector.setSslContextFactory(sslContextFactory);
http2Client = new HTTP2Client(clientConnector); http2Client = new HTTP2Client(clientConnector);

View File

@ -80,10 +80,8 @@ public class TestTransparentProxyServer
// SSL configurations // SSL configurations
SslContextFactory.Server sslContextFactory = new SslContextFactory.Server(); SslContextFactory.Server sslContextFactory = new SslContextFactory.Server();
sslContextFactory.setKeyStorePath(jettyRoot + "/jetty-server/src/main/config/modules/test-keystore/keystore.p12"); sslContextFactory.setKeyStorePath(jettyRoot + "/jetty-server/src/main/config/modules/test-keystore/test-keystore.p12");
sslContextFactory.setKeyStorePassword("OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"); sslContextFactory.setKeyStorePassword("storepwd");
sslContextFactory.setTrustStorePath(jettyRoot + "/jetty-server/src/main/config/modules/test-keystore/keystore.p12");
sslContextFactory.setTrustStorePassword("OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4");
sslContextFactory.setExcludeCipherSuites( sslContextFactory.setExcludeCipherSuites(
"SSL_RSA_WITH_DES_CBC_SHA", "SSL_RSA_WITH_DES_CBC_SHA",
"SSL_DHE_RSA_WITH_DES_CBC_SHA", "SSL_DHE_RSA_WITH_DES_CBC_SHA",