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

Merge pull request #5996 from douzzer/20230120-fixes

Browse Source 
20230120-fixes
This commit is contained in:
David Garske
2023-01-21 08:32:14 -08:00
committed by GitHub
parent d711e4b9f8 aa776057ff
commit a40da56f11
3 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Docker/OpenWrt/runTests.sh
View File

@ -1,7 +1,7 @@
#/bin/sh #!/bin/sh
function runCMD() { # usage: runCMD "<command>" "<retVal>" runCMD() { # usage: runCMD "<command>" "<retVal>"
eval $1 &>/dev/null eval $1 >/dev/null 2>&1
RETVAL=$? RETVAL=$?
if [ "$RETVAL" != "$2" ]; then if [ "$RETVAL" != "$2" ]; then
echo "Command ($1) returned ${RETVAL}, but expected $2. Rerunning with output to terminal:" echo "Command ($1) returned ${RETVAL}, but expected $2. Rerunning with output to terminal:"

6
src/tls.c
View File

@ -10454,14 +10454,14 @@ static int TLSX_ServerECH_Use(TLSX** extensions, void* heap,
WOLFSSL_ECH* ech; WOLFSSL_ECH* ech;
TLSX* echX; TLSX* echX;
if (extensions == NULL)
return BAD_FUNC_ARG;
/* if we already have ech don't override it */ /* if we already have ech don't override it */
echX = TLSX_Find(*extensions, TLSX_ECH); echX = TLSX_Find(*extensions, TLSX_ECH);
if (echX != NULL) if (echX != NULL)
return 0; return 0;
if (extensions == NULL)
return BAD_FUNC_ARG;
ech = (WOLFSSL_ECH*)XMALLOC(sizeof(WOLFSSL_ECH), heap, ech = (WOLFSSL_ECH*)XMALLOC(sizeof(WOLFSSL_ECH), heap,
DYNAMIC_TYPE_TMP_BUFFER); DYNAMIC_TYPE_TMP_BUFFER);

15
wolfcrypt/src/hpke.c
View File

@ -737,8 +737,8 @@ static int wc_HpkeEncap(Hpke* hpke, void* ephemeralKey, void* receiverKey,
{ {
int ret; int ret;
word32 dh_len; word32 dh_len;
word16 receiverPubKeySz = hpke->Npk; word16 receiverPubKeySz;
word16 ephemeralPubKeySz = hpke->Npk; word16 ephemeralPubKeySz;
#ifndef WOLFSSL_SMALL_STACK #ifndef WOLFSSL_SMALL_STACK
byte dh[HPKE_Ndh_MAX]; byte dh[HPKE_Ndh_MAX];
byte kemContext[HPKE_Npk_MAX * 2]; byte kemContext[HPKE_Npk_MAX * 2];
@ -752,6 +752,9 @@ static int wc_HpkeEncap(Hpke* hpke, void* ephemeralKey, void* receiverKey,
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
} }
receiverPubKeySz = hpke->Npk;
ephemeralPubKeySz = hpke->Npk;
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
dh = (byte*)XMALLOC(hpke->Ndh, hpke->heap, DYNAMIC_TYPE_TMP_BUFFER); dh = (byte*)XMALLOC(hpke->Ndh, hpke->heap, DYNAMIC_TYPE_TMP_BUFFER);
kemContext = (byte*)XMALLOC(hpke->Npk * 2, hpke->heap, kemContext = (byte*)XMALLOC(hpke->Npk * 2, hpke->heap,
@ -949,7 +952,7 @@ static int wc_HpkeDecap(Hpke* hpke, void* receiverKey, const byte* pubKey,
{ {
int ret; int ret;
word32 dh_len; word32 dh_len;
word16 receiverPubKeySz = hpke->Npk; word16 receiverPubKeySz;
void* ephemeralKey = NULL; void* ephemeralKey = NULL;
#ifndef WOLFSSL_SMALL_STACK #ifndef WOLFSSL_SMALL_STACK
byte dh[HPKE_Ndh_MAX]; byte dh[HPKE_Ndh_MAX];
@ -963,6 +966,8 @@ static int wc_HpkeDecap(Hpke* hpke, void* receiverKey, const byte* pubKey,
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
} }
receiverPubKeySz = hpke->Npk;
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
dh = (byte*)XMALLOC(hpke->Ndh, hpke->heap, DYNAMIC_TYPE_TMP_BUFFER); dh = (byte*)XMALLOC(hpke->Ndh, hpke->heap, DYNAMIC_TYPE_TMP_BUFFER);
kemContext = (byte*)XMALLOC(hpke->Npk * 2, hpke->heap, kemContext = (byte*)XMALLOC(hpke->Npk * 2, hpke->heap,
@ -1098,9 +1103,7 @@ static int wc_HpkeContextOpenBase(Hpke* hpke, HpkeBaseContext* context,
if (ret == 0) if (ret == 0)
ret = wc_AesInit(aes_key, hpke->heap, INVALID_DEVID); ret = wc_AesInit(aes_key, hpke->heap, INVALID_DEVID);
if (ret == 0) { if (ret == 0) {
if (ret == 0) { ret = wc_AesGcmSetKey(aes_key, context->key, hpke->Nk);
ret = wc_AesGcmSetKey(aes_key, context->key, hpke->Nk);
}
if (ret == 0) { if (ret == 0) {
ret = wc_AesGcmDecrypt(aes_key, out, ciphertext, ctSz, nonce, ret = wc_AesGcmDecrypt(aes_key, out, ciphertext, ctSz, nonce,
hpke->Nn, ciphertext + ctSz, hpke->Nt, aad, aadSz); hpke->Nn, ciphertext + ctSz, hpke->Nt, aad, aadSz);