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

ff_date_to_cert_date(): Return cert_type_date via safe_set_var()

Browse Source 
Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
This commit is contained in:
Richard T Bonhomme 2023-01-15 21:53:26 +00:00
parent 159aa15cd4
commit 587ba1aa41
No known key found for this signature in database
GPG Key ID: 2D767DB92FB6C246
1 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
easyrsa3/easyrsa
View File

@ -3830,35 +3830,41 @@ offset_days_to_cert_date \
# Convert fixed format date to X509 certificate style date # Convert fixed format date to X509 certificate style date
ff_date_to_cert_date() { ff_date_to_cert_date() {
# check input
[ "$#" -eq 2 ] || die "\
ff_date_to_cert_date - input error"
in_date="$1" in_date="$1"
# busybox # busybox
if busybox date --help > /dev/null 2>&1 if busybox date --help > /dev/null 2>&1
then then
cert_type_date="$( out_date="$(
busybox date -u -D "%y-%m-%d %H:%M:%S%Z" \ busybox date -u \
-d "$in_date" \ -D "%y-%m-%d %H:%M:%S%Z" \
"+%b %d %H:%M:%S %Y %Z" 2>/dev/null -d "$in_date" "+%b %d %H:%M:%S %Y %Z" \
)" 2>/dev/null
return )" || die "\
ff_date_to_cert_date - out_date - busybox"
# Darwin, BSD # Darwin, BSD
elif cert_type_date="$( elif out_date="$(
date -u -j -f '%y-%m-%d %TZ' "$in_date" \ date -u -j -f '%y-%m-%d %TZ' \
"+%b %d %H:%M:%S %Y %Z" 2>/dev/null "$in_date" "+%b %d %H:%M:%S %Y %Z" \
2>/dev/null
)" )"
then return then : # ok
# OS dependencies # OS dependencies
# Linux and Windows # Linux and Windows
# * date.exe does not support format +%s as input # * date.exe does not support format +%s as input
# MacPorts GNU date # MacPorts GNU date
elif cert_type_date="$( elif out_date="$(
date -u -d "$in_date" \ date -u -d "$in_date" \
"+%b %d %H:%M:%S %Y %Z" 2>/dev/null "+%b %d %H:%M:%S %Y %Z" \
2>/dev/null
)" )"
then return then : # ok
# Something else # Something else
else else
@ -3866,6 +3872,13 @@ ff_date_to_cert_date() {
ff_date_to_cert_date: ff_date_to_cert_date:
'date' failed for 'in_date': $in_date" 'date' failed for 'in_date': $in_date"
fi fi
# Return offset_date
safe_set_var "$2" "$out_date" || die "\
ff_date_to_cert_date \
- safe_set_var - $2 - $out_date"
unset -v in_date out_date
} # => ff_date_to_cert_date() } # => ff_date_to_cert_date()
# Fixed format date # Fixed format date
@ -4070,7 +4083,8 @@ serial mismatch:
# Translate db date to usable date # Translate db date to usable date
#cert_source=database #cert_source=database
db_date_to_ff_date "$db_notAfter" # Assigns ff_date db_date_to_ff_date "$db_notAfter" # Assigns ff_date
ff_date_to_cert_date "$ff_date" # Assigns cert_type_date cert_type_date=
ff_date_to_cert_date "$ff_date" cert_type_date
# Use db translated date # Use db translated date
cert_not_after_date="$cert_type_date" cert_not_after_date="$cert_type_date"
fi fi
@ -4115,7 +4129,8 @@ revoke_status() {
# Translate db date to usable date # Translate db date to usable date
#source_date=database #source_date=database
db_date_to_ff_date "$db_revoke_date" # Assigns ff_date db_date_to_ff_date "$db_revoke_date" # Assigns ff_date
ff_date_to_cert_date "$ff_date" # Assigns cert_type_date cert_type_date=
ff_date_to_cert_date "$ff_date" cert_type_date
# Use db translated date # Use db translated date
cert_revoke_date="$cert_type_date" cert_revoke_date="$cert_type_date"