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

Improve speed of mp_rand

Browse Source
This commit is contained in:
Sean Parkinson
2019-12-20 12:20:50 +10:00
parent 7d2adb2fc0
commit 75637445ee
2 changed files with 43 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
wolfcrypt/src/wolfmath.c
View File

@@ -99,46 +99,56 @@ int get_rand_digit(WC_RNG* rng, mp_digit* d)
int mp_rand(mp_int* a, int digits, WC_RNG* rng) int mp_rand(mp_int* a, int digits, WC_RNG* rng)
{ {
int ret = 0; int ret = 0;
mp_digit d; int cnt = digits * sizeof(mp_digit);
#if !defined(USE_FAST_MATH) && !defined(WOLFSSL_SP_MATH)
int i;
#endif
if (rng == NULL) { if (rng == NULL) {
ret = MISSING_RNG_E; goto exit; ret = MISSING_RNG_E;
}
else if (a == NULL) {
ret = BAD_FUNC_ARG;
} }
if (a == NULL) { #if !defined(USE_FAST_MATH) && !defined(WOLFSSL_SP_MATH)
ret = BAD_FUNC_ARG; goto exit; /* allocate space for digits */
if (ret == MP_OKAY) {
ret = mp_set_bit(a, digits * DIGIT_BIT - 1);
} }
#else
mp_zero(a); #if defined(USE_FAST_MATH)
if (digits <= 0) { if ((ret == MP_OKAY) && (digits > FP_SIZE))
ret = MP_OKAY; goto exit; #else
if ((ret == MP_OKAY) && (digits > SP_INT_DIGITS))
#endif
{
ret = BAD_FUNC_ARG;
} }
if (ret == MP_OKAY) {
/* first place a random non-zero digit */ a->used = digits;
do {
ret = get_rand_digit(rng, &d);
if (ret != 0) {
goto exit;
} }
} while (d == 0); #endif
/* fill the data with random bytes */
if ((ret = mp_add_d(a, d, a)) != MP_OKAY) { if (ret == MP_OKAY) {
goto exit; ret = wc_RNG_GenerateBlock(rng, (byte*)a->dp, cnt);
} }
if (ret == MP_OKAY) {
while (--digits > 0) { #if !defined(USE_FAST_MATH) && !defined(WOLFSSL_SP_MATH)
if ((ret = mp_lshd(a, 1)) != MP_OKAY) { /* Mask down each digit to only bits used */
goto exit; for (i = 0; i < a->used; i++) {
a->dp[i] &= MP_MASK;
} }
if ((ret = get_rand_digit(rng, &d)) != 0) { #endif
goto exit; /* ensure top digit is not zero */
} while ((ret == MP_OKAY) && (a->dp[a->used - 1] == 0)) {
if ((ret = mp_add_d(a, d, a)) != MP_OKAY) { ret = get_rand_digit(rng, &a->dp[a->used - 1]);
goto exit; #if !defined(USE_FAST_MATH) && !defined(WOLFSSL_SP_MATH)
a->dp[a->used - 1] &= MP_MASK;
#endif
} }
} }
exit:
return ret; return ret;
} }
#endif /* WC_RSA_BLINDING */ #endif /* WC_RSA_BLINDING */

3
wolfssl/wolfcrypt/sp_int.h
View File

@@ -102,6 +102,8 @@
#endif #endif
#endif #endif
#define SP_MASK (sp_digit)(-1)
#ifdef WOLFSSL_SP_MATH #ifdef WOLFSSL_SP_MATH
#include <wolfssl/wolfcrypt/random.h> #include <wolfssl/wolfcrypt/random.h>
@@ -219,6 +221,7 @@ MP_API void sp_rshb(sp_int* a, int n, sp_int* r);
#define MP_VAL -3 #define MP_VAL -3
#define DIGIT_BIT SP_WORD_SIZE #define DIGIT_BIT SP_WORD_SIZE
#define MP_MASK SP_MASK
#define CheckFastMathSettings() 1 #define CheckFastMathSettings() 1