Skip to content

GitLab

C
cacerts
Commit c0fef01e authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev
Browse files
Options

Merge branch 'master' of https://git.iszf.irk.ru/certo/cacerts

parents a2d75a36 2d694028
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 7 deletions
make-ca.sh-20170514
View file @ c0fef01e
...@@ -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