generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ec_mult.c: fix C4334 win64 compiler warning.

Browse Source
This commit is contained in:
Andy Polyakov 2009-05-02 11:18:44 +00:00
parent 0fe4621e19
commit 194274cb68
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
crypto/ec/ec_mult.c
View File

@ -419,7 +419,7 @@ int ec_wNAF_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,
if (numblocks > pre_comp->numblocks) if (numblocks > pre_comp->numblocks)
numblocks = pre_comp->numblocks; numblocks = pre_comp->numblocks;
pre_points_per_block = 1u << (pre_comp->w - 1); pre_points_per_block = (size_t)1 << (pre_comp->w - 1);
/* check that pre_comp looks sane */ /* check that pre_comp looks sane */
if (pre_comp->num != (pre_comp->numblocks * pre_points_per_block)) if (pre_comp->num != (pre_comp->numblocks * pre_points_per_block))
@ -461,7 +461,7 @@ int ec_wNAF_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,
bits = i < num ? BN_num_bits(scalars[i]) : BN_num_bits(scalar); bits = i < num ? BN_num_bits(scalars[i]) : BN_num_bits(scalar);
wsize[i] = EC_window_bits_for_scalar_size(bits); wsize[i] = EC_window_bits_for_scalar_size(bits);
num_val += 1u << (wsize[i] - 1); num_val += (size_t)1 << (wsize[i] - 1);
wNAF[i + 1] = NULL; /* make sure we always have a pivot */ wNAF[i + 1] = NULL; /* make sure we always have a pivot */
wNAF[i] = compute_wNAF((i < num ? scalars[i] : scalar), wsize[i], &wNAF_len[i]); wNAF[i] = compute_wNAF((i < num ? scalars[i] : scalar), wsize[i], &wNAF_len[i]);
if (wNAF[i] == NULL) if (wNAF[i] == NULL)
@ -600,7 +600,7 @@ int ec_wNAF_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,
for (i = 0; i < num + num_scalar; i++) for (i = 0; i < num + num_scalar; i++)
{ {
val_sub[i] = v; val_sub[i] = v;
for (j = 0; j < (1u << (wsize[i] - 1)); j++) for (j = 0; j < ((size_t)1 << (wsize[i] - 1)); j++)
{ {
*v = EC_POINT_new(group); *v = EC_POINT_new(group);
if (*v == NULL) goto err; if (*v == NULL) goto err;
@ -636,7 +636,7 @@ int ec_wNAF_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,
if (wsize[i] > 1) if (wsize[i] > 1)
{ {
if (!EC_POINT_dbl(group, tmp, val_sub[i][0], ctx)) goto err; if (!EC_POINT_dbl(group, tmp, val_sub[i][0], ctx)) goto err;
for (j = 1; j < (1u << (wsize[i] - 1)); j++) for (j = 1; j < ((size_t)1 << (wsize[i] - 1)); j++)
{ {
if (!EC_POINT_add(group, val_sub[i][j], val_sub[i][j - 1], tmp, ctx)) goto err; if (!EC_POINT_add(group, val_sub[i][j], val_sub[i][j - 1], tmp, ctx)) goto err;
} }
@ -820,7 +820,7 @@ int ec_wNAF_precompute_mult(EC_GROUP *group, BN_CTX *ctx)
numblocks = (bits + blocksize - 1) / blocksize; /* max. number of blocks to use for wNAF splitting */ numblocks = (bits + blocksize - 1) / blocksize; /* max. number of blocks to use for wNAF splitting */
pre_points_per_block = 1u << (w - 1); pre_points_per_block = (size_t)1 << (w - 1);
num = pre_points_per_block * numblocks; /* number of points to compute and store */ num = pre_points_per_block * numblocks; /* number of points to compute and store */
points = OPENSSL_malloc(sizeof (EC_POINT*)*(num + 1)); points = OPENSSL_malloc(sizeof (EC_POINT*)*(num + 1));