feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

remove invalid test-qsh version tests, revert if statement check in internal.c

Browse Source
This commit is contained in:
Jacob Barthelmeh
2017-08-17 11:27:47 -06:00
parent 3fda99cbc4
commit f6ad5524eb
3 changed files with 6 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
examples/client/client.c
View File

@ -1321,6 +1321,11 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
done += 1; done += 1;
#endif #endif
#if defined(HAVE_QSH)
/*currently google server rejects client hello with QSH extension.*/
done += 1;
#endif
if (done) { if (done) {
printf("external test can't be run in this mode"); printf("external test can't be run in this mode");

2
src/internal.c
View File

@ -20597,7 +20597,7 @@ static int DoSessionTicket(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
case TLS_ASYNC_BEGIN: case TLS_ASYNC_BEGIN:
{ {
#ifdef HAVE_QSH #ifdef HAVE_QSH
if (ssl->peerQSHKeyPresent) { if (ssl->peerQSHKeyPresent && ssl->options.haveQSH) {
args->qshSz = QSH_KeyGetSize(ssl); args->qshSz = QSH_KeyGetSize(ssl);
} }
#endif #endif

54
tests/test-qsh.conf
View File

@ -28,60 +28,6 @@
-s -s
-l QSH:PSK-CHACHA20-POLY1305 -l QSH:PSK-CHACHA20-POLY1305
# server TLSv1 DHE-RSA-CHACHA20-POLY1305
-v 1
-l QSH:DHE-RSA-CHACHA20-POLY1305
# client TLSv1 DHE-RSA-CHACHA20-POLY1305
-v 1
-l QSH:DHE-RSA-CHACHA20-POLY1305
# server TLSv1 ECDHE-EDCSA-CHACHA20-POLY1305
-v 1
-l QSH:ECDHE-ECDSA-CHACHA20-POLY1305
-c ./certs/server-ecc.pem
-k ./certs/ecc-key.pem
# client TLSv1 ECDHE-ECDSA-CHACHA20-POLY1305
-v 1
-l QSH:ECDHE-ECDSA-CHACHA20-POLY1305
-A ./certs/server-ecc.pem
# server TLSv1 ECDHE-RSA-CHACHA20-POLY1305
-v 1
-l QSH:ECDHE-RSA-CHACHA20-POLY1305
# client TLSv1 ECDHE-RSA-CHACHA20-POLY1305
-v 1
-l QSH:ECDHE-RSA-CHACHA20-POLY1305
# server TLSv1.1 DHE-RSA-CHACHA20-POLY1305
-v 2
-l QSH:DHE-RSA-CHACHA20-POLY1305
# client TLSv1.1 DHE-RSA-CHACHA20-POLY1305
-v 2
-l QSH:DHE-RSA-CHACHA20-POLY1305
# server TLSv1.1 ECDHE-RSA-CHACHA20-POLY1305
-v 2
-l QSH:ECDHE-RSA-CHACHA20-POLY1305
# client TLSv1.1 ECDHE-RSA-CHACHA20-POLY1305
-v 2
-l QSH:ECDHE-RSA-CHACHA20-POLY1305
# server TLSv1.1 ECDHE-EDCSA-CHACHA20-POLY1305
-v 2
-l QSH:ECDHE-ECDSA-CHACHA20-POLY1305
-c ./certs/server-ecc.pem
-k ./certs/ecc-key.pem
# client TLSv1.1 ECDHE-ECDSA-CHACHA20-POLY1305
-v 2
-l QSH:ECDHE-ECDSA-CHACHA20-POLY1305
-A ./certs/server-ecc.pem
# server TLSv1.2 DHE-RSA-CHACHA20-POLY1305-OLD # server TLSv1.2 DHE-RSA-CHACHA20-POLY1305-OLD
-v 3 -v 3
-l QSH:DHE-RSA-CHACHA20-POLY1305-OLD -l QSH:DHE-RSA-CHACHA20-POLY1305-OLD