mirror of
https://github.com/dehydrated-io/dehydrated.git
synced 2026-03-12 21:25:13 +01:00
use temporary file for DER->PEM conversion (fixes #279)
This commit is contained in:
21
dehydrated
21
dehydrated
@@ -621,9 +621,13 @@ sign_domain() {
|
||||
# Create fullchain.pem
|
||||
echo " + Creating fullchain.pem..."
|
||||
cat "${crt_path}" > "${CERTDIR}/${domain}/fullchain-${timestamp}.pem"
|
||||
http_request get "$(openssl x509 -in "${CERTDIR}/${domain}/cert-${timestamp}.pem" -noout -text | grep 'CA Issuers - URI:' | cut -d':' -f2-)" > "${CERTDIR}/${domain}/chain-${timestamp}.pem"
|
||||
if ! grep -q "BEGIN CERTIFICATE" "${CERTDIR}/${domain}/chain-${timestamp}.pem"; then
|
||||
openssl x509 -in "${CERTDIR}/${domain}/chain-${timestamp}.pem" -inform DER -out "${CERTDIR}/${domain}/chain-${timestamp}.pem" -outform PEM
|
||||
tmpchain="$(_mktemp)"
|
||||
http_request get "$(openssl x509 -in "${CERTDIR}/${domain}/cert-${timestamp}.pem" -noout -text | grep 'CA Issuers - URI:' | cut -d':' -f2-)" > "${tmpchain}"
|
||||
if grep -q "BEGIN CERTIFICATE" "${tmpchain}"; then
|
||||
mv "${tmpchain}" "${CERTDIR}/${domain}/chain-${timestamp}.pem"
|
||||
else
|
||||
openssl x509 -in "${tmpchain}" -inform DER -out "${CERTDIR}/${domain}/chain-${timestamp}.pem" -outform PEM
|
||||
rm "${tmpchain}"
|
||||
fi
|
||||
cat "${CERTDIR}/${domain}/chain-${timestamp}.pem" >> "${CERTDIR}/${domain}/fullchain-${timestamp}.pem"
|
||||
|
||||
@@ -797,10 +801,13 @@ command_sign_csr() {
|
||||
if [ -n "${PARAM_FULL_CHAIN:-}" ]; then
|
||||
# get and convert ca cert
|
||||
chainfile="$(_mktemp)"
|
||||
http_request get "$(openssl x509 -in "${certfile}" -noout -text | grep 'CA Issuers - URI:' | cut -d':' -f2-)" > "${chainfile}"
|
||||
|
||||
if ! grep -q "BEGIN CERTIFICATE" "${chainfile}"; then
|
||||
openssl x509 -inform DER -in "${chainfile}" -outform PEM -out "${chainfile}"
|
||||
tmpchain="$(_mktemp)"
|
||||
http_request get "$(openssl x509 -in "${certfile}" -noout -text | grep 'CA Issuers - URI:' | cut -d':' -f2-)" > "${tmpchain}"
|
||||
if grep -q "BEGIN CERTIFICATE" "${tmpchain}"; then
|
||||
mv "${tmpchain}" "${chainfile}"
|
||||
else
|
||||
openssl x509 -in "${tmpchain}" -inform DER -out "${chainfile}" -outform PEM
|
||||
rm "${tmpchain}"
|
||||
fi
|
||||
|
||||
echo "# CHAIN #" >&3
|
||||
|
||||
Reference in New Issue
Block a user