From ce634f7deb0177c82582dd062f7ab8e71c52bf65 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Tue, 15 Jun 2021 10:04:23 +0800 Subject: [PATCH] Correct `exit` using, the exit status should be 0~255 According to the POSIX Programmer's Manual, the exit status specified by the unsigned decimal integer. If n is specified, but its value is not between 0 and 255 inclusively, the exit status is undefined. By cross reference the usage between different scripts in this project, it looks like we could simply remove the `-` before the number. --- utils/00_unittest_baseline.sh | 2 +- utils/curves.bash | 4 ++-- utils/generate_static_cipher_lists.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/utils/00_unittest_baseline.sh b/utils/00_unittest_baseline.sh index db41d9f..ca988d3 100755 --- a/utils/00_unittest_baseline.sh +++ b/utils/00_unittest_baseline.sh @@ -28,7 +28,7 @@ check_result() { remove_quotes json_result="$(awk '/id.*'"${1}"'/,/finding.*$/' $FILE)" - [[ -z $json_result ]] && exit -1 + [[ -z $json_result ]] && exit 1 # is4lines? finding_value="$(awk -F':' '/finding/ { print $2" "$3" "$4 }' <<< "$json_result")" if [[ $# -eq 2 ]]; then diff --git a/utils/curves.bash b/utils/curves.bash index a5c1de9..8a8f76b 100755 --- a/utils/curves.bash +++ b/utils/curves.bash @@ -62,8 +62,8 @@ HN="$1" [ -z "$HN" ] && HN=testssl.sh find_openssl_binary -ERRFILE=$(mktemp /tmp/curve_tester.R.XXXXXX) || exit -6 -TMPFILE=$(mktemp /tmp/curve_tester.T.XXXXXX) || exit -6 +ERRFILE=$(mktemp /tmp/curve_tester.R.XXXXXX) || exit 6 +TMPFILE=$(mktemp /tmp/curve_tester.T.XXXXXX) || exit 6 for curve in $($OPENSSL ecparam -list_curves | awk -F':' '/:/ { print $1 }'); do diff --git a/utils/generate_static_cipher_lists.sh b/utils/generate_static_cipher_lists.sh index 154da44..6e4a8e8 100755 --- a/utils/generate_static_cipher_lists.sh +++ b/utils/generate_static_cipher_lists.sh @@ -96,7 +96,7 @@ get_mapping_file() { if [[ ! -r "$CIPHERS_BY_STRENGTH_FILE" ]] ; then outln "\nATTENTION: No cipher mapping file found!" - exit -2 + exit 2 fi while read TLS_CIPHER_HEXCODE[TLS_NR_CIPHERS] n TLS_CIPHER_OSSL_NAME[TLS_NR_CIPHERS] TLS_CIPHER_RFC_NAME[TLS_NR_CIPHERS] TLS_CIPHER_SSLVERS[TLS_NR_CIPHERS] TLS_CIPHER_KX[TLS_NR_CIPHERS] TLS_CIPHER_AUTH[TLS_NR_CIPHERS] TLS_CIPHER_ENC[TLS_NR_CIPHERS] mac TLS_CIPHER_EXPORT[TLS_NR_CIPHERS]; do