emo/make-ca
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor logic fixes

Browse Source
This commit is contained in:
DJ Lucas 2018-09-04 22:41:01 -05:00
parent 98c0193bb5
commit 600de222bd
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
make-ca
View File

@ -699,10 +699,9 @@ fi
# Install Java cacerts.p12 in ${KEYSTORE} # Install Java cacerts.p12 in ${KEYSTORE}
if test "${WITH_P12}" == "1"; then if test "${WITH_P12}" == "1"; then
test -f "${DESTDIR}${KEYSTORE}/cacerts.p12" && test -f "${DESTDIR}${KEYSTORE}.p12" &&
rm -f "${DESTDIR}${KEYSTORE}/cacerts.p12" rm -f "${DESTDIR}${KEYSTORE}.p12"
install -dm755 "${DESTDIR}${KEYSTORE}" install -dm644 "${TEMPDIR}/ssl/java/cacerts.p12" "${DESTDIR}${KEYSTORE}.p12"
install -m644 "${TEMPDIR}/ssl/java/cacerts.p12" "${DESTDIR}${KEYSTORE}"
fi fi
# Import any certs in $LOCALDIR # Import any certs in $LOCALDIR
@ -879,7 +878,7 @@ if test "x${DESTDIR}" == "x"; then
"${TRUST}" extract --filter=certificates --format=openssl-directory \ "${TRUST}" extract --filter=certificates --format=openssl-directory \
--overwrite --comment "${CERTDIR}" \ --overwrite --comment "${CERTDIR}" \
&& echo "Done!" || echo "Failed!!!" && echo "Done!" || echo "Failed!!!"
echo -n "Extracting GNUTLS sever auth certificates to ${CABUNDLE}..." echo -n "Extracting GNUTLS server auth certificates to ${CABUNDLE}..."
"${TRUST}" extract --filter=ca-anchors --format=pem-bundle \ "${TRUST}" extract --filter=ca-anchors --format=pem-bundle \
--purpose server-auth --overwrite --comment "${CABUNDLE}" \ --purpose server-auth --overwrite --comment "${CABUNDLE}" \
&& echo "Done!" || echo "Failed!!!" && echo "Done!" || echo "Failed!!!"