wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-31 19:24:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix for issue where mac digest changes between early data and server_hello, which can leave section of response uninitialized. ZD11424

Browse Source
This commit is contained in:
David Garske
2021-01-13 11:10:12 -08:00
parent 88faef9bd9
commit d7aa8e1795
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/tls13.c
View File

@@ -1545,7 +1545,7 @@ static WC_INLINE void BuildTls13Nonce(WOLFSSL* ssl, byte* nonce, const byte* iv,
} }
#if defined(HAVE_CHACHA) && defined(HAVE_POLY1305) #if defined(HAVE_CHACHA) && defined(HAVE_POLY1305)
/* Encrypt with ChaCha20 and create authenication tag with Poly1305. /* Encrypt with ChaCha20 and create authentication tag with Poly1305.
* *
* ssl The SSL/TLS object. * ssl The SSL/TLS object.
* output The buffer to write encrypted data and authentication tag into. * output The buffer to write encrypted data and authentication tag into.
@@ -1600,7 +1600,7 @@ static int ChaCha20Poly1305_Encrypt(WOLFSSL* ssl, byte* output,
#endif #endif
#ifdef HAVE_NULL_CIPHER #ifdef HAVE_NULL_CIPHER
/* Create authenication tag and copy data over input. /* Create authentication tag and copy data over input.
* *
* ssl The SSL/TLS object. * ssl The SSL/TLS object.
* output The buffer to copy data into. * output The buffer to copy data into.
@@ -1826,7 +1826,7 @@ static int EncryptTls13(WOLFSSL* ssl, byte* output, const byte* input,
} }
#if defined(HAVE_CHACHA) && defined(HAVE_POLY1305) #if defined(HAVE_CHACHA) && defined(HAVE_POLY1305)
/* Decrypt with ChaCha20 and check authenication tag with Poly1305. /* Decrypt with ChaCha20 and check authentication tag with Poly1305.
* *
* ssl The SSL/TLS object. * ssl The SSL/TLS object.
* output The buffer to write decrypted data into. * output The buffer to write decrypted data into.
@@ -7190,13 +7190,8 @@ int DoTls13HandShakeMsgType(WOLFSSL* ssl, byte* input, word32* inOutIdx,
ENCRYPT_AND_DECRYPT_SIDE, 1)) != 0) { ENCRYPT_AND_DECRYPT_SIDE, 1)) != 0) {
return ret; return ret;
} }
#ifdef WOLFSSL_EARLY_DATA
if ((ret = SetKeysSide(ssl, DECRYPT_SIDE_ONLY)) != 0)
return ret;
#else
if ((ret = SetKeysSide(ssl, ENCRYPT_AND_DECRYPT_SIDE)) != 0) if ((ret = SetKeysSide(ssl, ENCRYPT_AND_DECRYPT_SIDE)) != 0)
return ret; return ret;
#endif
} }
if (type == finished) { if (type == finished) {