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

Replace '--verbose' mode with $EASYRSA_DUBUG

Browse Source 
$EASYRSA_DUBUG must be deliberately set outside of easyrsa.

'--verbose' mode was a bad hack.

$EASYRSA_DUBUG is also broken from the start but it is the simplest way
to verify what data is being fed to SSL.

Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
This commit is contained in:
Richard T Bonhomme 2022-04-22 22:49:57 +01:00
parent 867444b705
commit dea7ca4f40
No known key found for this signature in database
GPG Key ID: 2D767DB92FB6C246
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
easyrsa3/easyrsa
View File

@ -444,18 +444,29 @@ easyrsa_openssl() {
mv "$easyrsa_openssl_conf" "$EASYRSA_SAFE_CONF" || \ mv "$easyrsa_openssl_conf" "$EASYRSA_SAFE_CONF" || \
die "easyrsa_openssl - makesafeconf failed" die "easyrsa_openssl - makesafeconf failed"
else else
# Verbose log # !!!
[ "$EASYRSA_VERBOSE" ] && printf '%s\n' \ # this debug CANNOT be used in automated testing
"$EASYRSA_OPENSSL $openssl_command -config $easyrsa_openssl_conf $*" # to function correctly easyrsa_openssl()
# must ONLY output SSL layer output
# debug log
if [ "$EASYRSA_DEBUG" ]; then
printf '%s%s\n' "$EASYRSA_OPENSSL $openssl_command" \
"-config $easyrsa_openssl_conf $*"
fi
# Exec SSL with -config temp-file # Exec SSL with -config temp-file
"$EASYRSA_OPENSSL" "$openssl_command" \ "$EASYRSA_OPENSSL" "$openssl_command" \
-config "$easyrsa_openssl_conf" "$@" || return -config "$easyrsa_openssl_conf" "$@" || return
fi fi
else else
# Verbose log # !!!
[ "$EASYRSA_VERBOSE" ] && [ ! "$openssl_command" = rand ] \ # this debug CANNOT be used in automated testing
&& printf '%s\n' "$EASYRSA_OPENSSL $openssl_command $*" # to function correctly easyrsa_openssl()
# must ONLY output SSL layer output
# debug log
if [ "$EASYRSA_DEBUG" ] && [ ! "$openssl_command" = rand ]; then
printf '%s\n' "$EASYRSA_OPENSSL $openssl_command $*"
fi
# Exec SSL without -config temp-file # Exec SSL without -config temp-file
"$EASYRSA_OPENSSL" "$openssl_command" "$@" || return "$EASYRSA_OPENSSL" "$openssl_command" "$@" || return
@ -2965,9 +2976,6 @@ while :; do
empty_ok=1 empty_ok=1
export EASYRSA_SILENT=1 export EASYRSA_SILENT=1
export EASYRSA_BATCH=1 ;; export EASYRSA_BATCH=1 ;;
--verbose)
empty_ok=1
export EASYRSA_VERBOSE=1 ;;
--passin) --passin)
export EASYRSA_PASSIN="$val";; export EASYRSA_PASSIN="$val";;
--passout) --passout)