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

Merge branch 'TinCanTech-remove-debug'

Browse Source 
Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
This commit is contained in:
Richard T Bonhomme 2023-02-04 19:54:12 +00:00
commit 11e66f3dfb
No known key found for this signature in database
GPG Key ID: 2D767DB92FB6C246
1 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
easyrsa3/easyrsa
View File

@ -893,25 +893,13 @@ easyrsa_openssl() {
die "easyrsa_openssl - makesafeconf failed" die "easyrsa_openssl - makesafeconf failed"
elif [ "$has_config" ]; then elif [ "$has_config" ]; then
# debug log on
if [ "$EASYRSA_DEBUG" ]; then print "<< DEBUG-ON >>"; set -x; fi
# Exec SSL with -config temp-file # Exec SSL with -config temp-file
"$EASYRSA_OPENSSL" "$openssl_command" \ "$EASYRSA_OPENSSL" "$openssl_command" \
-config "$easyrsa_safe_ssl_conf" "$@" || return -config "$easyrsa_safe_ssl_conf" "$@" || return
# debug log off
if [ "$EASYRSA_DEBUG" ]; then set +x; print ">> DEBUG-OFF <<"; fi
else else
# debug log on
if [ "$EASYRSA_DEBUG" ]; then print "<< DEBUG-ON >>"; set -x; fi
# Exec SSL without -config temp-file # Exec SSL without -config temp-file
"$EASYRSA_OPENSSL" "$openssl_command" "$@" || return "$EASYRSA_OPENSSL" "$openssl_command" "$@" || return
# debug log off
if [ "$EASYRSA_DEBUG" ]; then set +x; print ">> DEBUG-OFF <<"; fi
fi fi
} # => easyrsa_openssl() } # => easyrsa_openssl()
@ -3996,7 +3984,6 @@ ssl_cert_serial() {
[ -f "$1" ] || die "ssl_cert_serial - missing cert" [ -f "$1" ] || die "ssl_cert_serial - missing cert"
fn_ssl_out="$( fn_ssl_out="$(
unset -v EASYRSA_DEBUG
easyrsa_openssl x509 -in "$1" -noout -serial easyrsa_openssl x509 -in "$1" -noout -serial
)" || die "ssl_cert_serial - failed: -serial" )" || die "ssl_cert_serial - failed: -serial"
# remove the serial= part -> we only need the XXXX part # remove the serial= part -> we only need the XXXX part
@ -4016,7 +4003,6 @@ ssl_cert_not_before_date - invalid input"
ssl_cert_not_before_date - missing cert" ssl_cert_not_before_date - missing cert"
fn_ssl_out="$( fn_ssl_out="$(
unset -v EASYRSA_DEBUG
easyrsa_openssl x509 -in "$1" -noout -startdate easyrsa_openssl x509 -in "$1" -noout -startdate
)" || die "\ )" || die "\
ssl_cert_not_before_date - failed: -startdate" ssl_cert_not_before_date - failed: -startdate"
@ -4037,7 +4023,6 @@ ssl_cert_not_after_date - invalid input"
ssl_cert_not_after_date - missing cert" ssl_cert_not_after_date - missing cert"
fn_ssl_out="$( fn_ssl_out="$(
unset -v EASYRSA_DEBUG
easyrsa_openssl x509 -in "$1" -noout -enddate easyrsa_openssl x509 -in "$1" -noout -enddate
)" || die "\ )" || die "\
ssl_cert_not_after_date - failed: -enddate" ssl_cert_not_after_date - failed: -enddate"
@ -5346,8 +5331,7 @@ Version: $EASYRSA_version
Generated: ~DATE~ Generated: ~DATE~
SSL Lib: $ssl_version SSL Lib: $ssl_version
Git Commit: ~GITHEAD~ Git Commit: ~GITHEAD~
Source Repo: https://github.com/OpenVPN/easy-rsa${EASYRSA_DEBUG+ Source Repo: https://github.com/OpenVPN/easy-rsa
* debug enabled}
VERSION_TEXT VERSION_TEXT
} # => print_version () } # => print_version ()