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

make-ca.sh-20170514

@@ -493,8 +493,8 @@ for tempfile in ${TEMPDIR}/certs/*.tmp; do
     if test "${WITH_JAVA}" == "1"; then
       "${KEYTOOL}" -import -noprompt -alias "${certname}"  \
                    -keystore "${TEMPDIR}/ssl/java/cacerts" \
-                   -storepass 'changeit' -file tempfile.crt \
-      2>&1> /dev/null | \
+                   -storepass 'changeit' -storetype JKS    \
+                   -file tempfile.crt 2>&1> /dev/null |    \
       sed -e 's@Certificate was a@A@' -e 's@keystore@Java keystore.@'
     fi
 
@@ -687,7 +687,8 @@ if test -d "${LOCALDIR}"; then
     if test "${WITH_JAVA}" == "1" -a "${satrust}x" == "Cx"; then
       "${KEYTOOL}" -import -noprompt -alias "${certname}" \
                    -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.@'
     fi