forked from wolfSSL/wolfssl
switch timing resistant exptmod to use temp for square instead of leaking key bit to cache monitor
This commit is contained in:
@ -1035,13 +1035,29 @@ int fp_addmod(fp_int *a, fp_int *b, fp_int *c, fp_int *d)
|
|||||||
|
|
||||||
#ifdef TFM_TIMING_RESISTANT
|
#ifdef TFM_TIMING_RESISTANT
|
||||||
|
|
||||||
|
/* all off / all on pointer addresses for constant calculations */
|
||||||
|
static const wolfssl_word off_on_addr[2] =
|
||||||
|
{
|
||||||
|
#if defined(WC_64BIT_CPU)
|
||||||
|
W64LIT(0x0000000000000000),
|
||||||
|
W64LIT(0xffffffffffffffff)
|
||||||
|
#elif defined(WC_16BIT_CPU)
|
||||||
|
0x0000U,
|
||||||
|
0xffffU
|
||||||
|
#else
|
||||||
|
/* 32 bit */
|
||||||
|
0x00000000U,
|
||||||
|
0xffffffffU
|
||||||
|
#endif
|
||||||
|
};
|
||||||
|
|
||||||
/* timing resistant montgomery ladder based exptmod
|
/* timing resistant montgomery ladder based exptmod
|
||||||
Based on work by Marc Joye, Sung-Ming Yen, "The Montgomery Powering Ladder",
|
Based on work by Marc Joye, Sung-Ming Yen, "The Montgomery Powering Ladder",
|
||||||
Cryptographic Hardware and Embedded Systems, CHES 2002
|
Cryptographic Hardware and Embedded Systems, CHES 2002
|
||||||
*/
|
*/
|
||||||
static int _fp_exptmod(fp_int * G, fp_int * X, fp_int * P, fp_int * Y)
|
static int _fp_exptmod(fp_int * G, fp_int * X, fp_int * P, fp_int * Y)
|
||||||
{
|
{
|
||||||
fp_int R[2];
|
fp_int R[3];
|
||||||
fp_digit buf, mp;
|
fp_digit buf, mp;
|
||||||
int err, bitcnt, digidx, y;
|
int err, bitcnt, digidx, y;
|
||||||
|
|
||||||
@ -1052,6 +1068,7 @@ static int _fp_exptmod(fp_int * G, fp_int * X, fp_int * P, fp_int * Y)
|
|||||||
|
|
||||||
fp_init(&R[0]);
|
fp_init(&R[0]);
|
||||||
fp_init(&R[1]);
|
fp_init(&R[1]);
|
||||||
|
fp_init(&R[2]);
|
||||||
|
|
||||||
/* now we need R mod m */
|
/* now we need R mod m */
|
||||||
fp_montgomery_calc_normalization (&R[0], P);
|
fp_montgomery_calc_normalization (&R[0], P);
|
||||||
@ -1092,7 +1109,17 @@ static int _fp_exptmod(fp_int * G, fp_int * X, fp_int * P, fp_int * Y)
|
|||||||
|
|
||||||
/* do ops */
|
/* do ops */
|
||||||
fp_mul(&R[0], &R[1], &R[y^1]); fp_montgomery_reduce(&R[y^1], P, mp);
|
fp_mul(&R[0], &R[1], &R[y^1]); fp_montgomery_reduce(&R[y^1], P, mp);
|
||||||
fp_sqr(&R[y], &R[y]); fp_montgomery_reduce(&R[y], P, mp);
|
|
||||||
|
/* instead of using R[y] for sqr, which leaks key bit to cache monitor,
|
||||||
|
* use R[2] as temp, make sure address calc is constant, keep
|
||||||
|
* &R[0] and &R[1] in cache */
|
||||||
|
fp_copy((fp_int*) ( ((wolfssl_word)&R[0] & off_on_addr[(y^1)]) +
|
||||||
|
((wolfssl_word)&R[1] & off_on_addr[y]) ),
|
||||||
|
&R[2]);
|
||||||
|
fp_sqr(&R[2], &R[2]); fp_montgomery_reduce(&R[2], P, mp);
|
||||||
|
fp_copy(&R[2],
|
||||||
|
(fp_int*) ( ((wolfssl_word)&R[0] & off_on_addr[(y^1)]) +
|
||||||
|
((wolfssl_word)&R[1] & off_on_addr[y]) ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
fp_montgomery_reduce(&R[0], P, mp);
|
fp_montgomery_reduce(&R[0], P, mp);
|
||||||
|
@ -91,6 +91,7 @@
|
|||||||
defined(__mips64) || defined(__x86_64__) || defined(_M_X64)) || \
|
defined(__mips64) || defined(__x86_64__) || defined(_M_X64)) || \
|
||||||
defined(__aarch64__)
|
defined(__aarch64__)
|
||||||
typedef word64 wolfssl_word;
|
typedef word64 wolfssl_word;
|
||||||
|
#define WC_64BIT_CPU
|
||||||
#else
|
#else
|
||||||
typedef word32 wolfssl_word;
|
typedef word32 wolfssl_word;
|
||||||
#ifdef WORD64_AVAILABLE
|
#ifdef WORD64_AVAILABLE
|
||||||
|
Reference in New Issue
Block a user