Merge branch 'stable-5.1' into stable-5.2
* stable-5.1: [test] Create keystore with the keytool of the running JDK Change-Id: Ic56f4f23c37432377be88e07d06c5ad75591d84f Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
This commit is contained in:
commit
4322dd26a3
|
@ -214,9 +214,12 @@ private SslContextFactory createTestSslContextFactory(String hostName) {
|
|||
tmpDir.deleteOnExit();
|
||||
makePrivate(tmpDir);
|
||||
File keyStore = new File(tmpDir, "keystore.jks");
|
||||
File keytool = new File(
|
||||
new File(new File(System.getProperty("java.home")), "bin"),
|
||||
"keytool");
|
||||
Runtime.getRuntime().exec(
|
||||
new String[] {
|
||||
"keytool", //
|
||||
keytool.getAbsolutePath(), //
|
||||
"-keystore", keyStore.getAbsolutePath(), //
|
||||
"-storepass", keyPassword,
|
||||
"-alias", hostName, //
|
||||
|
|
Loading…
Reference in New Issue