From 8c6948c4cca86a8f8c868dff2cb895e202f540e8 Mon Sep 17 00:00:00 2001 From: Richard T Bonhomme Date: Mon, 6 Mar 2023 01:13:52 +0000 Subject: [PATCH 1/2] Upgrade_23: Prioritise new PKI creation to allow temp file creation Signed-off-by: Richard T Bonhomme --- easyrsa3/easyrsa | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/easyrsa3/easyrsa b/easyrsa3/easyrsa index adf6afd..1841166 100755 --- a/easyrsa3/easyrsa +++ b/easyrsa3/easyrsa @@ -4898,7 +4898,7 @@ up23_verify_current_ca () then CURRENT_CA_IS_VERIFIED="partially" else - up23_fail_upgrade "CA certificate does not match vars file settings" + warn "CA certificate does not match vars file settings" fi opts="-certopt no_pubkey,no_sigdump" @@ -5156,14 +5156,14 @@ up23_do_upgrade_23 () up23_verbose "" up23_verify_new_pki + up23_create_new_pki + up23_create_openssl_cnf up23_verify_current_pki up23_verify_current_ca up23_backup_current_pki - up23_create_new_pki up23_upgrade_ca up23_move_easyrsa2_programs up23_build_v3_vars - up23_create_openssl_cnf if [ "$NOSAVE" -eq 0 ] then @@ -5734,6 +5734,7 @@ case "$cmd" in make_safe_ssl "$@" ;; upgrade) + secure_session up23_manage_upgrade_23 "$@" ;; ""|help|-h|--help|--usage) From e7c371e44a89e6a150976a9194cfadc18c71b288 Mon Sep 17 00:00:00 2001 From: Richard T Bonhomme Date: Mon, 6 Mar 2023 01:46:51 +0000 Subject: [PATCH 2/2] Upgrade-23: Remove unnecessary internal call to secure_session() Signed-off-by: Richard T Bonhomme --- easyrsa3/easyrsa | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/easyrsa3/easyrsa b/easyrsa3/easyrsa index 1841166..afdbb88 100755 --- a/easyrsa3/easyrsa +++ b/easyrsa3/easyrsa @@ -5024,11 +5024,11 @@ up23_create_openssl_cnf () # Create secure session # Because the upgrade runs twice, once as a test and then for real # secured_session must be cleared to avoid overload error - [ "$secured_session" ] && unset -v secured_session - up23_verbose "> Create secure session" - secure_session || die "up23_create_openssl_cnf - secure_session failed." - up23_verbose "> OK" - up23_verbose " secure session: $secured_session" + #[ "$secured_session" ] && unset -v secured_session + #up23_verbose "> Create secure session" + #secure_session || die "up23_create_openssl_cnf - secure_session failed." + #up23_verbose "> OK" + #up23_verbose " secure session: $secured_session" # Create $EASYRSA_PKI/safessl-easyrsa.cnf easyrsa_openssl makesafeconf