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

RSA/DH: check for even modulus

Browse Source
This commit is contained in:
Sean Parkinson
2022-02-23 09:51:15 +10:00
parent fef8a57eb2
commit b5ed5c9b99
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
wolfcrypt/src/dh.c
View File

@ -1208,6 +1208,10 @@ static int GeneratePrivateDh(DhKey* key, WC_RNG* rng, byte* priv,
int ret = 0; int ret = 0;
word32 sz = 0; word32 sz = 0;
if (mp_iseven(&key->p) == MP_YES) {
ret = MP_VAL;
}
else
#ifndef WOLFSSL_NO_DH186 #ifndef WOLFSSL_NO_DH186
if (mp_iszero(&key->q) == MP_NO) { if (mp_iszero(&key->q) == MP_NO) {
@ -1215,7 +1219,8 @@ static int GeneratePrivateDh(DhKey* key, WC_RNG* rng, byte* priv,
* Generation Using Extra Random Bits" */ * Generation Using Extra Random Bits" */
ret = GeneratePrivateDh186(key, rng, priv, privSz); ret = GeneratePrivateDh186(key, rng, priv, privSz);
} else }
else
#endif #endif
{ {
@ -1793,6 +1798,8 @@ static int _ffc_pairwise_consistency_test(DhKey* key,
if (key == NULL || pub == NULL || priv == NULL) if (key == NULL || pub == NULL || priv == NULL)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
if (mp_iseven(&key->p) == MP_YES)
return MP_VAL;
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
publicKey = (mp_int*)XMALLOC(sizeof(mp_int), key->heap, DYNAMIC_TYPE_DH); publicKey = (mp_int*)XMALLOC(sizeof(mp_int), key->heap, DYNAMIC_TYPE_DH);
@ -1957,6 +1964,9 @@ static int wc_DhAgree_Sync(DhKey* key, byte* agree, word32* agreeSz,
#endif #endif
#endif #endif
if (mp_iseven(&key->p) == MP_YES) {
return MP_VAL;
}
#ifdef WOLFSSL_VALIDATE_FFC_IMPORT #ifdef WOLFSSL_VALIDATE_FFC_IMPORT
if (wc_DhCheckPrivKey(key, priv, privSz) != 0) { if (wc_DhCheckPrivKey(key, priv, privSz) != 0) {
WOLFSSL_MSG("wc_DhAgree wc_DhCheckPrivKey failed"); WOLFSSL_MSG("wc_DhAgree wc_DhCheckPrivKey failed");

3
wolfcrypt/src/rsa.c
View File

@ -2258,6 +2258,9 @@ static int wc_RsaFunctionSync(const byte* in, word32 inLen, byte* out,
word32 keyLen = 0; word32 keyLen = 0;
#endif #endif
if (mp_iseven(&key->n)) {
return MP_VAL;
}
#ifdef WOLFSSL_HAVE_SP_RSA #ifdef WOLFSSL_HAVE_SP_RSA
#ifndef WOLFSSL_SP_NO_2048 #ifndef WOLFSSL_SP_NO_2048
if (mp_count_bits(&key->n) == 2048) { if (mp_count_bits(&key->n) == 2048) {