yuzu-emu/mbedtls
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix usage of environment variables for commands

Browse source
This commit is contained in:
Manuel Pégourié-Gonnard 2014-03-13 18:47:44 +01:00
parent 84fd6877c6
commit 74faf3c400
2 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
tests/compat.sh
View file

@ -13,7 +13,9 @@ let "srvmem = 0"
# default values, can be overriden by the environment # default values, can be overriden by the environment
: ${P_SRV:=../programs/ssl/ssl_server2} : ${P_SRV:=../programs/ssl/ssl_server2}
: ${P_CLI:=../programs/ssl/ssl_client2} : ${P_CLI:=../programs/ssl/ssl_client2}
: ${OPENSSL:=openssl} : ${OPENSSL_CMD:=openssl} # OPENSSL would conflict with the build system
: ${GNUTLS_CLI:=gnutls-cli}
: ${GNUTLS_SERV:=gnutls-serv}
MODES="ssl3 tls1 tls1_1 tls1_2" MODES="ssl3 tls1 tls1_1 tls1_2"
VERIFIES="NO YES" VERIFIES="NO YES"
@ -607,10 +609,10 @@ has_mem_err() {
start_server() { start_server() {
case $1 in case $1 in
[Oo]pen*) [Oo]pen*)
SERVER_CMD="$OPENSSL s_server $O_SERVER_ARGS" SERVER_CMD="$OPENSSL_CMD s_server $O_SERVER_ARGS"
;; ;;
[Gg]nu*) [Gg]nu*)
SERVER_CMD="gnutls-serv $G_SERVER_ARGS --priority $G_SERVER_PRIO" SERVER_CMD="$GNUTLS_SERV $G_SERVER_ARGS --priority $G_SERVER_PRIO"
;; ;;
[Pp]olar*) [Pp]olar*)
SERVER_CMD="$P_SRV $P_SERVER_ARGS" SERVER_CMD="$P_SRV $P_SERVER_ARGS"
@ -687,7 +689,7 @@ run_client() {
# run the command and interpret result # run the command and interpret result
case $1 in case $1 in
[Oo]pen*) [Oo]pen*)
CLIENT_CMD="$OPENSSL s_client $O_CLIENT_ARGS -cipher $2" CLIENT_CMD="$OPENSSL_CMD s_client $O_CLIENT_ARGS -cipher $2"
log "$CLIENT_CMD" log "$CLIENT_CMD"
echo "$CLIENT_CMD" > cli_out echo "$CLIENT_CMD" > cli_out
( echo -e 'GET HTTP/1.0'; echo; ) | $CLIENT_CMD >> cli_out 2>&1 ( echo -e 'GET HTTP/1.0'; echo; ) | $CLIENT_CMD >> cli_out 2>&1
@ -705,7 +707,7 @@ run_client() {
;; ;;
[Gg]nu*) [Gg]nu*)
CLIENT_CMD="gnutls-cli $G_CLIENT_ARGS --priority $G_PRIO_MODE:$2 localhost" CLIENT_CMD="$GNUTLS_CLI $G_CLIENT_ARGS --priority $G_PRIO_MODE:$2 localhost"
log "$CLIENT_CMD" log "$CLIENT_CMD"
echo "$CLIENT_CMD" > cli_out echo "$CLIENT_CMD" > cli_out
( echo -e 'GET HTTP/1.0'; echo; ) | $CLIENT_CMD >> cli_out 2>&1 ( echo -e 'GET HTTP/1.0'; echo; ) | $CLIENT_CMD >> cli_out 2>&1
@ -792,10 +794,12 @@ if [ ! -x "$P_CLI" ]; then
echo "Command '$P_CLI' is not an executable file" echo "Command '$P_CLI' is not an executable file"
exit 1 exit 1
fi fi
if which $OPENSSL >/dev/null 2>&1; then :; else for CMD in $OPENSSL_CMD $GNUTLS_CLI $GNUTLS_SERV; do
echo "Command '$OPENSSL' not found" if which "$CMD" >/dev/null 2>&1; then :; else
exit 1 echo "Command '$CMD' not found"
fi exit 1
fi
done
get_options "$@" get_options "$@"

10
tests/ssl-opt.sh
View file

@ -13,10 +13,10 @@ set -u
# default values, can be overriden by the environment # default values, can be overriden by the environment
: ${P_SRV:=../programs/ssl/ssl_server2} : ${P_SRV:=../programs/ssl/ssl_server2}
: ${P_CLI:=../programs/ssl/ssl_client2} : ${P_CLI:=../programs/ssl/ssl_client2}
: ${OPENSSL:=openssl} : ${OPENSSL_CMD:=openssl} # OPENSSL would conflict with the build system
O_SRV="$OPENSSL s_server -www -cert data_files/server5.crt -key data_files/server5.key" O_SRV="$OPENSSL_CMD s_server -www -cert data_files/server5.crt -key data_files/server5.key"
O_CLI="echo 'GET / HTTP/1.0' | $OPENSSL s_client" O_CLI="echo 'GET / HTTP/1.0' | $OPENSSL_CMD s_client"
TESTS=0 TESTS=0
FAILS=0 FAILS=0
@ -237,8 +237,8 @@ if [ ! -x "$P_CLI" ]; then
echo "Command '$P_CLI' is not an executable file" echo "Command '$P_CLI' is not an executable file"
exit 1 exit 1
fi fi
if which $OPENSSL >/dev/null 2>&1; then :; else if which $OPENSSL_CMD >/dev/null 2>&1; then :; else
echo "Command '$OPENSSL' not found" echo "Command '$OPENSSL_CMD' not found"
exit 1 exit 1
fi fi