More EC stuff, including EC_POINTs_mul() for simultaneous scalar (48fe4d62) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

CHANGES

+31 −1

Original line number	Diff line number	Diff line
		@@ -3,6 +3,36 @@

		Changes between 0.9.6 and 0.9.7 [xx XXX 2000]

		*) Function EC_POINTs_mul for simultaneous scalar multiplication
		of an arbitrary number of elliptic curve points.
		[Bodo Moeller]

		*) First EC_METHODs for curves over GF(p):

		EC_GFp_simple_method() uses the basic BN_mod_mul and BN_mod_sqr
		operations and provides various method functions that can also
		operate with faster implementations of modular arithmetic.

		EC_GFp_mont_method() reuses most functions that are part of
		EC_GFp_simple_method, but uses Montgomery arithmetic.

		[Bodo Moeller; point addition and point doubling
		implementation directly derived from source code provided by
		Lenka Fibikova <fibikova@exp-math.uni-essen.de>]

		*) Framework for elliptic curves (crypto/ec/ec.h, crypto/ec/ec_lcl.h,
		crypto/ec/ec_lib.c):

		Curves are EC_GROUP objects (with an optional generator) based
		on EC_METHODs that are built into the library.

		Points are EC_POINT objects based on EC_GROUP objects.

		Most of the framework would be able to handle curves over arbitrary
		finite fields, but as there are no obvious types for GF(2^n),
		some functions are limited to GF(p) for now.
		[Bodo Moeller]

		*) Add the -HTTP option to s_server. It is similar to -WWW, but requires
		that the file contains a complete HTTP response.
		[Richard Levitte]
		@@ -27,7 +57,7 @@
		[Jeremy Cooper <jeremy@baymoo.org>]

		*) Hide BN_CTX structure details in bn_lcl.h instead of publishing them
		in <openssl/bn.h>. Also further increase BN_CTX_NUM to 24.
		in <openssl/bn.h>. Also further increase BN_CTX_NUM to 32.
		[Bodo Moeller]

		) Modify EVP_Digest() routines so they now return values. Although the

crypto/bn/Makefile.ssl

+1 −1

Original line number	Diff line number	Diff line
		@@ -195,7 +195,7 @@ bn_ctx.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
		bn_ctx.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
		bn_ctx.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
		bn_ctx.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
		bn_ctx.o: ../cryptlib.h bn_ctx.c
		bn_ctx.o: ../cryptlib.h bn_ctx.c bn_lcl.h
		bn_div.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h
		bn_div.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
		bn_div.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h

