From c00474805d6545d93fe8b73726b9cd8428e5789a Mon Sep 17 00:00:00 2001 From: Peter Mosmans Date: Tue, 22 Sep 2015 19:25:27 +1000 Subject: [PATCH] Fallback to default openssl when supplied openssl can't be executed --- cipherscan | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cipherscan b/cipherscan index 13fa067..2f436be 100755 --- a/cipherscan +++ b/cipherscan @@ -1881,17 +1881,22 @@ if [[ -z $OPENSSLBIN ]]; then exit 1 fi OPENSSLBIN="${REALPATH}/${opensslbin_name}" + if ! [[ -x "${OPENSSLBIN}" ]]; then + OPENSSLBIN="$(which openssl)" # fallback to generic openssl + fi fi # use custom config file to enable GOST ciphers if [[ -e $DIRNAMEPATH/openssl.cnf ]]; then export OPENSSL_CONF="$DIRNAMEPATH/openssl.cnf" fi + OPENSSLBINHELP="$($OPENSSLBIN s_client -help 2>&1)" if [[ $OPENSSLBINHELP =~ :error: ]]; then verbose "$OPENSSLBIN can't handle GOST config, disabling" unset OPENSSL_CONF OPENSSLBINHELP="$($OPENSSLBIN s_client -help 2>&1)" fi + if ! [[ $OPENSSLBINHELP =~ -connect ]]; then echo "$OPENSSLBIN s_client doesn't accept the -connect parameter, which is extremely strange; refusing to proceed." 1>&2 exit 1