wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-01 03:34:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6004 from jpbland1/hpke-disable-harden

Browse Source 
update hpke to not use rng with ecc when hardening is off
This commit is contained in:
David Garske
2023-01-23 15:09:30 -08:00
committed by GitHub
parent a24a1c8530 44ca98f5b3
commit 4b8ab2550d
1 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
wolfcrypt/src/hpke.c
View File

@@ -736,6 +736,9 @@ static int wc_HpkeEncap(Hpke* hpke, void* ephemeralKey, void* receiverKey,
byte* sharedSecret)
{
int ret;
#ifdef ECC_TIMING_RESISTANT
WC_RNG* rng;
#endif
word32 dh_len;
word16 receiverPubKeySz;
word16 ephemeralPubKeySz;
@@ -775,12 +778,21 @@ static int wc_HpkeEncap(Hpke* hpke, void* ephemeralKey, void* receiverKey,
case DHKEM_P256_HKDF_SHA256:
case DHKEM_P384_HKDF_SHA384:
case DHKEM_P521_HKDF_SHA512:
((ecc_key*)ephemeralKey)->rng = wc_rng_new(NULL, 0, hpke->heap);
#ifdef ECC_TIMING_RESISTANT
rng = wc_rng_new(NULL, 0, hpke->heap);
if (rng == NULL)
return RNG_FAILURE_E;
wc_ecc_set_rng((ecc_key*)ephemeralKey, rng);
#endif
ret = wc_ecc_shared_secret((ecc_key*)ephemeralKey,
(ecc_key*)receiverKey, dh, &dh_len);
wc_rng_free(((ecc_key*)ephemeralKey)->rng);
#ifdef ECC_TIMING_RESISTANT
wc_rng_free(rng);
#endif
break;
#endif
#if defined(HAVE_CURVE25519)
@@ -951,6 +963,9 @@ static int wc_HpkeDecap(Hpke* hpke, void* receiverKey, const byte* pubKey,
word16 pubKeySz, byte* sharedSecret)
{
int ret;
#ifdef ECC_TIMING_RESISTANT
WC_RNG* rng;
#endif
word32 dh_len;
word16 receiverPubKeySz;
void* ephemeralKey = NULL;
@@ -992,12 +1007,21 @@ static int wc_HpkeDecap(Hpke* hpke, void* receiverKey, const byte* pubKey,
case DHKEM_P256_HKDF_SHA256:
case DHKEM_P384_HKDF_SHA384:
case DHKEM_P521_HKDF_SHA512:
((ecc_key*)receiverKey)->rng = wc_rng_new(NULL, 0, hpke->heap);
#ifdef ECC_TIMING_RESISTANT
rng = wc_rng_new(NULL, 0, hpke->heap);
if (rng == NULL)
return RNG_FAILURE_E;
wc_ecc_set_rng((ecc_key*)receiverKey, rng);
#endif
ret = wc_ecc_shared_secret((ecc_key*)receiverKey,
(ecc_key*)ephemeralKey, dh, &dh_len);
wc_rng_free(((ecc_key*)receiverKey)->rng);
#ifdef ECC_TIMING_RESISTANT
wc_rng_free(rng);
#endif
break;
#endif
#if defined(HAVE_CURVE25519)