nik/easyrsa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'renew_fixes' of https://github.com/xavierba/easy-rsa into xavierba-renew_fixes

Browse Source
This commit is contained in:
Eric F Crist 2019-01-28 19:54:46 -06:00
commit 044d2220e7
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
easyrsa3/easyrsa
View File

@ -959,7 +959,7 @@ input in file: $req_in"
# get file extension # get file extension
file_ext="${file##*.}" file_ext="${file##*.}"
mv "$file" "$EASYRSA_PKI/revoked/private_by_serial/$cert_serial.$file_ext" [ -f "$file" ] && mv "$file" "$EASYRSA_PKI/revoked/private_by_serial/$cert_serial.$file_ext"
done done
# remove the dublicate certificate in the certs_by_serial folder # remove the dublicate certificate in the certs_by_serial folder
@ -1006,20 +1006,20 @@ at: $crt_in"
# Check if old cert is expired or expires within 30 days # Check if old cert is expired or expires within 30 days
expire_date=$( expire_date=$(
"$EASYRSA_OPENSSL" x509 -in "$crt_in" -noout -enddate | "$EASYRSA_OPENSSL" x509 -in "$crt_in" -noout -enddate |
sed -n 's/^notAfter=//' sed 's/^notAfter=//'
) )
expire_date=$(date -d "$expire_date" +%s) expire_date=$(date -d "$expire_date" +%s)
allow_renew_date=$(date -d '+30day' +%s) allow_renew_date=$(date -d "+${EASYRSA_CERT_RENEW}day" +%s)
[ "$expire_date" -gt "$allow_renew_date" ] || die "\ [ "$expire_date" -lt "$allow_renew_date" ] || die "\
Certificate expires in more than 30 days. Certificate expires in more than $EASYRSA_CERT_RENEW days.
Renewal not allowed." Renewal not allowed."
# Extract certificate usage from old cert # Extract certificate usage from old cert
cert_ext_key_usage=$( cert_ext_key_usage=$(
"$EASYRSA_OPENSSL" x509 -in "$crt_in" -noout -ext extendedKeyUsage | "$EASYRSA_OPENSSL" x509 -in "$crt_in" -noout -text |
sed -n "2p;n;s/^ *//;p;" sed -n "/X509v3 Extended Key Usage:/{n;s/^ *//g;p;}"
) )
case $cert_ext_key_usage in case $cert_ext_key_usage in
"TLS Web Client Authentication") "TLS Web Client Authentication")
@ -1037,10 +1037,10 @@ Renewal not allowed."
echo "$EASYRSA_EXTRA_EXTS" | grep -q subjectAltName || \ echo "$EASYRSA_EXTRA_EXTS" | grep -q subjectAltName || \
{ {
san=$( san=$(
"$EASYRSA_OPENSSL" x509 -in "$crt_in" -noout -ext subjectAltName | "$EASYRSA_OPENSSL" x509 -in "$crt_in" -noout -text |
sed -n "2p;{n;s/ //g;p;}" sed -n "/X509v3 Subject Alternative Name:/{n;s/ //g;p;}"
) )
export EASYRSA_EXTRA_EXTS="\ [ -n "$san" ] && export EASYRSA_EXTRA_EXTS="\
$EASYRSA_EXTRA_EXTS $EASYRSA_EXTRA_EXTS
subjectAltName = $san" subjectAltName = $san"
} }
@ -1113,7 +1113,7 @@ input in file: $req_in"
# get file extension # get file extension
file_ext="${file##*.}" file_ext="${file##*.}"
mv "$file" "$EASYRSA_PKI/renewed/private_by_serial/$cert_serial.$file_ext" [ -f "$file" ] && mv "$file" "$EASYRSA_PKI/renewed/private_by_serial/$cert_serial.$file_ext"
done done
# remove the duplicate certificate in the certs_by_serial folder # remove the duplicate certificate in the certs_by_serial folder
@ -1488,6 +1488,7 @@ Note: using Easy-RSA configuration from: $vars"
set_var EASYRSA_EC_DIR "$EASYRSA_PKI/ecparams" set_var EASYRSA_EC_DIR "$EASYRSA_PKI/ecparams"
set_var EASYRSA_CA_EXPIRE 3650 set_var EASYRSA_CA_EXPIRE 3650
set_var EASYRSA_CERT_EXPIRE 1080 # new default of 36 months set_var EASYRSA_CERT_EXPIRE 1080 # new default of 36 months
set_var EASYRSA_CERT_RENEW 30
set_var EASYRSA_CRL_DAYS 180 set_var EASYRSA_CRL_DAYS 180
set_var EASYRSA_NS_SUPPORT no set_var EASYRSA_NS_SUPPORT no
set_var EASYRSA_NS_COMMENT "Easy-RSA (~VER~) Generated Certificate" set_var EASYRSA_NS_COMMENT "Easy-RSA (~VER~) Generated Certificate"

4
easyrsa3/vars.example
View File

@ -127,6 +127,10 @@ fi
# parsed after this timeframe passes. It is only used for an expected next # parsed after this timeframe passes. It is only used for an expected next
# publication date. # publication date.
# How many days before its expiration date a certificate is allowed to be
# renewed?
#set_var EASYRSA_CERT_RENEW 30
#set_var EASYRSA_CRL_DAYS 180 #set_var EASYRSA_CRL_DAYS 180
# Support deprecated "Netscape" extensions? (choices "yes" or "no".) The default # Support deprecated "Netscape" extensions? (choices "yes" or "no".) The default