Skip to content

Commit acbe21c

Browse files
committed
easyrsa-tools.lib, show-expire: Use $openssl_v3 flag to choose SSL lib
Signed-off-by: Richard T Bonhomme <[email protected]>
1 parent 808b014 commit acbe21c

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

dev/easyrsa-tools.lib

+8-7
Original file line numberDiff line numberDiff line change
@@ -553,15 +553,16 @@ expire_status_v2() {
553553
if [ -f "$1" ]; then
554554
verbose "expire_status: cert exists"
555555

556+
# Check if cert will be valid else print details
556557
if will_cert_be_valid "$1" "$pre_expire_window_s"
557558
then
558-
: # cert will still be valid by expiry window
559+
verbose "cert will still be valid by expiry window"
559560
else
560-
# cert will expire
561-
# ISO8601 date - OpenSSL v3 only
562-
if ! iso_8601_cert_enddate "$1" cert_not_after_date \
563-
2>/dev/null
564-
then
561+
# cert expiry date
562+
if [ "$openssl_v3" ]; then
563+
# ISO8601 date - OpenSSL v3 only
564+
iso_8601_cert_enddate "$1" cert_not_after_date
565+
else
565566
# Standard date - OpenSSL v1
566567
ssl_cert_not_after_date "$1" cert_not_after_date
567568
fi
@@ -572,7 +573,7 @@ expire_status_v2() {
572573
"$cert_not_after_date | CN: $db_cn"
573574
fi
574575
else
575-
: # issued cert does not exist, ignore other certs
576+
verbose "issued cert does not exist, ignore other certs"
576577
fi
577578
} # => expire_status_v2()
578579

0 commit comments

Comments
 (0)