Git/testssl.sh
1
0
Fork 0
mirror of https://github.com/drwetter/testssl.sh.git synced 2025-10-30 21:35:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

removed hardcoded obsolete paths for binaries

Browse Source
This commit is contained in:
Dirk Wetter
2015-09-03 13:26:02 +02:00
parent 4ec089b508
commit 6a036cd7d4
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
testssl.sh
View File

@@ -60,7 +60,7 @@
# testing though we need all broken features. testssl.sh will # testing though we need all broken features. testssl.sh will
# over time replace those checks with bash sockets -- however it's # over time replace those checks with bash sockets -- however it's
# still recommended to use the supplied binaries or cook your own, see # still recommended to use the supplied binaries or cook your own, see
# https://github.com/drwetter/testssl.sh/blob/master/openssl-bins/openssl-1.0.2-chacha.pm/Readme.md # https://github.com/drwetter/testssl.sh/blob/master/bin/Readme.md .
# Don't worry if feature X is not available you'll get a warning about # Don't worry if feature X is not available you'll get a warning about
# this missing feature! The idea is if this script can't tell something # this missing feature! The idea is if this script can't tell something
# for sure it speaks up so that you have clear picture. # for sure it speaks up so that you have clear picture.
@@ -3594,12 +3594,6 @@ find_openssl_binary() {
: # 2. otherwise try openssl in path of testssl.sh : # 2. otherwise try openssl in path of testssl.sh
elif test_openssl_suffix $RUN_DIR/bin; then elif test_openssl_suffix $RUN_DIR/bin; then
: # 3. otherwise here, this is supposed to be the standard --platform independed path in the future!!! : # 3. otherwise here, this is supposed to be the standard --platform independed path in the future!!!
elif [[ -x "$RUN_DIR/openssl-bins/openssl-1.0.2-chacha.pm/openssl$myarch_suffix"-1.0.2pm-krb5 ]]; then
OPENSSL="$RUN_DIR/openssl-bins/openssl-1.0.2-chacha.pm/openssl$myarch_suffix"-1.0.2pm-krb5
# 4. legacy dirs follow, first kerberos binaries from pm (if executable) ^^^^ deprecated!
elif [[ -x "$RUN_DIR/openssl-bins/openssl-1.0.2-chacha.pm/openssl$myarch_suffix"-1.0.2pm-static ]]; then
# 5. otherwise default is trying the statically linked ones ^^^^ deprecated!
OPENSSL="$RUN_DIR/openssl-bins/openssl-1.0.2-chacha.pm/openssl$myarch_suffix"-1.0.2pm-static
elif test_openssl_suffix "$(dirname "$(which openssl)")"; then elif test_openssl_suffix "$(dirname "$(which openssl)")"; then
: # 5. we tried hard and failed, so now we use the system binaries : # 5. we tried hard and failed, so now we use the system binaries
fi fi
@@ -4822,4 +4816,4 @@ fi
exit $ret exit $ret
# $Id: testssl.sh,v 1.369 2015/09/03 10:17:30 dirkw Exp $ # $Id: testssl.sh,v 1.370 2015/09/03 11:26:01 dirkw Exp $