feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

add proper locking to fp ecc

Browse Source
This commit is contained in:
toddouska
2013-09-06 16:53:33 -07:00
parent a14af5f0b0
commit 6e05d4317f
2 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
ctaocrypt/src/ecc.c
View File

@@ -2102,7 +2102,8 @@ static struct {
/* permitted (0) or not (1) */ /* permitted (0) or not (1) */
} fp_cache[FP_ENTRIES]; } fp_cache[FP_ENTRIES];
//LTC_MUTEX_GLOBAL(ltc_ecc_fp_lock) static volatile int initMutex = 0; /* prevent multiple mutex inits */
static CyaSSL_Mutex ecc_fp_lock;
/* simple table to help direct the generation of the LUT */ /* simple table to help direct the generation of the LUT */
static const struct { static const struct {
@@ -3214,8 +3215,15 @@ int ecc_mul2add(ecc_point* A, mp_int* kA,
int idx1, idx2, err = MP_OKAY, mpInit = 0; int idx1, idx2, err = MP_OKAY, mpInit = 0;
mp_digit mp; mp_digit mp;
mp_int mu; mp_int mu;
if (initMutex == 0) {
InitMutex(&ecc_fp_lock);
initMutex = 1;
}
//LTC_MUTEX_LOCK(&ltc_ecc_fp_lock); if (LockMutex(&ecc_fp_lock) != 0)
return BAD_MUTEX_E;
/* find point */ /* find point */
idx1 = find_base(A); idx1 = find_base(A);
@@ -3312,7 +3320,7 @@ int ecc_mul2add(ecc_point* A, mp_int* kA,
} }
} }
//LTC_MUTEX_UNLOCK(&ltc_ecc_fp_lock); UnLockMutex(&ecc_fp_lock);
mp_clear(&mu); mp_clear(&mu);
return err; return err;
@@ -3339,7 +3347,14 @@ int ecc_mulmod(mp_int* k, ecc_point *G, ecc_point *R, mp_int* modulus,
if (mp_init(&mu) != MP_OKAY) if (mp_init(&mu) != MP_OKAY)
return MP_INIT_E; return MP_INIT_E;
//LTC_MUTEX_LOCK(&ltc_ecc_fp_lock); if (initMutex == 0) {
InitMutex(&ecc_fp_lock);
initMutex = 1;
}
if (LockMutex(&ecc_fp_lock) != 0)
return BAD_MUTEX_E;
/* find point */ /* find point */
idx = find_base(G); idx = find_base(G);
@@ -3388,7 +3403,7 @@ int ecc_mulmod(mp_int* k, ecc_point *G, ecc_point *R, mp_int* modulus,
} }
} }
//LTC_MUTEX_UNLOCK(&ltc_ecc_fp_lock); UnLockMutex(&ecc_fp_lock);
mp_clear(&mu); mp_clear(&mu);
return err; return err;
@@ -3417,9 +3432,15 @@ static void ecc_fp_free_cache(void)
/** Free the Fixed Point cache */ /** Free the Fixed Point cache */
void ecc_fp_free(void) void ecc_fp_free(void)
{ {
//LTC_MUTEX_LOCK(&ltc_ecc_fp_lock); if (initMutex == 0) {
ecc_fp_free_cache(); InitMutex(&ecc_fp_lock);
//LTC_MUTEX_UNLOCK(&ltc_ecc_fp_lock); initMutex = 1;
}
if (LockMutex(&ecc_fp_lock) == 0) {
ecc_fp_free_cache();
UnLockMutex(&ecc_fp_lock);
}
} }

6
cyassl/ctaocrypt/ecc.h
View File

@@ -116,12 +116,6 @@ int ecc_size(ecc_key* key);
CYASSL_API CYASSL_API
int ecc_sig_size(ecc_key* key); int ecc_sig_size(ecc_key* key);
/* TODO: fix mutex types */
#define MUTEX_GLOBAL(x) int (x);
#define MUTEX_LOCK(x)
#define MUTEX_UNLOCK(x)
#ifdef __cplusplus #ifdef __cplusplus
} /* extern "C" */ } /* extern "C" */