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

Merge pull request #5382 from icing/announce-pskkem-plain

Browse Source 
Announce TLSX_PSK_KEY_EXCHANGE_MODES in non-resuming ClientHello
This commit is contained in:
David Garske
2022-08-03 07:40:24 -07:00
committed by GitHub
parent 0c1add08e3 a943de7969
commit 664fe390d6
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/tls.c
View File

@ -11385,9 +11385,19 @@ int TLSX_PopulateExtensions(WOLFSSL* ssl, byte isServer)
} }
#endif /* !NO_PSK */ #endif /* !NO_PSK */
#if defined(HAVE_SESSION_TICKET) || !defined(NO_PSK) #if defined(HAVE_SESSION_TICKET) || !defined(NO_PSK)
if (usingPSK) {
/* Some servers do not generate session tickets unless
* the extension is seen in a non-resume client hello.
* We used to send it only if we were otherwise using PSK.
* Now always send it. Define NO_TLSX_PSKKEM_PLAIN_ANNOUNCE
* to revert to the old behaviour. */
#ifdef NO_TLSX_PSKKEM_PLAIN_ANNOUNCE
if (usingPSK)
#endif
{
byte modes; byte modes;
(void)usingPSK;
/* Pre-shared key modes: mandatory extension for resumption. */ /* Pre-shared key modes: mandatory extension for resumption. */
modes = 1 << PSK_KE; modes = 1 << PSK_KE;
#if !defined(NO_DH) || defined(HAVE_ECC) || \ #if !defined(NO_DH) || defined(HAVE_ECC) || \