Only do early data in initial handshake when using PSK

This commit is contained in:
Sean Parkinson
2018-10-24 09:47:30 +10:00
parent 0b720c4412
commit 7586e1df42
2 changed files with 2 additions and 9 deletions

View File

@ -2290,14 +2290,8 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
}
else {
#ifdef WOLFSSL_EARLY_DATA
#ifndef HAVE_SESSION_TICKET
if (!usePsk) {
}
else
#endif
if (earlyData) {
if (usePsk && earlyData)
EarlyData(ctx, ssl, msg, msgSz, buffer);
}
#endif
do {
err = 0; /* reset error */

View File

@ -8453,8 +8453,7 @@ int wolfSSL_write_early_data(WOLFSSL* ssl, const void* data, int sz, int* outSz)
if (ret != WOLFSSL_SUCCESS)
return WOLFSSL_FATAL_ERROR;
}
if (ssl->options.handShakeState == CLIENT_HELLO_COMPLETE ||
ssl->options.handShakeState == HANDSHAKE_DONE) {
if (ssl->options.handShakeState == CLIENT_HELLO_COMPLETE) {
ret = SendData(ssl, data, sz);
if (ret > 0)
*outSz = ret;