PR: 2632

[openssl.git] / crypto / ec / ec2_smpl.c

diff --git a/crypto/ec/ec2_smpl.c b/crypto/ec/ec2_smpl.c
index 1132c8e5afa828333202066c3d0309a583504b0e..c06b3b667f0bfedd793fe094f869abf00c0a60c1 100644 (file)
--- a/crypto/ec/ec2_smpl.c
+++ b/crypto/ec/ec2_smpl.c
@@ -174,8 +174,10 @@ int ec_GF2m_simple_group_copy(EC_GROUP *dest, const EC_GROUP *src)
        dest->poly[2] = src->poly[2];
        dest->poly[3] = src->poly[3];
        dest->poly[4] = src->poly[4];
-       bn_wexpand(&dest->a, (int)(dest->poly[0] + BN_BITS2 - 1) / BN_BITS2);
-       bn_wexpand(&dest->b, (int)(dest->poly[0] + BN_BITS2 - 1) / BN_BITS2);
+       if(bn_wexpand(&dest->a, (int)(dest->poly[0] + BN_BITS2 - 1) / BN_BITS2) == NULL)
+               return 0;
+       if(bn_wexpand(&dest->b, (int)(dest->poly[0] + BN_BITS2 - 1) / BN_BITS2) == NULL)
+               return 0;
        for (i = dest->a.top; i < dest->a.dmax; i++) dest->a.d[i] = 0;
        for (i = dest->b.top; i < dest->b.dmax; i++) dest->b.d[i] = 0;
        return 1;
