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

Merge branch 'TinCanTech-fix-show-expire-cn-fname-mismatch'

Browse Source 
Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
This commit is contained in:
Richard T Bonhomme 2023-09-17 17:23:46 +01:00
commit ced2bc9190
No known key found for this signature in database
GPG Key ID: 2D767DB92FB6C246
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,7 +1,8 @@
Easy-RSA 3 ChangeLog Easy-RSA 3 ChangeLog
3.2.0 (TBD) 3.2.0 (TBD)
* Forbid "default vars in the default PKI" for all commands #1021 * show-expire: Calculate cert. expire seconds from DB date (#1023)
* Forbid "default vars in the default PKI" for all commands (#1021)
There can be only one default vars file, that is now './vars' ONLY. There can be only one default vars file, that is now './vars' ONLY.
Use of other 'vars' files can be done by using option --vars=<FILE> Use of other 'vars' files can be done by using option --vars=<FILE>
* Update OpenSSL to 3.1.2 * Update OpenSSL to 3.1.2

7
easyrsa3/easyrsa
View File

@ -4834,6 +4834,7 @@ db_date_to_iso_8601_date - input error"
# Assign iso_8601 date # Assign iso_8601 date
out_date="${yyyy}-${mm}-${dd} ${HH}:${MM}:${SS}${TZ}" out_date="${yyyy}-${mm}-${dd} ${HH}:${MM}:${SS}${TZ}"
verbose "db_date_to_iso_8601_date: out_date=$out_date"
# Return out_date # Return out_date
force_set_var "$2" "$out_date" || die "\ force_set_var "$2" "$out_date" || die "\
@ -5086,10 +5087,14 @@ expire_status: FALL-BACK completed"
else else
verbose "expire_status: cert does NOT exist" verbose "expire_status: cert does NOT exist"
# Translate db date to usable date # Translate db date to 8601_date
cert_not_after_date= cert_not_after_date=
db_date_to_iso_8601_date \ db_date_to_iso_8601_date \
"$db_notAfter" cert_not_after_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 # Cert does not exist
fi fi