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

Simplify the pqc keyshare handling

Browse Source
This commit is contained in:
Juliusz Sosinowicz
2023-09-08 14:35:33 +02:00
parent 0dbf97c867
commit c802193119
1 changed files with 3 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/tls.c
View File

@ -8802,12 +8802,7 @@ int TLSX_KeyShare_Parse(WOLFSSL* ssl, const byte* input, word16 length,
return ret; return ret;
} }
#ifdef HAVE_PQC ret = TLSX_KeyShare_Use(ssl, group, 0, NULL, NULL, &ssl->extensions);
/* For post-quantum groups, do this in TLSX_PopulateExtensions(). */
if (!WOLFSSL_NAMED_GROUP_IS_PQC(group))
#endif
ret = TLSX_KeyShare_Use(ssl, group, 0, NULL, NULL, &ssl->extensions);
if (ret == 0) if (ret == 0)
ssl->session->namedGroup = ssl->namedGroup = group; ssl->session->namedGroup = ssl->namedGroup = group;
} }
@ -12968,19 +12963,8 @@ int TLSX_PopulateExtensions(WOLFSSL* ssl, byte isServer)
namedGroup = kse->group; namedGroup = kse->group;
} }
if (namedGroup != WOLFSSL_NAMED_GROUP_INVALID) { if (namedGroup != WOLFSSL_NAMED_GROUP_INVALID) {
#ifdef HAVE_PQC ret = TLSX_KeyShare_Use(ssl, namedGroup, 0, NULL, NULL,
/* For KEMs, the key share has already been generated, but not &ssl->extensions);
* if we are resuming. */
if (!WOLFSSL_NAMED_GROUP_IS_PQC(namedGroup)
#ifdef HAVE_SESSION_TICKET
|| ssl->options.resuming
#endif /* HAVE_SESSION_TICKET */
)
#endif /* HAVE_PQC */
{
ret = TLSX_KeyShare_Use(ssl, namedGroup, 0, NULL, NULL,
&ssl->extensions);
}
if (ret != 0) if (ret != 0)
return ret; return ret;
} }