Commit 2d694028 authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev

We should use JKS truststore for Java instead PKCS12 as it does not need...

We should use JKS truststore for Java instead PKCS12 as it does not need trustStorePassword to be read
parent b92f3106
...@@ -491,10 +491,10 @@ for tempfile in ${TEMPDIR}/certs/*.tmp; do ...@@ -491,10 +491,10 @@ for tempfile in ${TEMPDIR}/certs/*.tmp; do
if test "${satrust}x" == "Cx"; then if test "${satrust}x" == "Cx"; then
# Java keystore # Java keystore
if test "${WITH_JAVA}" == "1"; then if test "${WITH_JAVA}" == "1"; then
"${KEYTOOL}" -import -noprompt -alias "${certname}" \ "${KEYTOOL}" -import -noprompt -alias "${certname}" \
-keystore "${TEMPDIR}/ssl/java/cacerts" \ -keystore "${TEMPDIR}/ssl/java/cacerts" \
-storepass 'changeit' -file tempfile.crt \ -storepass 'changeit' -storetype JKS \
2>&1> /dev/null | \ -file tempfile.crt 2>&1> /dev/null | \
sed -e 's@Certificate was a@A@' -e 's@keystore@Java keystore.@' sed -e 's@Certificate was a@A@' -e 's@keystore@Java keystore.@'
fi fi
...@@ -685,9 +685,10 @@ if test -d "${LOCALDIR}"; then ...@@ -685,9 +685,10 @@ if test -d "${LOCALDIR}"; then
# Install in Java keystore # Install in Java keystore
if test "${WITH_JAVA}" == "1" -a "${satrust}x" == "Cx"; then if test "${WITH_JAVA}" == "1" -a "${satrust}x" == "Cx"; then
"${KEYTOOL}" -import -noprompt -alias "${certname}" \ "${KEYTOOL}" -import -noprompt -alias "${certname}" \
-keystore "${DESTDIR}${KEYSTORE}" \ -keystore "${DESTDIR}${KEYSTORE}" \
-storepass 'changeit' -file "${cert}" 2>&1> /dev/null | \ -storepass 'changeit' -storetype JKS \
-file "${cert}" 2>&1> /dev/null | \
sed -e 's@Certificate was a@A@' -e 's@keystore@Java keystore.@' sed -e 's@Certificate was a@A@' -e 's@keystore@Java keystore.@'
fi fi
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment