Fix test to work with configurations not including AES-GCM

This commit is contained in:
Sean Parkinson
2018-06-01 09:24:28 +10:00
parent 70b3ba1c04
commit 4ac34b74bd
3 changed files with 27 additions and 18 deletions

View File

@@ -103,6 +103,21 @@ if [ $? -ne 0 ]; then
fi fi
echo "" echo ""
# psk server with non psk client
port=0
./examples/server/server -j -R $ready_file -p $port &
server_pid=$!
create_port
./examples/client/client -p $port
RESULT=$?
remove_ready_file
if [ $RESULT -ne 0 ]; then
echo -e "\n\nClient connection failed"
do_cleanup
exit 1
fi
echo ""
# check fail if no auth, psk server with non psk client # check fail if no auth, psk server with non psk client
echo "Checking fail when not sending peer cert" echo "Checking fail when not sending peer cert"
port=0 port=0

View File

@@ -703,6 +703,7 @@ int SuiteTest(void)
#endif #endif
#ifndef NO_PSK #ifndef NO_PSK
#ifndef WOLFSSL_NO_TLS12 #ifndef WOLFSSL_NO_TLS12
#if !defined(NO_RSA) || defined(HAVE_ECC)
/* add psk cipher suites */ /* add psk cipher suites */
strcpy(argv0[1], "tests/test-psk.conf"); strcpy(argv0[1], "tests/test-psk.conf");
printf("starting psk cipher suite tests\n"); printf("starting psk cipher suite tests\n");
@@ -713,6 +714,7 @@ int SuiteTest(void)
goto exit; goto exit;
} }
#endif #endif
#endif
#ifdef WOLFSSL_TLS13 #ifdef WOLFSSL_TLS13
/* add psk extra suites */ /* add psk extra suites */
strcpy(argv0[1], "tests/test-tls13-psk.conf"); strcpy(argv0[1], "tests/test-tls13-psk.conf");

View File

@@ -1,15 +1,7 @@
# server - standard PSK # server - PSK plus certificates
-j -j
-l PSK-CHACHA20-POLY1305 -l PSK-CHACHA20-POLY1305
# client- standard PSK # client- standard PSK
-s -s
-l PSK-CHACHA20-POLY1305 -l PSK-CHACHA20-POLY1305
# server
-j
-l ECDHE-RSA-AES256-GCM-SHA384:PSK-CHACHA20-POLY1305
# client
-l ECDHE-RSA-AES256-GCM-SHA384:PSK-CHACHA20-POLY1305