yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2025-02-02 08:11:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

compat.sh: use file output (prep. for valgrind)

Browse source
This commit is contained in:
Manuel Pégourié-Gonnard 2014-02-27 11:12:30 +01:00
parent 42d195acc1
commit 87ae3031ac
1 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
tests/compat.sh
View file

@ -457,7 +457,7 @@ start_server() {
SERVER_NAME=$1 SERVER_NAME=$1
log "$SERVER_CMD" log "$SERVER_CMD"
$SERVER_CMD >/dev/null 2>&1 & $SERVER_CMD >srv_out 2>&1 &
PROCESS_ID=$! PROCESS_ID=$!
sleep 1 sleep 1
@ -474,29 +474,39 @@ stop_server() {
kill $PROCESS_ID 2>/dev/null kill $PROCESS_ID 2>/dev/null
wait $PROCESS_ID 2>/dev/null wait $PROCESS_ID 2>/dev/null
rm -f srv_out
} }
# kill the running server (used when killed by signal) # kill the running server (used when killed by signal)
cleanup() { cleanup() {
rm -f srv_out cli_out
kill $PROCESS_ID kill $PROCESS_ID
exit 1 exit 1
} }
# run_client <name> <cipher> # run_client <name> <cipher>
run_client() { run_client() {
# announce what we're going to do
let "tests++"
VERIF=$(echo $VERIFY | tr '[:upper:]' '[:lower:]')
TITLE="${1:0:1}->${SERVER_NAME:0:1} $MODE,$VERIF $2 "
echo -n "$TITLE"
LEN=`echo "$TITLE" | wc -c`
LEN=`echo 72 - $LEN | bc`
for i in `seq 1 $LEN`; do echo -n '.'; done; echo -n ' '
# 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 s_client $O_CLIENT_ARGS -cipher $2"
log "$CLIENT_CMD" log "$CLIENT_CMD"
OUTPUT="$( ( echo -e 'GET HTTP/1.0'; echo; ) | $CLIENT_CMD 2>&1 )" ( echo -e 'GET HTTP/1.0'; echo; ) | $CLIENT_CMD > cli_out 2>&1
EXIT=$? EXIT=$?
if [ "$EXIT" == "0" ]; then if [ "$EXIT" == "0" ]; then
RESULT=0 RESULT=0
else else
SUPPORTED="$( echo $OUTPUT | grep 'Cipher is (NONE)' )" if grep 'Cipher is (NONE)' cli_out >/dev/null; then
if [ "X$SUPPORTED" != "X" ]; then
RESULT=1 RESULT=1
else else
RESULT=2 RESULT=2
@ -507,7 +517,7 @@ run_client() {
[Pp]olar*) [Pp]olar*)
CLIENT_CMD="../programs/ssl/ssl_client2 $P_CLIENT_ARGS force_ciphersuite=$2" CLIENT_CMD="../programs/ssl/ssl_client2 $P_CLIENT_ARGS force_ciphersuite=$2"
log "$CLIENT_CMD" log "$CLIENT_CMD"
OUTPUT="$( $CLIENT_CMD )" $CLIENT_CMD > cli_out
EXIT=$? EXIT=$?
case $EXIT in case $EXIT in
@ -524,13 +534,6 @@ run_client() {
esac esac
# report and count result # report and count result
let "tests++"
VERIF=$(echo $VERIFY | tr '[:upper:]' '[:lower:]')
TITLE="${1:0:1}->${SERVER_NAME:0:1} $MODE,$VERIF $2 "
echo -n "$TITLE"
LEN=`echo "$TITLE" | wc -c`
LEN=`echo 72 - $LEN | bc`
for i in `seq 1 $LEN`; do echo -n '.'; done; echo -n ' '
case $RESULT in case $RESULT in
"0") "0")
echo PASS echo PASS
@ -544,10 +547,12 @@ run_client() {
echo " ! $SERVER_CMD" echo " ! $SERVER_CMD"
echo " ! $CLIENT_CMD" echo " ! $CLIENT_CMD"
echo -n " ! ... " echo -n " ! ... "
echo "$OUTPUT" | tail -c72 tail -n1 cli_out
let "failed++" let "failed++"
;; ;;
esac esac
rm -f cli_out
} }
# #