Skip to content

Commit

Permalink
Move check for $working_safe_ssl_conf to invocation layer (Simplify)
Browse files Browse the repository at this point in the history
Signed-off-by: Richard T Bonhomme <[email protected]>
  • Loading branch information
TinCanTech committed Dec 8, 2023
1 parent dcb19b2 commit 6b6568d
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions easyrsa3/easyrsa
Original file line number Diff line number Diff line change
Expand Up @@ -5288,13 +5288,6 @@ verify_working_env - secure-session failed"
# Verify selected algorithm and parameters
verify_algo_params

# Check $working_safe_ssl_conf, to build
# a fully configured safe ssl conf, on the
# next invocation of easyrsa_openssl()
if [ "$working_safe_ssl_conf" ]; then
die "working_safe_ssl_conf must not be set!"
fi

# Verify CA is initialised
if [ "$require_ca" ]; then
verify_ca_init
Expand Down Expand Up @@ -6030,8 +6023,16 @@ locate_support_files
# Verify SSL Lib - One time ONLY
verify_ssl_lib

# Check $working_safe_ssl_conf, to build
# a fully configured safe ssl conf, on the
# next invocation of easyrsa_openssl()
if [ "$working_safe_ssl_conf" ]; then
die "working_safe_ssl_conf must not be set!"
fi

# Establish PKI and CA initialisation requirements
# This avoids unnecessary warnings and notices
# Used by verify_working_env()
unset -v require_pki require_ca ignore_vars
case "$cmd" in
''|help|-h|--help|--usage| \
Expand Down

0 comments on commit 6b6568d

Please sign in to comment.