Commit 8e3cced7 authored by Matt Caswell's avatar Matt Caswell
Browse files

Provide EC functions that are not curve type specific 



Some EC functions exist in *_GFp and *_GF2m forms, in spite of the
implementations between the two curve types being identical. This
commit provides equivalent generic functions with the *_GFp and *_GF2m
forms just calling the generic functions.

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

crypto/ec/ec_err.c

+8 −0
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ static const ERR_STRING_DATA EC_str_functs[] = { 
    {ERR_PACK(ERR_LIB_EC, EC_F_EC_GROUP_CHECK_DISCRIMINANT, 0),

     "EC_GROUP_check_discriminant"},

    {ERR_PACK(ERR_LIB_EC, EC_F_EC_GROUP_COPY, 0), "EC_GROUP_copy"},

    {ERR_PACK(ERR_LIB_EC, EC_F_EC_GROUP_GET_CURVE, 0), "EC_GROUP_get_curve"},

    {ERR_PACK(ERR_LIB_EC, EC_F_EC_GROUP_GET_CURVE_GF2M, 0),

     "EC_GROUP_get_curve_GF2m"},

    {ERR_PACK(ERR_LIB_EC, EC_F_EC_GROUP_GET_CURVE_GFP, 0),
@@ -168,6 +169,7 @@ static const ERR_STRING_DATA EC_str_functs[] = { 
     "EC_GROUP_new_from_ecparameters"},

    {ERR_PACK(ERR_LIB_EC, EC_F_EC_GROUP_NEW_FROM_ECPKPARAMETERS, 0),

     "EC_GROUP_new_from_ecpkparameters"},

    {ERR_PACK(ERR_LIB_EC, EC_F_EC_GROUP_SET_CURVE, 0), "EC_GROUP_set_curve"},

    {ERR_PACK(ERR_LIB_EC, EC_F_EC_GROUP_SET_CURVE_GF2M, 0),

     "EC_GROUP_set_curve_GF2m"},

    {ERR_PACK(ERR_LIB_EC, EC_F_EC_GROUP_SET_CURVE_GFP, 0),
@@ -203,6 +205,8 @@ static const ERR_STRING_DATA EC_str_functs[] = { 
    {ERR_PACK(ERR_LIB_EC, EC_F_EC_POINT_CMP, 0), "EC_POINT_cmp"},

    {ERR_PACK(ERR_LIB_EC, EC_F_EC_POINT_COPY, 0), "EC_POINT_copy"},

    {ERR_PACK(ERR_LIB_EC, EC_F_EC_POINT_DBL, 0), "EC_POINT_dbl"},

    {ERR_PACK(ERR_LIB_EC, EC_F_EC_POINT_GET_AFFINE_COORDINATES, 0),

     "EC_POINT_get_affine_coordinates"},

    {ERR_PACK(ERR_LIB_EC, EC_F_EC_POINT_GET_AFFINE_COORDINATES_GF2M, 0),

     "EC_POINT_get_affine_coordinates_GF2m"},

    {ERR_PACK(ERR_LIB_EC, EC_F_EC_POINT_GET_AFFINE_COORDINATES_GFP, 0),
@@ -220,10 +224,14 @@ static const ERR_STRING_DATA EC_str_functs[] = { 
    {ERR_PACK(ERR_LIB_EC, EC_F_EC_POINT_OCT2POINT, 0), "EC_POINT_oct2point"},

    {ERR_PACK(ERR_LIB_EC, EC_F_EC_POINT_POINT2BUF, 0), "EC_POINT_point2buf"},

    {ERR_PACK(ERR_LIB_EC, EC_F_EC_POINT_POINT2OCT, 0), "EC_POINT_point2oct"},

    {ERR_PACK(ERR_LIB_EC, EC_F_EC_POINT_SET_AFFINE_COORDINATES, 0),

     "EC_POINT_set_affine_coordinates"},

    {ERR_PACK(ERR_LIB_EC, EC_F_EC_POINT_SET_AFFINE_COORDINATES_GF2M, 0),

     "EC_POINT_set_affine_coordinates_GF2m"},

    {ERR_PACK(ERR_LIB_EC, EC_F_EC_POINT_SET_AFFINE_COORDINATES_GFP, 0),

     "EC_POINT_set_affine_coordinates_GFp"},

    {ERR_PACK(ERR_LIB_EC, EC_F_EC_POINT_SET_COMPRESSED_COORDINATES, 0),

     "EC_POINT_set_compressed_coordinates"},

    {ERR_PACK(ERR_LIB_EC, EC_F_EC_POINT_SET_COMPRESSED_COORDINATES_GF2M, 0),

     "EC_POINT_set_compressed_coordinates_GF2m"},

    {ERR_PACK(ERR_LIB_EC, EC_F_EC_POINT_SET_COMPRESSED_COORDINATES_GFP, 0),

crypto/ec/ec_lib.c

+49 −64
Original line number Diff line number Diff line
@@ -415,47 +415,49 @@ size_t EC_GROUP_get_seed_len(const EC_GROUP *group) 
    return group->seed_len;

}



int EC_GROUP_set_curve_GFp(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a,

int EC_GROUP_set_curve(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a,

                       const BIGNUM *b, BN_CTX *ctx)

{

    if (group->meth->group_set_curve == 0) {

        ECerr(EC_F_EC_GROUP_SET_CURVE_GFP, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);

        ECerr(EC_F_EC_GROUP_SET_CURVE, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);

        return 0;

    }

    return group->meth->group_set_curve(group, p, a, b, ctx);

}



int EC_GROUP_get_curve_GFp(const EC_GROUP *group, BIGNUM *p, BIGNUM *a,

                           BIGNUM *b, BN_CTX *ctx)

int EC_GROUP_get_curve(const EC_GROUP *group, BIGNUM *p, BIGNUM *a, BIGNUM *b,

                       BN_CTX *ctx)

{

    if (group->meth->group_get_curve == 0) {

        ECerr(EC_F_EC_GROUP_GET_CURVE_GFP, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);

    if (group->meth->group_get_curve == NULL) {

        ECerr(EC_F_EC_GROUP_GET_CURVE, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);

        return 0;

    }

    return group->meth->group_get_curve(group, p, a, b, ctx);

}



int EC_GROUP_set_curve_GFp(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a,

                           const BIGNUM *b, BN_CTX *ctx)

{

    return EC_GROUP_set_curve(group, p, a, b, ctx);

}



int EC_GROUP_get_curve_GFp(const EC_GROUP *group, BIGNUM *p, BIGNUM *a,

                           BIGNUM *b, BN_CTX *ctx)

{

    return EC_GROUP_get_curve(group, p, a, b, ctx);

}



#ifndef OPENSSL_NO_EC2M

int EC_GROUP_set_curve_GF2m(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a,

                            const BIGNUM *b, BN_CTX *ctx)

{

    if (group->meth->group_set_curve == 0) {

        ECerr(EC_F_EC_GROUP_SET_CURVE_GF2M,

              ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);

        return 0;

    }

    return group->meth->group_set_curve(group, p, a, b, ctx);

    return EC_GROUP_set_curve(group, p, a, b, ctx);

}



int EC_GROUP_get_curve_GF2m(const EC_GROUP *group, BIGNUM *p, BIGNUM *a,

                            BIGNUM *b, BN_CTX *ctx)

{

    if (group->meth->group_get_curve == 0) {

        ECerr(EC_F_EC_GROUP_GET_CURVE_GF2M,

              ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);

        return 0;

    }

    return group->meth->group_get_curve(group, p, a, b, ctx);

    return EC_GROUP_get_curve(group, p, a, b, ctx);

}

#endif
@@ -699,73 +701,66 @@ int EC_POINT_get_Jprojective_coordinates_GFp(const EC_GROUP *group, 
                                                              y, z, ctx);

}



int EC_POINT_set_affine_coordinates_GFp(const EC_GROUP *group,

                                        EC_POINT *point, const BIGNUM *x,

                                        const BIGNUM *y, BN_CTX *ctx)

int EC_POINT_set_affine_coordinates(const EC_GROUP *group, EC_POINT *point,

                                    const BIGNUM *x, const BIGNUM *y,

                                    BN_CTX *ctx)

{

    if (group->meth->point_set_affine_coordinates == 0) {

        ECerr(EC_F_EC_POINT_SET_AFFINE_COORDINATES_GFP,

    if (group->meth->point_set_affine_coordinates == NULL) {

        ECerr(EC_F_EC_POINT_SET_AFFINE_COORDINATES,

              ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);

        return 0;

    }

    if (!ec_point_is_compat(point, group)) {

        ECerr(EC_F_EC_POINT_SET_AFFINE_COORDINATES_GFP,

              EC_R_INCOMPATIBLE_OBJECTS);

        ECerr(EC_F_EC_POINT_SET_AFFINE_COORDINATES, EC_R_INCOMPATIBLE_OBJECTS);

        return 0;

    }

    if (!group->meth->point_set_affine_coordinates(group, point, x, y, ctx))

        return 0;



    if (EC_POINT_is_on_curve(group, point, ctx) <= 0) {

        ECerr(EC_F_EC_POINT_SET_AFFINE_COORDINATES_GFP,

              EC_R_POINT_IS_NOT_ON_CURVE);

        ECerr(EC_F_EC_POINT_SET_AFFINE_COORDINATES, EC_R_POINT_IS_NOT_ON_CURVE);

        return 0;

    }

    return 1;

}



int EC_POINT_set_affine_coordinates_GFp(const EC_GROUP *group,

                                        EC_POINT *point, const BIGNUM *x,

                                        const BIGNUM *y, BN_CTX *ctx)

{

    return EC_POINT_set_affine_coordinates(group, point, x, y, ctx);

}



#ifndef OPENSSL_NO_EC2M

int EC_POINT_set_affine_coordinates_GF2m(const EC_GROUP *group,

                                         EC_POINT *point, const BIGNUM *x,

                                         const BIGNUM *y, BN_CTX *ctx)

{

    if (group->meth->point_set_affine_coordinates == 0) {

        ECerr(EC_F_EC_POINT_SET_AFFINE_COORDINATES_GF2M,

    return EC_POINT_set_affine_coordinates(group, point, x, y, ctx);

}

#endif



int EC_POINT_get_affine_coordinates(const EC_GROUP *group,

                                    const EC_POINT *point, BIGNUM *x, BIGNUM *y,

                                    BN_CTX *ctx)

{

    if (group->meth->point_get_affine_coordinates == NULL) {

        ECerr(EC_F_EC_POINT_GET_AFFINE_COORDINATES,

              ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);

        return 0;

    }

    if (!ec_point_is_compat(point, group)) {

        ECerr(EC_F_EC_POINT_SET_AFFINE_COORDINATES_GF2M,

              EC_R_INCOMPATIBLE_OBJECTS);

        return 0;

    }

    if (!group->meth->point_set_affine_coordinates(group, point, x, y, ctx))

        return 0;



    if (EC_POINT_is_on_curve(group, point, ctx) <= 0) {

        ECerr(EC_F_EC_POINT_SET_AFFINE_COORDINATES_GF2M,

              EC_R_POINT_IS_NOT_ON_CURVE);

        ECerr(EC_F_EC_POINT_GET_AFFINE_COORDINATES, EC_R_INCOMPATIBLE_OBJECTS);

        return 0;

    }

    return 1;

    return group->meth->point_get_affine_coordinates(group, point, x, y, ctx);

}

#endif



int EC_POINT_get_affine_coordinates_GFp(const EC_GROUP *group,

                                        const EC_POINT *point, BIGNUM *x,

                                        BIGNUM *y, BN_CTX *ctx)

{

    if (group->meth->point_get_affine_coordinates == 0) {

        ECerr(EC_F_EC_POINT_GET_AFFINE_COORDINATES_GFP,

              ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);

        return 0;

    }

    if (!ec_point_is_compat(point, group)) {

        ECerr(EC_F_EC_POINT_GET_AFFINE_COORDINATES_GFP,

              EC_R_INCOMPATIBLE_OBJECTS);

        return 0;

    }

    return group->meth->point_get_affine_coordinates(group, point, x, y, ctx);

    return EC_POINT_get_affine_coordinates(group, point, x, y, ctx);

}



#ifndef OPENSSL_NO_EC2M
@@ -773,17 +768,7 @@ int EC_POINT_get_affine_coordinates_GF2m(const EC_GROUP *group, 
                                         const EC_POINT *point, BIGNUM *x,

                                         BIGNUM *y, BN_CTX *ctx)

{

    if (group->meth->point_get_affine_coordinates == 0) {

        ECerr(EC_F_EC_POINT_GET_AFFINE_COORDINATES_GF2M,

              ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);

        return 0;

    }

    if (!ec_point_is_compat(point, group)) {

        ECerr(EC_F_EC_POINT_GET_AFFINE_COORDINATES_GF2M,

              EC_R_INCOMPATIBLE_OBJECTS);

        return 0;

    }

    return group->meth->point_get_affine_coordinates(group, point, x, y, ctx);

    return EC_POINT_get_affine_coordinates(group, point, x, y, ctx);

}

#endif

crypto/ec/ec_oct.c

+14 −28
Original line number Diff line number Diff line
@@ -15,18 +15,17 @@ 


#include "ec_lcl.h"



int EC_POINT_set_compressed_coordinates_GFp(const EC_GROUP *group,

                                            EC_POINT *point, const BIGNUM *x,

                                            int y_bit, BN_CTX *ctx)

int EC_POINT_set_compressed_coordinates(const EC_GROUP *group, EC_POINT *point,

                                        const BIGNUM *x, int y_bit, BN_CTX *ctx)

{

    if (group->meth->point_set_compressed_coordinates == 0

    if (group->meth->point_set_compressed_coordinates == NULL

        && !(group->meth->flags & EC_FLAGS_DEFAULT_OCT)) {

        ECerr(EC_F_EC_POINT_SET_COMPRESSED_COORDINATES_GFP,

        ECerr(EC_F_EC_POINT_SET_COMPRESSED_COORDINATES,

              ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);

        return 0;

    }

    if (!ec_point_is_compat(point, group)) {

        ECerr(EC_F_EC_POINT_SET_COMPRESSED_COORDINATES_GFP,

        ECerr(EC_F_EC_POINT_SET_COMPRESSED_COORDINATES,

              EC_R_INCOMPATIBLE_OBJECTS);

        return 0;

    }
@@ -37,7 +36,7 @@ int EC_POINT_set_compressed_coordinates_GFp(const EC_GROUP *group, 
        else

#ifdef OPENSSL_NO_EC2M

        {

            ECerr(EC_F_EC_POINT_SET_COMPRESSED_COORDINATES_GFP,

            ECerr(EC_F_EC_POINT_SET_COMPRESSED_COORDINATES,

                  EC_R_GF2M_NOT_SUPPORTED);

            return 0;

        }
@@ -50,32 +49,19 @@ int EC_POINT_set_compressed_coordinates_GFp(const EC_GROUP *group, 
                                                         y_bit, ctx);

}



int EC_POINT_set_compressed_coordinates_GFp(const EC_GROUP *group,

                                            EC_POINT *point, const BIGNUM *x,

                                            int y_bit, BN_CTX *ctx)

{

    return EC_POINT_set_compressed_coordinates(group, point, x, y_bit, ctx);

}



#ifndef OPENSSL_NO_EC2M

int EC_POINT_set_compressed_coordinates_GF2m(const EC_GROUP *group,

                                             EC_POINT *point, const BIGNUM *x,

                                             int y_bit, BN_CTX *ctx)

{

    if (group->meth->point_set_compressed_coordinates == 0

        && !(group->meth->flags & EC_FLAGS_DEFAULT_OCT)) {

        ECerr(EC_F_EC_POINT_SET_COMPRESSED_COORDINATES_GF2M,

              ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);

        return 0;

    }

    if (!ec_point_is_compat(point, group)) {

        ECerr(EC_F_EC_POINT_SET_COMPRESSED_COORDINATES_GF2M,

              EC_R_INCOMPATIBLE_OBJECTS);

        return 0;

    }

    if (group->meth->flags & EC_FLAGS_DEFAULT_OCT) {

        if (group->meth->field_type == NID_X9_62_prime_field)

            return ec_GFp_simple_set_compressed_coordinates(group, point, x,

                                                            y_bit, ctx);

        else

            return ec_GF2m_simple_set_compressed_coordinates(group, point, x,

                                                             y_bit, ctx);

    }

    return group->meth->point_set_compressed_coordinates(group, point, x,

                                                         y_bit, ctx);

    return EC_POINT_set_compressed_coordinates(group, point, x, y_bit, ctx);

}

#endif

crypto/err/openssl.txt

+5 −0
Original line number Diff line number Diff line
@@ -570,6 +570,7 @@ EC_F_EC_GFP_SIMPLE_SET_COMPRESSED_COORDINATES:169:\ 
EC_F_EC_GROUP_CHECK:170:EC_GROUP_check

EC_F_EC_GROUP_CHECK_DISCRIMINANT:171:EC_GROUP_check_discriminant

EC_F_EC_GROUP_COPY:106:EC_GROUP_copy

EC_F_EC_GROUP_GET_CURVE:291:EC_GROUP_get_curve

EC_F_EC_GROUP_GET_CURVE_GF2M:172:EC_GROUP_get_curve_GF2m

EC_F_EC_GROUP_GET_CURVE_GFP:130:EC_GROUP_get_curve_GFp

EC_F_EC_GROUP_GET_DEGREE:173:EC_GROUP_get_degree
@@ -582,6 +583,7 @@ EC_F_EC_GROUP_NEW_BY_CURVE_NAME:174:EC_GROUP_new_by_curve_name 
EC_F_EC_GROUP_NEW_FROM_DATA:175:ec_group_new_from_data

EC_F_EC_GROUP_NEW_FROM_ECPARAMETERS:263:EC_GROUP_new_from_ecparameters

EC_F_EC_GROUP_NEW_FROM_ECPKPARAMETERS:264:EC_GROUP_new_from_ecpkparameters

EC_F_EC_GROUP_SET_CURVE:292:EC_GROUP_set_curve

EC_F_EC_GROUP_SET_CURVE_GF2M:176:EC_GROUP_set_curve_GF2m

EC_F_EC_GROUP_SET_CURVE_GFP:109:EC_GROUP_set_curve_GFp

EC_F_EC_GROUP_SET_GENERATOR:111:EC_GROUP_set_generator
@@ -610,6 +612,7 @@ EC_F_EC_POINT_BN2POINT:280:EC_POINT_bn2point 
EC_F_EC_POINT_CMP:113:EC_POINT_cmp

EC_F_EC_POINT_COPY:114:EC_POINT_copy

EC_F_EC_POINT_DBL:115:EC_POINT_dbl

EC_F_EC_POINT_GET_AFFINE_COORDINATES:293:EC_POINT_get_affine_coordinates

EC_F_EC_POINT_GET_AFFINE_COORDINATES_GF2M:183:\

	EC_POINT_get_affine_coordinates_GF2m

EC_F_EC_POINT_GET_AFFINE_COORDINATES_GFP:116:EC_POINT_get_affine_coordinates_GFp
@@ -623,9 +626,11 @@ EC_F_EC_POINT_NEW:121:EC_POINT_new 
EC_F_EC_POINT_OCT2POINT:122:EC_POINT_oct2point

EC_F_EC_POINT_POINT2BUF:281:EC_POINT_point2buf

EC_F_EC_POINT_POINT2OCT:123:EC_POINT_point2oct

EC_F_EC_POINT_SET_AFFINE_COORDINATES:294:EC_POINT_set_affine_coordinates

EC_F_EC_POINT_SET_AFFINE_COORDINATES_GF2M:185:\

	EC_POINT_set_affine_coordinates_GF2m

EC_F_EC_POINT_SET_AFFINE_COORDINATES_GFP:124:EC_POINT_set_affine_coordinates_GFp

EC_F_EC_POINT_SET_COMPRESSED_COORDINATES:295:EC_POINT_set_compressed_coordinates

EC_F_EC_POINT_SET_COMPRESSED_COORDINATES_GF2M:186:\

	EC_POINT_set_compressed_coordinates_GF2m

EC_F_EC_POINT_SET_COMPRESSED_COORDINATES_GFP:125:\

include/openssl/ec.h

+85 −14
Original line number Diff line number Diff line
@@ -223,9 +223,36 @@ unsigned char *EC_GROUP_get0_seed(const EC_GROUP *x); 
size_t EC_GROUP_get_seed_len(const EC_GROUP *);

size_t EC_GROUP_set_seed(EC_GROUP *, const unsigned char *, size_t len);



/** Sets the parameter of a ec over GFp defined by y^2 = x^3 + a*x + b

/** Sets the parameters of a ec curve defined by y^2 = x^3 + a*x + b (for GFp)

 *  or y^2 + x*y = x^3 + a*x^2 + b (for GF2m)

 *  \param  group  EC_GROUP object

 *  \param  p      BIGNUM with the prime number

 *  \param  p      BIGNUM with the prime number (GFp) or the polynomial

 *                 defining the underlying field (GF2m)

 *  \param  a      BIGNUM with parameter a of the equation

 *  \param  b      BIGNUM with parameter b of the equation

 *  \param  ctx    BN_CTX object (optional)

 *  \return 1 on success and 0 if an error occurred

 */

int EC_GROUP_set_curve(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a,

                       const BIGNUM *b, BN_CTX *ctx);



/** Gets the parameters of the ec curve defined by y^2 = x^3 + a*x + b (for GFp)

 *  or y^2 + x*y = x^3 + a*x^2 + b (for GF2m)

 *  \param  group  EC_GROUP object

 *  \param  p      BIGNUM with the prime number (GFp) or the polynomial

 *                 defining the underlying field (GF2m)

 *  \param  a      BIGNUM for parameter a of the equation

 *  \param  b      BIGNUM for parameter b of the equation

 *  \param  ctx    BN_CTX object (optional)

 *  \return 1 on success and 0 if an error occurred

 */

int EC_GROUP_get_curve(const EC_GROUP *group, BIGNUM *p, BIGNUM *a, BIGNUM *b,

                       BN_CTX *ctx);



/** Sets the parameters of an ec curve. Synonym for EC_GROUP_set_curve

 *  \param  group  EC_GROUP object

 *  \param  p      BIGNUM with the prime number (GFp) or the polynomial

 *                 defining the underlying field (GF2m)

 *  \param  a      BIGNUM with parameter a of the equation

 *  \param  b      BIGNUM with parameter b of the equation

 *  \param  ctx    BN_CTX object (optional)
@@ -234,9 +261,10 @@ size_t EC_GROUP_set_seed(EC_GROUP *, const unsigned char *, size_t len); 
int EC_GROUP_set_curve_GFp(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a,

                           const BIGNUM *b, BN_CTX *ctx);



/** Gets the parameter of the ec over GFp defined by y^2 = x^3 + a*x + b

/** Gets the parameters of an ec curve. Synonym for EC_GROUP_get_curve

 *  \param  group  EC_GROUP object

 *  \param  p      BIGNUM for the prime number

 *  \param  p      BIGNUM with the prime number (GFp) or the polynomial

 *                 defining the underlying field (GF2m)

 *  \param  a      BIGNUM for parameter a of the equation

 *  \param  b      BIGNUM for parameter b of the equation

 *  \param  ctx    BN_CTX object (optional)
@@ -246,9 +274,10 @@ int EC_GROUP_get_curve_GFp(const EC_GROUP *group, BIGNUM *p, BIGNUM *a, 
                           BIGNUM *b, BN_CTX *ctx);



# ifndef OPENSSL_NO_EC2M

/** Sets the parameter of a ec over GF2m defined by y^2 + x*y = x^3 + a*x^2 + b

/** Sets the parameter of an ec curve. Synonym for EC_GROUP_set_curve

 *  \param  group  EC_GROUP object

 *  \param  p      BIGNUM with the polynomial defining the underlying field

 *  \param  p      BIGNUM with the prime number (GFp) or the polynomial

 *                 defining the underlying field (GF2m)

 *  \param  a      BIGNUM with parameter a of the equation

 *  \param  b      BIGNUM with parameter b of the equation

 *  \param  ctx    BN_CTX object (optional)
@@ -257,9 +286,10 @@ int EC_GROUP_get_curve_GFp(const EC_GROUP *group, BIGNUM *p, BIGNUM *a, 
int EC_GROUP_set_curve_GF2m(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a,

                            const BIGNUM *b, BN_CTX *ctx);



/** Gets the parameter of the ec over GF2m defined by y^2 + x*y = x^3 + a*x^2 + b

/** Gets the parameters of an ec curve. Synonym for EC_GROUP_get_curve

 *  \param  group  EC_GROUP object

 *  \param  p      BIGNUM for the polynomial defining the underlying field

 *  \param  p      BIGNUM with the prime number (GFp) or the polynomial

 *                 defining the underlying field (GF2m)

 *  \param  a      BIGNUM for parameter a of the equation

 *  \param  b      BIGNUM for parameter b of the equation

 *  \param  ctx    BN_CTX object (optional)
@@ -459,7 +489,31 @@ int EC_POINT_get_Jprojective_coordinates_GFp(const EC_GROUP *group, 
                                             BIGNUM *y, BIGNUM *z,

                                             BN_CTX *ctx);



/** Sets the affine coordinates of a EC_POINT over GFp

/** Sets the affine coordinates of an EC_POINT

 *  \param  group  underlying EC_GROUP object

 *  \param  p      EC_POINT object

 *  \param  x      BIGNUM with the x-coordinate

 *  \param  y      BIGNUM with the y-coordinate

 *  \param  ctx    BN_CTX object (optional)

 *  \return 1 on success and 0 if an error occurred

 */

int EC_POINT_set_affine_coordinates(const EC_GROUP *group, EC_POINT *p,

                                    const BIGNUM *x, const BIGNUM *y,

                                    BN_CTX *ctx);



/** Gets the affine coordinates of an EC_POINT.

 *  \param  group  underlying EC_GROUP object

 *  \param  p      EC_POINT object

 *  \param  x      BIGNUM for the x-coordinate

 *  \param  y      BIGNUM for the y-coordinate

 *  \param  ctx    BN_CTX object (optional)

 *  \return 1 on success and 0 if an error occurred

 */

int EC_POINT_get_affine_coordinates(const EC_GROUP *group, const EC_POINT *p,

                                    BIGNUM *x, BIGNUM *y, BN_CTX *ctx);



/** Sets the affine coordinates of an EC_POINT. A synonym of

 *  EC_POINT_set_affine_coordinates

 *  \param  group  underlying EC_GROUP object

 *  \param  p      EC_POINT object

 *  \param  x      BIGNUM with the x-coordinate
@@ -471,7 +525,8 @@ int EC_POINT_set_affine_coordinates_GFp(const EC_GROUP *group, EC_POINT *p, 
                                        const BIGNUM *x, const BIGNUM *y,

                                        BN_CTX *ctx);



/** Gets the affine coordinates of a EC_POINT over GFp

/** Gets the affine coordinates of an EC_POINT. A synonym of

 *  EC_POINT_get_affine_coordinates

 *  \param  group  underlying EC_GROUP object

 *  \param  p      EC_POINT object

 *  \param  x      BIGNUM for the x-coordinate
@@ -483,7 +538,20 @@ int EC_POINT_get_affine_coordinates_GFp(const EC_GROUP *group, 
                                        const EC_POINT *p, BIGNUM *x,

                                        BIGNUM *y, BN_CTX *ctx);



/** Sets the x9.62 compressed coordinates of a EC_POINT over GFp

/** Sets the x9.62 compressed coordinates of a EC_POINT

 *  \param  group  underlying EC_GROUP object

 *  \param  p      EC_POINT object

 *  \param  x      BIGNUM with x-coordinate

 *  \param  y_bit  integer with the y-Bit (either 0 or 1)

 *  \param  ctx    BN_CTX object (optional)

 *  \return 1 on success and 0 if an error occurred

 */

int EC_POINT_set_compressed_coordinates(const EC_GROUP *group, EC_POINT *p,

                                        const BIGNUM *x, int y_bit,

                                        BN_CTX *ctx);



/** Sets the x9.62 compressed coordinates of a EC_POINT. A synonym of

 *  EC_POINT_set_compressed_coordinates

 *  \param  group  underlying EC_GROUP object

 *  \param  p      EC_POINT object

 *  \param  x      BIGNUM with x-coordinate
@@ -495,7 +563,8 @@ int EC_POINT_set_compressed_coordinates_GFp(const EC_GROUP *group, 
                                            EC_POINT *p, const BIGNUM *x,

                                            int y_bit, BN_CTX *ctx);

# ifndef OPENSSL_NO_EC2M

/** Sets the affine coordinates of a EC_POINT over GF2m

/** Sets the affine coordinates of an EC_POINT. A synonym of

 *  EC_POINT_set_affine_coordinates

 *  \param  group  underlying EC_GROUP object

 *  \param  p      EC_POINT object

 *  \param  x      BIGNUM with the x-coordinate
@@ -507,7 +576,8 @@ int EC_POINT_set_affine_coordinates_GF2m(const EC_GROUP *group, EC_POINT *p, 
                                         const BIGNUM *x, const BIGNUM *y,

                                         BN_CTX *ctx);



/** Gets the affine coordinates of a EC_POINT over GF2m

/** Gets the affine coordinates of an EC_POINT. A synonym of

 *  EC_POINT_get_affine_coordinates

 *  \param  group  underlying EC_GROUP object

 *  \param  p      EC_POINT object

 *  \param  x      BIGNUM for the x-coordinate
@@ -519,7 +589,8 @@ int EC_POINT_get_affine_coordinates_GF2m(const EC_GROUP *group, 
                                         const EC_POINT *p, BIGNUM *x,

                                         BIGNUM *y, BN_CTX *ctx);



/** Sets the x9.62 compressed coordinates of a EC_POINT over GF2m

/** Sets the x9.62 compressed coordinates of a EC_POINT. A synonym of

 *  EC_POINT_set_compressed_coordinates

 *  \param  group  underlying EC_GROUP object

 *  \param  p      EC_POINT object

 *  \param  x      BIGNUM with x-coordinate