mirrors/wolfssl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update hpke to not use rng with ecc when hardening is off

Browse Source
This commit is contained in:
John Bland 2023-01-23 11:27:23 -05:00
parent a40da56f11
commit a36276ca3a
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
wolfcrypt/src/hpke.c
View File

@ -736,6 +736,7 @@ static int wc_HpkeEncap(Hpke* hpke, void* ephemeralKey, void* receiverKey,
byte* sharedSecret)
{
int ret;
WC_RNG* rng;
word32 dh_len;
word16 receiverPubKeySz;
word16 ephemeralPubKeySz;
@ -775,12 +776,17 @@ 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);
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 +957,7 @@ static int wc_HpkeDecap(Hpke* hpke, void* receiverKey, const byte* pubKey,
word16 pubKeySz, byte* sharedSecret)
{
int ret;
WC_RNG* rng;
word32 dh_len;
word16 receiverPubKeySz;
void* ephemeralKey = NULL;
@ -992,12 +999,17 @@ 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);
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)