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

add missing NULL checks and remove rng pointer when not needed

Browse Source
This commit is contained in:
John Bland
2023-01-23 16:03:58 -05:00
parent a36276ca3a
commit 44ca98f5b3
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
wolfcrypt/src/hpke.c
View File

@ -736,7 +736,9 @@ static int wc_HpkeEncap(Hpke* hpke, void* ephemeralKey, void* receiverKey,
byte* sharedSecret) byte* sharedSecret)
{ {
int ret; int ret;
#ifdef ECC_TIMING_RESISTANT
WC_RNG* rng; WC_RNG* rng;
#endif
word32 dh_len; word32 dh_len;
word16 receiverPubKeySz; word16 receiverPubKeySz;
word16 ephemeralPubKeySz; word16 ephemeralPubKeySz;
@ -778,6 +780,10 @@ static int wc_HpkeEncap(Hpke* hpke, void* ephemeralKey, void* receiverKey,
case DHKEM_P521_HKDF_SHA512: case DHKEM_P521_HKDF_SHA512:
#ifdef ECC_TIMING_RESISTANT #ifdef ECC_TIMING_RESISTANT
rng = wc_rng_new(NULL, 0, hpke->heap); rng = wc_rng_new(NULL, 0, hpke->heap);
if (rng == NULL)
return RNG_FAILURE_E;
wc_ecc_set_rng((ecc_key*)ephemeralKey, rng); wc_ecc_set_rng((ecc_key*)ephemeralKey, rng);
#endif #endif
@ -957,7 +963,9 @@ static int wc_HpkeDecap(Hpke* hpke, void* receiverKey, const byte* pubKey,
word16 pubKeySz, byte* sharedSecret) word16 pubKeySz, byte* sharedSecret)
{ {
int ret; int ret;
#ifdef ECC_TIMING_RESISTANT
WC_RNG* rng; WC_RNG* rng;
#endif
word32 dh_len; word32 dh_len;
word16 receiverPubKeySz; word16 receiverPubKeySz;
void* ephemeralKey = NULL; void* ephemeralKey = NULL;
@ -1001,6 +1009,10 @@ static int wc_HpkeDecap(Hpke* hpke, void* receiverKey, const byte* pubKey,
case DHKEM_P521_HKDF_SHA512: case DHKEM_P521_HKDF_SHA512:
#ifdef ECC_TIMING_RESISTANT #ifdef ECC_TIMING_RESISTANT
rng = wc_rng_new(NULL, 0, hpke->heap); rng = wc_rng_new(NULL, 0, hpke->heap);
if (rng == NULL)
return RNG_FAILURE_E;
wc_ecc_set_rng((ecc_key*)receiverKey, rng); wc_ecc_set_rng((ecc_key*)receiverKey, rng);
#endif #endif