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