mirror of
https://github.com/Mbed-TLS/mbedtls.git
synced 2025-04-25 09:02:48 +00:00
Fix too aggressive test for gnutls commands
This commit is contained in:
parent
a4b0343edf
commit
3947d04b24
@ -785,23 +785,43 @@ run_client() {
|
|||||||
# MAIN
|
# MAIN
|
||||||
#
|
#
|
||||||
|
|
||||||
|
get_options "$@"
|
||||||
|
|
||||||
# sanity checks, avoid an avalanche of errors
|
# sanity checks, avoid an avalanche of errors
|
||||||
if [ ! -x "$P_SRV" ]; then
|
if [ ! -x "$P_SRV" ]; then
|
||||||
echo "Command '$P_SRV' is not an executable file"
|
echo "Command '$P_SRV' is not an executable file" >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
if [ ! -x "$P_CLI" ]; then
|
if [ ! -x "$P_CLI" ]; then
|
||||||
echo "Command '$P_CLI' is not an executable file"
|
echo "Command '$P_CLI' is not an executable file" >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
for CMD in $OPENSSL_CMD $GNUTLS_CLI $GNUTLS_SERV; do
|
|
||||||
if which "$CMD" >/dev/null 2>&1; then :; else
|
if echo "$PEERS" | grep -i openssl > /dev/null; then
|
||||||
echo "Command '$CMD' not found"
|
if which "$OPENSSL_CMD" >/dev/null 2>&1; then :; else
|
||||||
|
echo "Command '$OPENSSL_CMD' not found" >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
done
|
fi
|
||||||
|
|
||||||
get_options "$@"
|
if echo "$PEERS" | grep -i gnutls > /dev/null; then
|
||||||
|
for CMD in "$GNUTLS_CLI" "$GNUTLS_SERV"; do
|
||||||
|
if which "$CMD" >/dev/null 2>&1; then :; else
|
||||||
|
echo "Command '$CMD' not found" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
|
||||||
|
for PEER in $PEERS; do
|
||||||
|
case "$PEER" in
|
||||||
|
[Pp]olar*|[Oo]pen*|[Gg]nu*)
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
echo "Unknown peers: $PEER" >&2
|
||||||
|
exit 1
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
|
||||||
killall -q gnutls-serv openssl ssl_server ssl_server2
|
killall -q gnutls-serv openssl ssl_server ssl_server2
|
||||||
trap cleanup INT TERM HUP
|
trap cleanup INT TERM HUP
|
||||||
|
Loading…
x
Reference in New Issue
Block a user