Commit 156e8557 authored by Bodo Möller's avatar Bodo Möller
Browse files

Implement EC_GFp_mont_method.

parent b28ec124

crypto/bn/bn_mont.c

+3 −3
Original line number Diff line number Diff line
@@ -339,9 +339,9 @@ BN_MONT_CTX *BN_MONT_CTX_copy(BN_MONT_CTX *to, BN_MONT_CTX *from) 
	{

	if (to == from) return(to);



	BN_copy(&(to->RR),&(from->RR));

	BN_copy(&(to->N),&(from->N));

	BN_copy(&(to->Ni),&(from->Ni));

	if (!BN_copy(&(to->RR),&(from->RR))) return NULL;

	if (!BN_copy(&(to->N),&(from->N))) return NULL;

	if (!BN_copy(&(to->Ni),&(from->Ni))) return NULL;

	to->ri=from->ri;

	to->n0=from->n0;

	return(to);

crypto/ec/ec.h

+6 −0
Original line number Diff line number Diff line
@@ -168,6 +168,10 @@ void ERR_load_EC_strings(void); 
/* Error codes for the EC functions. */



/* Function codes. */

#define EC_F_EC_GFP_MONT_FIELD_DECODE			 133

#define EC_F_EC_GFP_MONT_FIELD_ENCODE			 134

#define EC_F_EC_GFP_MONT_FIELD_MUL			 131

#define EC_F_EC_GFP_MONT_FIELD_SQR			 132

#define EC_F_EC_GFP_SIMPLE_GROUP_SET_CURVE_GFP		 100

#define EC_F_EC_GFP_SIMPLE_GROUP_SET_GENERATOR		 101

#define EC_F_EC_GFP_SIMPLE_MAKE_AFFINE			 102
@@ -199,6 +203,7 @@ void ERR_load_EC_strings(void); 
#define EC_F_EC_POINT_SET_COMPRESSED_COORDINATES_GFP	 125

#define EC_F_EC_POINT_SET_JPROJECTIVE_COORDINATES_GFP	 126

#define EC_F_EC_POINT_SET_TO_INFINITY			 127

#define EC_F_GFP_MONT_GROUP_SET_CURVE_GFP		 135



/* Reason codes. */

#define EC_R_BUFFER_TOO_SMALL				 100
@@ -208,6 +213,7 @@ void ERR_load_EC_strings(void); 
#define EC_R_INVALID_ENCODING				 102

#define EC_R_INVALID_FIELD				 103

#define EC_R_INVALID_FORM				 104

#define EC_R_NOT_INITIALIZED				 111

#define EC_R_NO_SUCH_EXTRA_DATA				 105

#define EC_R_POINT_AT_INFINITY				 106

#define EC_R_POINT_IS_NOT_ON_CURVE			 107

crypto/ec/ec_cvt.c

+2 −2
Original line number Diff line number Diff line
@@ -63,8 +63,8 @@ EC_GROUP *EC_GROUP_new_curve_GFp(const BIGNUM *p, const BIGNUM *a, const BIGNUM 
	

	/* Finally, this will use EC_GFp_nist_method if 'p' is a special

	 * prime with optimized modular arithmetics (for NIST curves)

	 * and EC_GFp_mont_method or EC_GFp_recp_method otherwise. */

	meth = EC_GFp_simple_method();

	 */

	meth = EC_GFp_mont_method();

	

	ret = EC_GROUP_new(meth);

	if (ret == NULL)

crypto/ec/ec_err.c

+6 −0
Original line number Diff line number Diff line
@@ -66,6 +66,10 @@ 
#ifndef OPENSSL_NO_ERR

static ERR_STRING_DATA EC_str_functs[]=

	{

{ERR_PACK(0,EC_F_EC_GFP_MONT_FIELD_DECODE,0),	"ec_GFp_mont_field_decode"},

{ERR_PACK(0,EC_F_EC_GFP_MONT_FIELD_ENCODE,0),	"ec_GFp_mont_field_encode"},

{ERR_PACK(0,EC_F_EC_GFP_MONT_FIELD_MUL,0),	"ec_GFp_mont_field_mul"},

{ERR_PACK(0,EC_F_EC_GFP_MONT_FIELD_SQR,0),	"ec_GFp_mont_field_sqr"},

{ERR_PACK(0,EC_F_EC_GFP_SIMPLE_GROUP_SET_CURVE_GFP,0),	"ec_GFp_simple_group_set_curve_GFp"},

{ERR_PACK(0,EC_F_EC_GFP_SIMPLE_GROUP_SET_GENERATOR,0),	"ec_GFp_simple_group_set_generator"},

{ERR_PACK(0,EC_F_EC_GFP_SIMPLE_MAKE_AFFINE,0),	"ec_GFp_simple_make_affine"},
@@ -97,6 +101,7 @@ static ERR_STRING_DATA EC_str_functs[]= 
{ERR_PACK(0,EC_F_EC_POINT_SET_COMPRESSED_COORDINATES_GFP,0),	"EC_POINT_set_compressed_coordinates_GFp"},

{ERR_PACK(0,EC_F_EC_POINT_SET_JPROJECTIVE_COORDINATES_GFP,0),	"EC_POINT_set_Jprojective_coordinates_GFp"},

{ERR_PACK(0,EC_F_EC_POINT_SET_TO_INFINITY,0),	"EC_POINT_set_to_infinity"},

{ERR_PACK(0,EC_F_GFP_MONT_GROUP_SET_CURVE_GFP,0),	"GFP_MONT_GROUP_SET_CURVE_GFP"},

{0,NULL}

	};
@@ -109,6 +114,7 @@ static ERR_STRING_DATA EC_str_reasons[]= 
{EC_R_INVALID_ENCODING                   ,"invalid encoding"},

{EC_R_INVALID_FIELD                      ,"invalid field"},

{EC_R_INVALID_FORM                       ,"invalid form"},

{EC_R_NOT_INITIALIZED                    ,"not initialized"},

{EC_R_NO_SUCH_EXTRA_DATA                 ,"no such extra data"},

{EC_R_POINT_AT_INFINITY                  ,"point at infinity"},

{EC_R_POINT_IS_NOT_ON_CURVE              ,"point is not on curve"},

crypto/ec/ec_lcl.h

+0 −4
Original line number Diff line number Diff line
@@ -260,8 +260,6 @@ void ec_GFp_recp_group_clear_finish(EC_GROUP *); 
int ec_GFp_recp_group_copy(EC_GROUP *, const EC_GROUP *);

int ec_GFp_recp_field_mul(const EC_GROUP *, BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *);

int ec_GFp_recp_field_sqr(const EC_GROUP *, BIGNUM *r, const BIGNUM *a, BN_CTX *);

int ec_GFp_recp_field_encode(const EC_GROUP *, BIGNUM *r, const BIGNUM *a, BN_CTX *);

int ec_GFp_recp_field_decode(const EC_GROUP *, BIGNUM *r, const BIGNUM *a, BN_CTX *);





/* method functions in ecp_nist.c */
@@ -272,5 +270,3 @@ void ec_GFp_nist_group_clear_finish(EC_GROUP *); 
int ec_GFp_nist_group_copy(EC_GROUP *, const EC_GROUP *);

int ec_GFp_nist_field_mul(const EC_GROUP *, BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *);

int ec_GFp_nist_field_sqr(const EC_GROUP *, BIGNUM *r, const BIGNUM *a, BN_CTX *);
 
int ec_GFp_nist_field_encode(const EC_GROUP *, BIGNUM *r, const BIGNUM *a, BN_CTX *);

int ec_GFp_nist_field_decode(const EC_GROUP *, BIGNUM *r, const BIGNUM *a, BN_CTX *);