提交 88f4c6f3 编写于 作者: P Peter Dettman 提交者: Emilia Kasper

Fix build errors with enable-ec_nistp_64_gcc_128

RT 3871
Reviewed-by: NRichard Levitte <levitte@openssl.org>
上级 cc01d217
...@@ -1070,7 +1070,7 @@ static void select_point(const u64 idx, unsigned int size, ...@@ -1070,7 +1070,7 @@ static void select_point(const u64 idx, unsigned int size,
unsigned i, j; unsigned i, j;
limb *outlimbs = &out[0][0]; limb *outlimbs = &out[0][0];
memset(out 0, sizeof(out)); memset(out, 0, sizeof(*out) * 3);
for (i = 0; i < size; i++) { for (i = 0; i < size; i++) {
const limb *inlimbs = &pre_comp[i][0][0]; const limb *inlimbs = &pre_comp[i][0][0];
u64 mask = i ^ idx; u64 mask = i ^ idx;
......
...@@ -1625,7 +1625,7 @@ static void select_point(const u64 idx, unsigned int size, ...@@ -1625,7 +1625,7 @@ static void select_point(const u64 idx, unsigned int size,
unsigned i, j; unsigned i, j;
u64 *outlimbs = &out[0][0]; u64 *outlimbs = &out[0][0];
memset(out, 0, sizeof(out)); memset(out, 0, sizeof(*out) * 3);
for (i = 0; i < size; i++) { for (i = 0; i < size; i++) {
const u64 *inlimbs = (u64 *)&pre_comp[i][0][0]; const u64 *inlimbs = (u64 *)&pre_comp[i][0][0];
......
...@@ -1471,7 +1471,7 @@ static void select_point(const limb idx, unsigned int size, ...@@ -1471,7 +1471,7 @@ static void select_point(const limb idx, unsigned int size,
unsigned i, j; unsigned i, j;
limb *outlimbs = &out[0][0]; limb *outlimbs = &out[0][0];
memset(out, 0, sizeof(out)); memset(out, 0, sizeof(*out) * 3);
for (i = 0; i < size; i++) { for (i = 0; i < size; i++) {
const limb *inlimbs = &pre_comp[i][0][0]; const limb *inlimbs = &pre_comp[i][0][0];
...@@ -1906,7 +1906,7 @@ int ec_GFp_nistp521_points_mul(const EC_GROUP *group, EC_POINT *r, ...@@ -1906,7 +1906,7 @@ int ec_GFp_nistp521_points_mul(const EC_GROUP *group, EC_POINT *r,
pre_comp = OPENSSL_malloc(sizeof(*pre_comp) * num_points); pre_comp = OPENSSL_malloc(sizeof(*pre_comp) * num_points);
if (mixed) if (mixed)
tmp_felems = tmp_felems =
OPENSSL_malloc(sizeof(*tmp_felemts) * (num_points * 17 + 1)); OPENSSL_malloc(sizeof(*tmp_felems) * (num_points * 17 + 1));
if ((secrets == NULL) || (pre_comp == NULL) if ((secrets == NULL) || (pre_comp == NULL)
|| (mixed && (tmp_felems == NULL))) { || (mixed && (tmp_felems == NULL))) {
ECerr(EC_F_EC_GFP_NISTP521_POINTS_MUL, ERR_R_MALLOC_FAILURE); ECerr(EC_F_EC_GFP_NISTP521_POINTS_MUL, ERR_R_MALLOC_FAILURE);
...@@ -1918,7 +1918,7 @@ int ec_GFp_nistp521_points_mul(const EC_GROUP *group, EC_POINT *r, ...@@ -1918,7 +1918,7 @@ int ec_GFp_nistp521_points_mul(const EC_GROUP *group, EC_POINT *r,
* i.e., they contribute nothing to the linear combination * i.e., they contribute nothing to the linear combination
*/ */
memset(secrets, 0, sizeof(*secrets) * num_points); memset(secrets, 0, sizeof(*secrets) * num_points);
memset(pre_comp, 0, sizseof(*pre_comp) * num_points); memset(pre_comp, 0, sizeof(*pre_comp) * num_points);
for (i = 0; i < num_points; ++i) { for (i = 0; i < num_points; ++i) {
if (i == num) if (i == num)
/* /*
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册