Further improve/fix ec_GFp_simple_points_make_affine (ecp_smpl.c) and

group_order_tests (ectest.c).  Also fix the EC_POINTs_mul documentation (ec.h).

Reviewed-by: emilia@openssl.org

diff --git a/crypto/ec/ec.h b/crypto/ec/ec.h
index c357b2736d832bdf48c6aeb4b7641d9c5cd2fcc3..fbec3226d4197215b048edf430deae8a0174fd39 100644 (file)
--- a/crypto/ec/ec.h
+++ b/crypto/ec/ec.h
@@ -633,7 +633,7 @@ int EC_POINT_cmp(const EC_GROUP *group, const EC_POINT *a, const EC_POINT *b, BN
 int EC_POINT_make_affine(const EC_GROUP *group, EC_POINT *point, BN_CTX *ctx);
 int EC_POINTs_make_affine(const EC_GROUP *group, size_t num, EC_POINT *points[], BN_CTX *ctx);
 
-/** Computes r = generator * n sum_{i=0}^num p[i] * m[i]
+/** Computes r = generator * n sum_{i=0}^{num-1} p[i] * m[i]
  *  \param  group  underlying EC_GROUP object
  *  \param  r      EC_POINT object for the result
  *  \param  n      BIGNUM with the multiplier for the group generator (optional)

diff --git a/crypto/ec/ecp_smpl.c b/crypto/ec/ecp_smpl.c
index f2cd6f7e55c9db5c2e82ab0d4386c81e53010415..77bf845bcb60bdc2ebd52f0c0411976474eb3742 100644 (file)
--- a/crypto/ec/ecp_smpl.c
+++ b/crypto/ec/ecp_smpl.c
@@ -1311,8 +1311,8 @@ int ec_GFp_simple_points_make_affine(const EC_GROUP *group, size_t num, EC_POINT
                {
                for (i = 0; i < num; i++)
                        {
-                       if (prod_Z[i] != NULL)
-                               BN_clear_free(prod_Z[i]);
+                       if (prod_Z[i] == NULL) break;
+                       BN_clear_free(prod_Z[i]);
                        }
                OPENSSL_free(prod_Z);
                }

diff --git a/crypto/ec/ectest.c b/crypto/ec/ectest.c
index 82c8c8bfb119c6cbc73413ee25969404af2cc8ac..d1bf980599c8ace2cd5fe06049ab9da07a75e30b 100644 (file)
--- a/crypto/ec/ectest.c
+++ b/crypto/ec/ectest.c
@@ -251,14 +251,15 @@ static void group_order_tests(EC_GROUP *group)
                if (!EC_POINT_is_at_infinity(group, Q)) ABORT;
 
                /* Exercise EC_POINTs_mul, including corner cases. */
+               if (EC_POINT_is_at_infinity(group, P)) ABORT;
                scalars[0] = n1; points[0] = Q; /* => infinity */
                scalars[1] = n2; points[1] = P; /* => -P */
                scalars[2] = n1; points[2] = Q; /* => infinity */
                scalars[3] = n2; points[3] = Q; /* => infinity */
                scalars[4] = n1; points[4] = P; /* => P */
                scalars[5] = n2; points[5] = Q; /* => infinity */
-               if (!EC_POINTs_mul(group, Q, NULL, 5, points, scalars, ctx)) ABORT;
-               if (!EC_POINT_is_at_infinity(group, Q)) ABORT;
+               if (!EC_POINTs_mul(group, P, NULL, 6, points, scalars, ctx)) ABORT;
+               if (!EC_POINT_is_at_infinity(group, P)) ABORT;
                }
        fprintf(stdout, "ok\n");