Updated Java keys for cross-platform tests
The truststore and keystore were regenerated using keys in test/keys:
# keytool does not support "replace" operation:
keytool -delete \
-alias localhost \
-keystore lib/java/src/crossTest/resources/.truststore \
-storepass thrift
keytool -import \
-alias localhost \
-file test/keys/CA.pem \
-keystore lib/java/src/crossTest/resources/.truststore \
-storepass thrift
# server keystore
keytool -importkeystore \
-srckeystore test/keys/server.p12 \
-srcstoretype PKCS12 \
-srcstorepass thrift \
-destkeystore lib/java/src/crossTest/resources/.serverkeystore \
-deststoretype pkcs12 \
-deststorepass thrift
# client keystore
keytool -importkeystore \
-srckeystore test/keys/client.p12 \
-srcstoretype PKCS12 \
-srcstorepass thrift \
-destkeystore lib/java/src/crossTest/resources/.clientkeystore \
-deststoretype pkcs12 \
-deststorepass thrift
Java tests were updated to use separate keystores for client and server.
diff --git a/lib/java/gradle/unitTests.gradle b/lib/java/gradle/unitTests.gradle
index 6f63956..24affad 100644
--- a/lib/java/gradle/unitTests.gradle
+++ b/lib/java/gradle/unitTests.gradle
@@ -82,7 +82,7 @@
'test.port': "${testPort}",
'javax.net.ssl.trustStore': "${projectDir}/src/crossTest/resources/.truststore",
'javax.net.ssl.trustStorePassword': 'thrift',
- 'javax.net.ssl.keyStore': "${projectDir}/src/crossTest/resources/.keystore",
+ 'javax.net.ssl.keyStore': "${projectDir}/src/crossTest/resources/.serverkeystore",
'javax.net.ssl.keyStorePassword': 'thrift'
]
}