Skip to content

Commit

Permalink
show-expire: Calculate certificate expire seconds from Database date
Browse files Browse the repository at this point in the history
When a certificate CN is not the same as the file-name then show-expire
must calculate the expiry date, in seconds, from the database field.

This is done by functions:
* db_date_to_iso_8601_date()
  Translate from database format to ISO_8601 date format.
* iso_8601_timestamp_to_seconds()
  Translate from ISO_86012 date format to time-stamp in seconds.

Signed-off-by: Richard T Bonhomme <[email protected]>
  • Loading branch information
TinCanTech committed Sep 17, 2023
1 parent 51f55d9 commit fde4454
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion easyrsa3/easyrsa
Original file line number Diff line number Diff line change
Expand Up @@ -4834,6 +4834,7 @@ db_date_to_iso_8601_date - input error"

# Assign iso_8601 date
out_date="${yyyy}-${mm}-${dd} ${HH}:${MM}:${SS}${TZ}"
verbose "db_date_to_iso_8601_date: out_date=$out_date"

# Return out_date
force_set_var "$2" "$out_date" || die "\
Expand Down Expand Up @@ -5086,10 +5087,14 @@ expire_status: FALL-BACK completed"

else
verbose "expire_status: cert does NOT exist"
# Translate db date to usable date
# Translate db date to 8601_date
cert_not_after_date=
db_date_to_iso_8601_date \
"$db_notAfter" cert_not_after_date

# Translate 8601_date to time-stamp-seconds
iso_8601_timestamp_to_seconds \
"$cert_not_after_date" cert_expire_date_s
# Cert does not exist
fi

Expand Down

0 comments on commit fde4454

Please sign in to comment.