diff --git a/CHANGELOG b/CHANGELOG index 89aac72..26922a6 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -8,6 +8,7 @@ and generate a trusted certificate for use in LOCALDIR - Add nss-{server,email}-distrust-after values in anchors - Use --filter=certificates for all stores + - Fix output of NSSDB and Java PCKS#12 stores 1.7 - Revert help2man update (requires complete perl environment) 1.6 - Fix install target for make -j# - Add detailed dependency info and add note about configuration file diff --git a/make-ca b/make-ca index f08b66d..b4dc4e2 100644 --- a/make-ca +++ b/make-ca @@ -536,7 +536,7 @@ function write_nss_db() { "${CERTUTIL}" -d "sql:${1}" -A \ -t "${satrust},${smtrust},${cstrust}" \ - -n "${p11label}" -i "${2}" + -n "${p11label}" -i "${2}" > /dev/null 2>&1 echo "Added to NSS shared DB with trust '${satrust},${smtrust},${cstrust}'." } @@ -571,10 +571,8 @@ function write_java_p12() { "${KEYTOOL}" -importcert -file "${2}" -storetype PKCS12 \ -noprompt -alias "${p11label}" -storepass 'changeit' \ -keystore "${1}" $EKUVAL \ - > /dev/null 2>&1 | \ - sed -e "s@Certificate was a@A@" \ - -e 's@keystore@Java cacerts (PKCS#12) with trust '${satrust},${smtrust},${cstrust}'.@' \ - | sed 's@p@@' + > /dev/null 2>&1 + echo "Added to Java cacerts (PKCS#12) with trust '${satrust},${smtrust},${cstrust}'." unset EKU unset EKUVAL fi @@ -590,7 +588,6 @@ mkdir -p "${TEMPDIR}"/{certs,pki/anchors,work} if test "${WITH_P12}" -eq "1"; then test ! -x "${KEYTOOL}" && \ echo "Java keytool not found at ${KEYTOOL}. Exiting..." && exit 1 -else mkdir -p "${TEMPDIR}/ssl/java" fi @@ -766,7 +763,7 @@ fi if test "${WITH_P12}" == "1"; then test -f "${DESTDIR}${KEYSTORE}/cacerts.p12" && rm -f "${DESTDIR}${KEYSTORE}/cacerts.p12" - install -dm644 "${TEMPDIR}/ssl/java/cacerts.p12" \ + install -vm644 "${TEMPDIR}/ssl/java/cacerts.p12" \ "${DESTDIR}${KEYSTORE}/cacerts.p12" fi