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

Merge pull request #3470 from SparkiDev/config_fix_3

Browse Source 
TLS configurations fixes
This commit is contained in:
toddouska
2020-11-06 10:35:51 -08:00
committed by GitHub
parent 3f25cda354 8a42ee7ffd
commit b4e7f196df
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/internal.c
View File

@ -6704,6 +6704,7 @@ void FreeSSL(WOLFSSL* ssl, void* heap)
} }
#if !defined(NO_OLD_TLS) || defined(WOLFSSL_DTLS) || \ #if !defined(NO_OLD_TLS) || defined(WOLFSSL_DTLS) || \
!defined(WOLFSSL_NO_TLS12) || \
((defined(HAVE_CHACHA) || defined(HAVE_AESCCM) || defined(HAVE_AESGCM)) \ ((defined(HAVE_CHACHA) || defined(HAVE_AESCCM) || defined(HAVE_AESGCM)) \
&& defined(HAVE_AEAD)) && defined(HAVE_AEAD))
@ -6827,7 +6828,7 @@ void WriteSEQ(WOLFSSL* ssl, int verifyOrder, byte* out)
c32toa(seq[1], out + OPAQUE32_LEN); c32toa(seq[1], out + OPAQUE32_LEN);
} }
#endif /* WOLFSSL_DTLS || !WOLFSSL_NO_TLS12 */ #endif /* WOLFSSL_DTLS || !WOLFSSL_NO_TLS12 */
#endif /* !NO_OLD_TLS || WOLFSSL_DTLS || #endif /* !NO_OLD_TLS || WOLFSSL_DTLS || !WOLFSSL_NO_TLS12 ||
* ((HAVE_CHACHA || HAVE_AESCCM || HAVE_AESGCM) && HAVE_AEAD) */ * ((HAVE_CHACHA || HAVE_AESCCM || HAVE_AESGCM) && HAVE_AEAD) */
#ifdef WOLFSSL_DTLS #ifdef WOLFSSL_DTLS
@ -28927,7 +28928,7 @@ static int DoSessionTicket(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
ERROR_OUT(OUT_OF_ORDER_E, exit_dcke); ERROR_OUT(OUT_OF_ORDER_E, exit_dcke);
} }
#ifndef NO_CERTS #if !defined(NO_CERTS) && !defined(WOLFSSL_NO_CLIENT_AUTH)
if (ssl->options.verifyPeer && ssl->options.failNoCert) { if (ssl->options.verifyPeer && ssl->options.failNoCert) {
if (!ssl->options.havePeerCert) { if (!ssl->options.havePeerCert) {
WOLFSSL_MSG("client didn't present peer cert"); WOLFSSL_MSG("client didn't present peer cert");
@ -28942,7 +28943,7 @@ static int DoSessionTicket(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
return NO_PEER_CERT; return NO_PEER_CERT;
} }
} }
#endif /* !NO_CERTS */ #endif /* !NO_CERTS && !WOLFSSL_NO_CLIENT_AUTH */
#if defined(WOLFSSL_CALLBACKS) #if defined(WOLFSSL_CALLBACKS)
if (ssl->hsInfoOn) { if (ssl->hsInfoOn) {
@ -30115,7 +30116,7 @@ static int DoSessionTicket(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
*inOutIdx = args->idx; *inOutIdx = args->idx;
ssl->options.clientState = CLIENT_KEYEXCHANGE_COMPLETE; ssl->options.clientState = CLIENT_KEYEXCHANGE_COMPLETE;
#ifndef NO_CERTS #if !defined(NO_CERTS) && !defined(WOLFSSL_NO_CLIENT_AUTH)
if (ssl->options.verifyPeer) { if (ssl->options.verifyPeer) {
ret = BuildCertHashes(ssl, &ssl->hsHashes->certHashes); ret = BuildCertHashes(ssl, &ssl->hsHashes->certHashes);
} }