crypto/bn/bn_lcl.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -120,7 +120,7 @@ extern "C" {


		/* Used for temp variables */
		#define BN_CTX_NUM 24
		#define BN_CTX_NUM 32
		#define BN_CTX_NUM_POS 12
		struct bignum_ctx
		{

crypto/ec/ec.h

+26 −13

Original line number	Diff line number	Diff line
		@@ -94,38 +94,43 @@ typedef struct ec_point_st EC_POINT;
		/* EC_METHODs for curves over GF(p).
		* EC_GFp_simple_method provides the basis for the optimized methods.
		*/

		const EC_METHOD *EC_GFp_simple_method(void);
		const EC_METHOD *EC_GFp_mont_method(void);
		const EC_METHOD *EC_GFp_recp_method(void);
		const EC_METHOD *EC_GFp_nist_method(void);
		const EC_METHOD EC_GFp_recp_method(void); / TODO */
		const EC_METHOD EC_GFp_nist_method(void); / TODO */


		EC_GROUP EC_GROUP_new(const EC_METHOD );
		/* We don't have types for field specifications and field elements in general.
		* Otherwise we would declare
		* int EC_GROUP_set_curve(EC_GROUP *, .....);
		*/
		void EC_GROUP_free(EC_GROUP *);
		void EC_GROUP_clear_free(EC_GROUP *);
		int EC_GROUP_copy(EC_GROUP , const EC_GROUP );

		const EC_METHOD EC_GROUP_method_of(const EC_GROUP );


		/* We don't have types for field specifications and field elements in general.
		* Otherwise we could declare
		* int EC_GROUP_set_curve(EC_GROUP *, .....);
		*/
		int EC_GROUP_set_curve_GFp(EC_GROUP , const BIGNUM p, const BIGNUM a, const BIGNUM b, BN_CTX *);
		int EC_GROUP_get_curve_GFp(EC_GROUP , BIGNUM p, BIGNUM a, BIGNUM b, BN_CTX *);
		int EC_GROUP_get_curve_GFp(const EC_GROUP , BIGNUM p, BIGNUM a, BIGNUM b, BN_CTX *);

		/* EC_GROUP_new_GFp() calls EC_GROUP_new() and EC_GROUP_set_GFp()
		* after choosing an appropriate EC_METHOD */
		EC_GROUP EC_GROUP_new_curve_GFp(const BIGNUM p, const BIGNUM a, const BIGNUM b, BN_CTX *);

		int EC_GROUP_set_generator(EC_GROUP , const EC_POINT generator, const BIGNUM order, const BIGNUM cofactor);
		EC_POINT EC_group_get0_generator(EC_GROUP );
		int EC_GROUP_get_order(EC_GROUP , BIGNUM order, BN_CTX *);
		int EC_GROUP_get_cofactor(EC_GROUP , BIGNUM cofactor, BN_CTX *);
		EC_POINT EC_GROUP_get0_generator(const EC_GROUP );
		int EC_GROUP_get_order(const EC_GROUP , BIGNUM order, BN_CTX *);
		int EC_GROUP_get_cofactor(const EC_GROUP , BIGNUM cofactor, BN_CTX *);

		EC_POINT EC_POINT_new(const EC_GROUP );
		void EC_POINT_free(EC_POINT *);
		void EC_POINT_clear_free(EC_POINT *);
		int EC_POINT_copy(EC_POINT , const EC_POINT );

		const EC_METHOD EC_POINT_method_of(const EC_POINT );

		int EC_POINT_set_to_infinity(const EC_GROUP , EC_POINT );
		int EC_POINT_set_Jprojective_coordinates_GFp(const EC_GROUP , EC_POINT ,
		const BIGNUM x, const BIGNUM y, const BIGNUM z, BN_CTX );
		@@ -152,10 +157,10 @@ int EC_POINT_is_on_curve(const EC_GROUP , const EC_POINT , BN_CTX *);
		int EC_POINT_cmp(const EC_GROUP , const EC_POINT a, const EC_POINT b, BN_CTX );

		int EC_POINT_make_affine(const EC_GROUP , EC_POINT , BN_CTX *);
		int EC_POINTs_make_affine(const EC_GROUP , size_t num, EC_POINT [], BN_CTX *);



		/* TODO: scalar multiplication */
		int EC_POINTs_mul(const EC_GROUP , EC_POINT r, BIGNUM , size_t num, EC_POINT [], BIGNUM [], BN_CTX );



		@@ -177,16 +182,22 @@ void ERR_load_EC_strings(void);
		#define EC_F_EC_GFP_SIMPLE_MAKE_AFFINE 102
		#define EC_F_EC_GFP_SIMPLE_OCT2POINT 103
		#define EC_F_EC_GFP_SIMPLE_POINT2OCT 104
		#define EC_F_EC_GFP_SIMPLE_POINTS_MAKE_AFFINE 137
		#define EC_F_EC_GFP_SIMPLE_POINT_GET_AFFINE_COORDINATES_GFP 105
		#define EC_F_EC_GFP_SIMPLE_POINT_SET_AFFINE_COORDINATES_GFP 128
		#define EC_F_EC_GFP_SIMPLE_SET_COMPRESSED_COORDINATES_GFP 129
		#define EC_F_EC_GROUP_COPY 106
		#define EC_F_EC_GROUP_GET0_GENERATOR 139
		#define EC_F_EC_GROUP_GET_COFACTOR 140
		#define EC_F_EC_GROUP_GET_CURVE_GFP 130
		#define EC_F_EC_GROUP_GET_EXTRA_DATA 107
		#define EC_F_EC_GROUP_GET_ORDER 141
		#define EC_F_EC_GROUP_NEW 108
		#define EC_F_EC_GROUP_SET_CURVE_GFP 109
		#define EC_F_EC_GROUP_SET_EXTRA_DATA 110
		#define EC_F_EC_GROUP_SET_GENERATOR 111
		#define EC_F_EC_POINTS_MAKE_AFFINE 136
		#define EC_F_EC_POINTS_MUL 138
		#define EC_F_EC_POINT_ADD 112
		#define EC_F_EC_POINT_CMP 113
		#define EC_F_EC_POINT_COPY 114
		@@ -208,12 +219,14 @@ void ERR_load_EC_strings(void);
		/* Reason codes. */
		#define EC_R_BUFFER_TOO_SMALL 100
		#define EC_R_INCOMPATIBLE_OBJECTS 101
		#define EC_R_INVALID_ARGUMENT 112
		#define EC_R_INVALID_COMPRESSED_POINT 110
		#define EC_R_INVALID_COMPRESSION_BIT 109
		#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_GENERATOR_SET 113
		#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_err.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -75,16 +75,22 @@ static ERR_STRING_DATA EC_str_functs[]=
		{ERR_PACK(0,EC_F_EC_GFP_SIMPLE_MAKE_AFFINE,0), "ec_GFp_simple_make_affine"},
		{ERR_PACK(0,EC_F_EC_GFP_SIMPLE_OCT2POINT,0), "ec_GFp_simple_oct2point"},
		{ERR_PACK(0,EC_F_EC_GFP_SIMPLE_POINT2OCT,0), "ec_GFp_simple_point2oct"},
		{ERR_PACK(0,EC_F_EC_GFP_SIMPLE_POINTS_MAKE_AFFINE,0), "ec_GFp_simple_points_make_affine"},
		{ERR_PACK(0,EC_F_EC_GFP_SIMPLE_POINT_GET_AFFINE_COORDINATES_GFP,0), "ec_GFp_simple_point_get_affine_coordinates_GFp"},
		{ERR_PACK(0,EC_F_EC_GFP_SIMPLE_POINT_SET_AFFINE_COORDINATES_GFP,0), "ec_GFp_simple_point_set_affine_coordinates_GFp"},
		{ERR_PACK(0,EC_F_EC_GFP_SIMPLE_SET_COMPRESSED_COORDINATES_GFP,0), "ec_GFp_simple_set_compressed_coordinates_GFp"},
		{ERR_PACK(0,EC_F_EC_GROUP_COPY,0), "EC_GROUP_copy"},
		{ERR_PACK(0,EC_F_EC_GROUP_GET0_GENERATOR,0), "EC_GROUP_get0_generator"},
		{ERR_PACK(0,EC_F_EC_GROUP_GET_COFACTOR,0), "EC_GROUP_get_cofactor"},
		{ERR_PACK(0,EC_F_EC_GROUP_GET_CURVE_GFP,0), "EC_GROUP_get_curve_GFp"},
		{ERR_PACK(0,EC_F_EC_GROUP_GET_EXTRA_DATA,0), "EC_GROUP_get_extra_data"},
		{ERR_PACK(0,EC_F_EC_GROUP_GET_ORDER,0), "EC_GROUP_get_order"},
		{ERR_PACK(0,EC_F_EC_GROUP_NEW,0), "EC_GROUP_new"},
		{ERR_PACK(0,EC_F_EC_GROUP_SET_CURVE_GFP,0), "EC_GROUP_set_curve_GFp"},
		{ERR_PACK(0,EC_F_EC_GROUP_SET_EXTRA_DATA,0), "EC_GROUP_set_extra_data"},
		{ERR_PACK(0,EC_F_EC_GROUP_SET_GENERATOR,0), "EC_GROUP_set_generator"},
		{ERR_PACK(0,EC_F_EC_POINTS_MAKE_AFFINE,0), "EC_POINTs_make_affine"},
		{ERR_PACK(0,EC_F_EC_POINTS_MUL,0), "EC_POINTs_mul"},
		{ERR_PACK(0,EC_F_EC_POINT_ADD,0), "EC_POINT_add"},
		{ERR_PACK(0,EC_F_EC_POINT_CMP,0), "EC_POINT_cmp"},
		{ERR_PACK(0,EC_F_EC_POINT_COPY,0), "EC_POINT_copy"},
		@@ -109,12 +115,14 @@ static ERR_STRING_DATA EC_str_reasons[]=
		{
		{EC_R_BUFFER_TOO_SMALL ,"buffer too small"},
		{EC_R_INCOMPATIBLE_OBJECTS ,"incompatible objects"},
		{EC_R_INVALID_ARGUMENT ,"invalid argument"},
		{EC_R_INVALID_COMPRESSED_POINT ,"invalid compressed point"},
		{EC_R_INVALID_COMPRESSION_BIT ,"invalid compression bit"},
		{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_GENERATOR_SET ,"no generator set"},
		{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"},