@@ -199,12 +201,12 @@ int ec_GF2m_simple_group_set_curve(EC_GROUP *group,
 
        /* group->a */
        if (!BN_GF2m_mod_arr(&group->a, a, group->poly)) goto err;
-       bn_wexpand(&group->a, (int)(group->poly[0] + BN_BITS2 - 1) / BN_BITS2);
+       if(bn_wexpand(&group->a, (int)(group->poly[0] + BN_BITS2 - 1) / BN_BITS2) == NULL) goto err;
        for (i = group->a.top; i < group->a.dmax; i++) group->a.d[i] = 0;
        
        /* group->b */
        if (!BN_GF2m_mod_arr(&group->b, b, group->poly)) goto err;
-       bn_wexpand(&group->b, (int)(group->poly[0] + BN_BITS2 - 1) / BN_BITS2);
+       if(bn_wexpand(&group->b, (int)(group->poly[0] + BN_BITS2 - 1) / BN_BITS2) == NULL) goto err;
        for (i = group->b.top; i < group->b.dmax; i++) group->b.d[i] = 0;
                
        ret = 1;
@@ -281,7 +283,8 @@ int ec_GF2m_simple_group_check_discriminant(const EC_GROUP *group, BN_CTX *ctx)
        ret = 1;
 
 err:
-       BN_CTX_end(ctx);
+       if (ctx != NULL)
+               BN_CTX_end(ctx);
        if (new_ctx != NULL)
                BN_CTX_free(new_ctx);
        return ret;
@@ -354,11 +357,11 @@ int ec_GF2m_simple_point_set_affine_coordinates(const EC_GROUP *group, EC_POINT
                }
 
        if (!BN_copy(&point->X, x)) goto err;
-       BN_set_sign(&point->X, 0);
+       BN_set_negative(&point->X, 0);
        if (!BN_copy(&point->Y, y)) goto err;
-       BN_set_sign(&point->Y, 0);
+       BN_set_negative(&point->Y, 0);
        if (!BN_copy(&point->Z, BN_value_one())) goto err;
-       BN_set_sign(&point->Z, 0);
+       BN_set_negative(&point->Z, 0);
        point->Z_is_one = 1;
        ret = 1;
 
@@ -389,12 +392,12 @@ int ec_GF2m_simple_point_get_affine_coordinates(const EC_GROUP *group, const EC_
        if (x != NULL)
                {
                if (!BN_copy(x, &point->X)) goto err;
-               BN_set_sign(x, 0);
+               BN_set_negative(x, 0);
                }
        if (y != NULL)
                {
                if (!BN_copy(y, &point->Y)) goto err;
-               BN_set_sign(y, 0);
+               BN_set_negative(y, 0);
                }
        ret = 1;
                
@@ -575,7 +578,7 @@ int ec_GF2m_simple_oct2point(const EC_GROUP *group, EC_POINT *point,
                }
        form = buf[0];
        y_bit = form & 1;
-       form = form & ~1;
+       form = form & ~1U;
        if ((form != 0) && (form != POINT_CONVERSION_COMPRESSED)
                && (form != POINT_CONVERSION_UNCOMPRESSED)
                && (form != POINT_CONVERSION_HYBRID))
@@ -805,15 +808,20 @@ int ec_GF2m_simple_is_at_infinity(const EC_GROUP *group, const EC_POINT *point)
  */
 int ec_GF2m_simple_is_on_curve(const EC_GROUP *group, const EC_POINT *point, BN_CTX *ctx)
        {
-       BN_CTX *new_ctx = NULL;
-       BIGNUM *rh, *lh, *tmp1;
        int ret = -1;
+       BN_CTX *new_ctx = NULL;
+       BIGNUM *lh, *y2;
+       int (*field_mul)(const EC_GROUP *, BIGNUM *, const BIGNUM *, const BIGNUM *, BN_CTX *);
+       int (*field_sqr)(const EC_GROUP *, BIGNUM *, const BIGNUM *, BN_CTX *);
 
        if (EC_POINT_is_at_infinity(group, point))
                return 1;
-       
+
+       field_mul = group->meth->field_mul;
+       field_sqr = group->meth->field_sqr;     
+
        /* only support affine coordinates */
-       if (!point->Z_is_one) goto err;
+       if (!point->Z_is_one) return -1;
 
        if (ctx == NULL)
                {
@@ -823,37 +831,23 @@ int ec_GF2m_simple_is_on_curve(const EC_GROUP *group, const EC_POINT *point, BN_
                }
 
        BN_CTX_start(ctx);
-       rh = BN_CTX_get(ctx);
+       y2 = BN_CTX_get(ctx);
        lh = BN_CTX_get(ctx);
-       tmp1 = BN_CTX_get(ctx);
-       if (tmp1 == NULL) goto err;
+       if (lh == NULL) goto err;
 
        /* We have a curve defined by a Weierstrass equation
         *      y^2 + x*y = x^3 + a*x^2 + b.
-        * To test this, we add up the right-hand side in 'rh'
-        * and the left-hand side in 'lh'.
+        *  <=> x^3 + a*x^2 + x*y + b + y^2 = 0
+        *  <=> ((x + a) * x + y ) * x + b + y^2 = 0
         */
-
-       /* rh := X^3 */
-       if (!group->meth->field_sqr(group, tmp1, &point->X, ctx)) goto err;
-       if (!group->meth->field_mul(group, rh, tmp1, &point->X, ctx)) goto err;
-
-       /* rh := rh + a*X^2 */
-       if (!group->meth->field_mul(group, tmp1, tmp1, &group->a, ctx)) goto err;
-       if (!BN_GF2m_add(rh, rh, tmp1)) goto err;
-
-       /* rh := rh + b */
-       if (!BN_GF2m_add(rh, rh, &group->b)) goto err;
-
-       /* lh := Y^2 */
-       if (!group->meth->field_sqr(group, lh, &point->Y, ctx)) goto err;
-
-       /* lh := lh + x*y */
-       if (!group->meth->field_mul(group, tmp1, &point->X, &point->Y, ctx)) goto err;
-       if (!BN_GF2m_add(lh, lh, tmp1)) goto err;
-
-       ret = (0 == BN_GF2m_cmp(lh, rh));
-
+       if (!BN_GF2m_add(lh, &point->X, &group->a)) goto err;
+       if (!field_mul(group, lh, lh, &point->X, ctx)) goto err;
+       if (!BN_GF2m_add(lh, lh, &point->Y)) goto err;
+       if (!field_mul(group, lh, lh, &point->X, ctx)) goto err;
+       if (!BN_GF2m_add(lh, lh, &group->b)) goto err;
+       if (!field_sqr(group, y2, &point->Y, ctx)) goto err;
+       if (!BN_GF2m_add(lh, lh, y2)) goto err;
+       ret = BN_is_zero(lh);
  err:
        if (ctx) BN_CTX_end(ctx);
        if (new_ctx) BN_CTX_free(new_ctx);
@@ -877,6 +871,9 @@ int ec_GF2m_simple_cmp(const EC_GROUP *group, const EC_POINT *a, const EC_POINT
                {
                return EC_POINT_is_at_infinity(group, b) ? 0 : 1;
                }
+
+       if (EC_POINT_is_at_infinity(group, b))
+               return 1;
        
        if (a->Z_is_one && b->Z_is_one)
                {