mirrors
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes for tests 

Fix the benchmark client to set all groups supported.
Fix TLS 1.3 test script to work on PPC - check counter in separate test.
This commit is contained in:
Sean Parkinson 2018-05-01 14:27:38 +10:00
parent 65eb79e5cd
commit 5845482fc0
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
examples/client/client.c
View File

@ -192,43 +192,43 @@ static void ShowVersions(void)
#ifdef WOLFSSL_TLS13 #ifdef WOLFSSL_TLS13
static void SetKeyShare(WOLFSSL* ssl, int onlyKeyShare, int useX25519) static void SetKeyShare(WOLFSSL* ssl, int onlyKeyShare, int useX25519)
{ {
int groups[3];
int count = 0;
(void)useX25519; (void)useX25519;
WOLFSSL_START(WC_FUNC_CLIENT_KEY_EXCHANGE_SEND); WOLFSSL_START(WC_FUNC_CLIENT_KEY_EXCHANGE_SEND);
if (onlyKeyShare == 0 || onlyKeyShare == 2) { if (onlyKeyShare == 0 || onlyKeyShare == 2) {
#ifdef HAVE_CURVE25519 #ifdef HAVE_CURVE25519
if (useX25519) { if (useX25519) {
int groups[1] = { WOLFSSL_ECC_X25519 }; groups[count++] = WOLFSSL_ECC_X25519;
if (wolfSSL_UseKeyShare(ssl, WOLFSSL_ECC_X25519) != WOLFSSL_SUCCESS) if (wolfSSL_UseKeyShare(ssl, WOLFSSL_ECC_X25519) != WOLFSSL_SUCCESS)
err_sys("unable to use curve x25519"); err_sys("unable to use curve x25519");
if (wolfSSL_set_groups(ssl, groups, 1) != WOLFSSL_SUCCESS)
err_sys("unable to set groups: x25519");
} }
else else
#endif #endif
{ {
#ifdef HAVE_ECC #ifdef HAVE_ECC
#if defined(HAVE_ECC256) || defined(HAVE_ALL_CURVES) #if defined(HAVE_ECC256) || defined(HAVE_ALL_CURVES)
int groups[1] = { WOLFSSL_ECC_SECP256R1 }; groups[count++] = WOLFSSL_ECC_SECP256R1;
if (wolfSSL_UseKeyShare(ssl, WOLFSSL_ECC_SECP256R1) if (wolfSSL_UseKeyShare(ssl, WOLFSSL_ECC_SECP256R1)
!= WOLFSSL_SUCCESS) { != WOLFSSL_SUCCESS) {
err_sys("unable to use curve secp256r1"); err_sys("unable to use curve secp256r1");
} }
if (wolfSSL_set_groups(ssl, groups, 1) != WOLFSSL_SUCCESS)
err_sys("unable to set groups: secp256r1");
#endif #endif
#endif #endif
} }
} }
if (onlyKeyShare == 0 || onlyKeyShare == 1) { if (onlyKeyShare == 0 || onlyKeyShare == 1) {
#ifdef HAVE_FFDHE_2048 #ifdef HAVE_FFDHE_2048
int groups[1] = { WOLFSSL_FFDHE_2048 }; groups[count++] = WOLFSSL_FFDHE_2048;
if (wolfSSL_UseKeyShare(ssl, WOLFSSL_FFDHE_2048) != WOLFSSL_SUCCESS) if (wolfSSL_UseKeyShare(ssl, WOLFSSL_FFDHE_2048) != WOLFSSL_SUCCESS)
err_sys("unable to use DH 2048-bit parameters"); err_sys("unable to use DH 2048-bit parameters");
if (wolfSSL_set_groups(ssl, groups, 1) != WOLFSSL_SUCCESS)
err_sys("unable to set groups: DH 2048-bit");
#endif #endif
} }
if (wolfSSL_set_groups(ssl, groups, count) != WOLFSSL_SUCCESS)
err_sys("unable to set groups");
WOLFSSL_END(WC_FUNC_CLIENT_KEY_EXCHANGE_SEND); WOLFSSL_END(WC_FUNC_CLIENT_KEY_EXCHANGE_SEND);
} }
#endif #endif

13
scripts/tls13.test
View File

@ -13,18 +13,21 @@ counter=0
# let's use absolute path to a local dir (make distcheck may be in sub dir) # let's use absolute path to a local dir (make distcheck may be in sub dir)
# also let's add some randomness by adding pid in case multiple 'make check's # also let's add some randomness by adding pid in case multiple 'make check's
# per source tree # per source tree
ready_file=`pwd`/wolfssl_psk_ready$$ ready_file=`pwd`/wolfssl_tls13_ready$$
echo "ready file $ready_file" echo "ready file $ready_file"
create_port() { create_port() {
while [ ! -s $ready_file -a "$counter" -lt 50 ]; do while [ ! -s $ready_file ]; do
if [ -a "$counter" -gt 50 ]; then
break
fi
echo -e "waiting for ready file..." echo -e "waiting for ready file..."
sleep 0.1 sleep 0.1
counter=$((counter+ 1)) counter=$((counter+ 1))
done done
if test -e $ready_file; then if [ -e $ready_file ]; then
echo -e "found ready file, starting client..." echo -e "found ready file, starting client..."
# get created port 0 ephemeral port # get created port 0 ephemeral port
@ -36,9 +39,9 @@ create_port() {
} }
remove_ready_file() { remove_ready_file() {
if test -e $ready_file; then if [ -e $ready_file ]; then
echo -e "removing existing ready file" echo -e "removing existing ready file"
rm $ready_file rm $ready_file
fi fi
} }