From 7b6a4e167f8ee44b618633cda528fe57442cbcba Mon Sep 17 00:00:00 2001 From: Richard T Bonhomme Date: Wed, 29 May 2024 13:18:14 +0100 Subject: [PATCH 1/2] easyrsa-tools.lib: Add 'locate_support-files' to recreate temp-session Signed-off-by: Richard T Bonhomme --- dev/easyrsa-tools.lib | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dev/easyrsa-tools.lib b/dev/easyrsa-tools.lib index 6addac4a8..85b5f2bb3 100644 --- a/dev/easyrsa-tools.lib +++ b/dev/easyrsa-tools.lib @@ -1,3 +1,5 @@ +#!/bin/sh + # Easy-RSA tools library v1.0 # Easy-RSA 3.x does not source into the environment directly. @@ -489,6 +491,7 @@ read_db() { # Recreate temp session remove_secure_session || \ die "read_db - remove_secure_session" + locate_support_files secure_session || \ die "read_db - secure_session" # Recreate openssl-easyrsa.cnf (Temp) From 9499f09c1662e5a5c68ed0b20f7cbbd9a3ae58a8 Mon Sep 17 00:00:00 2001 From: Richard T Bonhomme Date: Wed, 29 May 2024 18:48:26 +0100 Subject: [PATCH 2/2] easyrsa-tools.lib: iso_8601_cert_enddate(), disable --verbose for subshell Signed-off-by: Richard T Bonhomme --- dev/easyrsa-tools.lib | 1 + 1 file changed, 1 insertion(+) diff --git a/dev/easyrsa-tools.lib b/dev/easyrsa-tools.lib index 85b5f2bb3..b632f9bd2 100644 --- a/dev/easyrsa-tools.lib +++ b/dev/easyrsa-tools.lib @@ -92,6 +92,7 @@ iso_8601_cert_enddate: missing cert" # On error return, let the caller decide what to do if fn_ssl_out="$( + EASYRSA_VERBOSE= easyrsa_openssl x509 -in "$1" -noout \ -enddate -dateopt iso_8601 )"