Commit 9cc570d4 authored by Matt Caswell's avatar Matt Caswell
Browse files

Use the new non-curve type specific EC functions internally 



Fixes #6646

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6815)
parent de34e45a

apps/ecparam.c

+1 −1
Original line number Diff line number Diff line
@@ -299,7 +299,7 @@ int ecparam_main(int argc, char **argv) 
            goto end;

        }



        if (!EC_GROUP_get_curve_GFp(group, ec_p, ec_a, ec_b, NULL))

        if (!EC_GROUP_get_curve(group, ec_p, ec_a, ec_b, NULL))

            goto end;



        if ((point = EC_GROUP_get0_generator(group)) == NULL)

crypto/ec/ec2_oct.c

+5 −6
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ int ec_GF2m_simple_set_compressed_coordinates(const EC_GROUP *group, 
        }

    }



    if (!EC_POINT_set_affine_coordinates_GF2m(group, point, x, y, ctx))

    if (!EC_POINT_set_affine_coordinates(group, point, x, y, ctx))

        goto err;



    ret = 1;
@@ -166,7 +166,7 @@ size_t ec_GF2m_simple_point2oct(const EC_GROUP *group, const EC_POINT *point, 
        if (yxi == NULL)

            goto err;



        if (!EC_POINT_get_affine_coordinates_GF2m(group, point, x, y, ctx))

        if (!EC_POINT_get_affine_coordinates(group, point, x, y, ctx))

            goto err;



        buf[0] = form;
@@ -301,8 +301,7 @@ int ec_GF2m_simple_oct2point(const EC_GROUP *group, EC_POINT *point, 
    }



    if (form == POINT_CONVERSION_COMPRESSED) {

        if (!EC_POINT_set_compressed_coordinates_GF2m

            (group, point, x, y_bit, ctx))

        if (!EC_POINT_set_compressed_coordinates(group, point, x, y_bit, ctx))

            goto err;

    } else {

        if (!BN_bin2bn(buf + 1 + field_len, field_len, y))
@@ -321,10 +320,10 @@ int ec_GF2m_simple_oct2point(const EC_GROUP *group, EC_POINT *point, 
        }



        /*

         * EC_POINT_set_affine_coordinates_GF2m is responsible for checking that

         * EC_POINT_set_affine_coordinates is responsible for checking that

         * the point is on the curve.

         */

        if (!EC_POINT_set_affine_coordinates_GF2m(group, point, x, y, ctx))

        if (!EC_POINT_set_affine_coordinates(group, point, x, y, ctx))

            goto err;

    }

crypto/ec/ec2_smpl.c

+6 −6
Original line number Diff line number Diff line
@@ -390,7 +390,7 @@ int ec_GF2m_simple_add(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a, 
        if (!BN_copy(y0, a->Y))

            goto err;

    } else {

        if (!EC_POINT_get_affine_coordinates_GF2m(group, a, x0, y0, ctx))

        if (!EC_POINT_get_affine_coordinates(group, a, x0, y0, ctx))

            goto err;

    }

    if (b->Z_is_one) {
@@ -399,7 +399,7 @@ int ec_GF2m_simple_add(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a, 
        if (!BN_copy(y1, b->Y))

            goto err;

    } else {

        if (!EC_POINT_get_affine_coordinates_GF2m(group, b, x1, y1, ctx))

        if (!EC_POINT_get_affine_coordinates(group, b, x1, y1, ctx))

            goto err;

    }
@@ -447,7 +447,7 @@ int ec_GF2m_simple_add(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a, 
    if (!BN_GF2m_add(y2, y2, y1))

        goto err;



    if (!EC_POINT_set_affine_coordinates_GF2m(group, r, x2, y2, ctx))

    if (!EC_POINT_set_affine_coordinates(group, r, x2, y2, ctx))

        goto err;



    ret = 1;
@@ -590,9 +590,9 @@ int ec_GF2m_simple_cmp(const EC_GROUP *group, const EC_POINT *a, 
    if (bY == NULL)

        goto err;



    if (!EC_POINT_get_affine_coordinates_GF2m(group, a, aX, aY, ctx))

    if (!EC_POINT_get_affine_coordinates(group, a, aX, aY, ctx))

        goto err;

    if (!EC_POINT_get_affine_coordinates_GF2m(group, b, bX, bY, ctx))

    if (!EC_POINT_get_affine_coordinates(group, b, bX, bY, ctx))

        goto err;

    ret = ((BN_cmp(aX, bX) == 0) && BN_cmp(aY, bY) == 0) ? 0 : 1;
@@ -625,7 +625,7 @@ int ec_GF2m_simple_make_affine(const EC_GROUP *group, EC_POINT *point, 
    if (y == NULL)

        goto err;



    if (!EC_POINT_get_affine_coordinates_GF2m(group, point, x, y, ctx))

    if (!EC_POINT_get_affine_coordinates(group, point, x, y, ctx))

        goto err;

    if (!BN_copy(point->X, x))

        goto err;

crypto/ec/ec_asn1.c

+5 −17
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ static int ec_asn1_group2fieldid(const EC_GROUP *group, X9_62_FIELDID *field) 
            goto err;

        }

        /* the parameters are specified by the prime number p */

        if (!EC_GROUP_get_curve_GFp(group, tmp, NULL, NULL, NULL)) {

        if (!EC_GROUP_get_curve(group, tmp, NULL, NULL, NULL)) {

            ECerr(EC_F_EC_ASN1_GROUP2FIELDID, ERR_R_EC_LIB);

            goto err;

        }
@@ -365,7 +365,7 @@ static int ec_asn1_group2fieldid(const EC_GROUP *group, X9_62_FIELDID *field) 


static int ec_asn1_group2curve(const EC_GROUP *group, X9_62_CURVE *curve)

{

    int ok = 0, nid;

    int ok = 0;

    BIGNUM *tmp_1 = NULL, *tmp_2 = NULL;

    unsigned char *a_buf = NULL, *b_buf = NULL;

    size_t len;
@@ -378,24 +378,12 @@ static int ec_asn1_group2curve(const EC_GROUP *group, X9_62_CURVE *curve) 
        goto err;

    }



    nid = EC_METHOD_get_field_type(EC_GROUP_method_of(group));



    /* get a and b */

    if (nid == NID_X9_62_prime_field) {

        if (!EC_GROUP_get_curve_GFp(group, NULL, tmp_1, tmp_2, NULL)) {

    if (!EC_GROUP_get_curve(group, NULL, tmp_1, tmp_2, NULL)) {

        ECerr(EC_F_EC_ASN1_GROUP2CURVE, ERR_R_EC_LIB);

        goto err;

    }

    }

#ifndef OPENSSL_NO_EC2M

    else {                      /* nid == NID_X9_62_characteristic_two_field */



        if (!EC_GROUP_get_curve_GF2m(group, NULL, tmp_1, tmp_2, NULL)) {

            ECerr(EC_F_EC_ASN1_GROUP2CURVE, ERR_R_EC_LIB);

            goto err;

        }

    }

#endif

    /*

     * Per SEC 1, the curve coefficients must be padded up to size. See C.2's

     * definition of Curve, C.1's definition of FieldElement, and 2.3.5's

crypto/ec/ec_curve.c

+1 −1
Original line number Diff line number Diff line
@@ -3078,7 +3078,7 @@ static EC_GROUP *ec_group_new_from_data(const ec_list_element curve) 
        ECerr(EC_F_EC_GROUP_NEW_FROM_DATA, ERR_R_BN_LIB);

        goto err;

    }

    if (!EC_POINT_set_affine_coordinates_GFp(group, P, x, y, ctx)) {

    if (!EC_POINT_set_affine_coordinates(group, P, x, y, ctx)) {

        ECerr(EC_F_EC_GROUP_NEW_FROM_DATA, ERR_R_EC_LIB);

        goto err;

    }