wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2026-07-05 16:50:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9904 from julek-wolfssl/fenrir/24

Browse Source 
Clean up hpke and rng allocation
This commit is contained in:
Daniel Pouzzner
2026-03-06 22:26:40 -06:00
committed by GitHub
parent 1744819348 ac333c371c
commit 4e4215ada9
1 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tls.c
+9 -19
View File
@@ -13270,13 +13270,9 @@ static int TLSX_ECH_Write(WOLFSSL_ECH* ech, byte msgType, byte* writeBuf,
word32 configsLen = 0;
void* ephemeralKey = NULL;
byte* writeBuf_p = writeBuf;
#ifdef WOLFSSL_SMALL_STACK
Hpke* hpke = NULL;
WC_RNG* rng = NULL;
#else
Hpke hpke[1];
WC_RNG rng[1];
#endif
WC_DECLARE_VAR(hpke, Hpke, 1, DYNAMIC_TYPE_TMP_BUFFER);
WC_DECLARE_VAR(rng, WC_RNG, 1, DYNAMIC_TYPE_RNG);
WOLFSSL_MSG("TLSX_ECH_Write");
if (msgType == hello_retry_request) {
/* reserve space to write the confirmation to */
@@ -13322,19 +13318,13 @@ static int TLSX_ECH_Write(WOLFSSL_ECH* ech, byte msgType, byte* writeBuf,
}
writeBuf_p += 2;
if (ech->state == ECH_WRITE_GREASE) {
#ifdef WOLFSSL_SMALL_STACK
hpke = (Hpke*)XMALLOC(sizeof(Hpke), NULL, DYNAMIC_TYPE_TMP_BUFFER);
if (hpke == NULL)
return MEMORY_E;
rng = (WC_RNG*)XMALLOC(sizeof(WC_RNG), NULL, DYNAMIC_TYPE_RNG);
if (rng == NULL) {
XFREE(hpke, NULL, DYNAMIC_TYPE_RNG);
return MEMORY_E;
}
#endif
WC_ALLOC_VAR_EX(hpke, Hpke, 1, NULL, DYNAMIC_TYPE_TMP_BUFFER, ret = MEMORY_E);
WC_ALLOC_VAR_EX(rng, WC_RNG, 1, NULL, DYNAMIC_TYPE_RNG, ret = MEMORY_E);
/* hpke init */
ret = wc_HpkeInit(hpke, ech->kemId, ech->cipherSuite.kdfId,
ech->cipherSuite.aeadId, NULL);
if (ret == 0) {
ret = wc_HpkeInit(hpke, ech->kemId, ech->cipherSuite.kdfId,
ech->cipherSuite.aeadId, NULL);
}
if (ret == 0)
rngRet = ret = wc_InitRng(rng);
/* create the ephemeralKey */