More method functions for elliptic curves, (bb62a8b0) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

config

+1 −1

Original line number	Diff line number	Diff line
		@@ -557,7 +557,7 @@ case "$GUESSOS" in
		i386-*) options="$options 386" ;;
		esac

		for i in bf cast des dh dsa hmac md2 md5 mdc2 rc2 rc4 rc5 ripemd rsa sha
		for i in bf cast des dh dsa ec hmac md2 md5 mdc2 rc2 rc4 rc5 ripemd rsa sha
		do
		if [ ! -d crypto/$i ]
		then

crypto/ec/ec.h

+15 −6

Original line number	Diff line number	Diff line
		@@ -56,6 +56,10 @@
		#ifndef HEADER_EC_H
		#define HEADER_EC_H

		#ifdef OPENSSL_NO_EC
		#error Elliptic curves are disabled.
		#endif

		#include <openssl/bn.h>
		#include <openssl/symhacks.h>

		@@ -64,7 +68,6 @@ extern "C" {
		#endif



		typedef enum {
		/* values as defined in X9.62 (ECDSA) and elsewhere */
		POINT_CONVERSION_COMPRESSED = 2,
		@@ -81,7 +84,7 @@ typedef struct ec_group_st
		-- field definition
		-- curve coefficients
		-- optional generator with associated information (order, cofactor)
		-- optional Lim/Lee precomputation table
		-- optional extra data (Lim/Lee precomputation table)
		*/
		EC_GROUP;

		@@ -103,19 +106,20 @@ EC_GROUP EC_GROUP_new(const EC_METHOD );
		* Otherwise we would 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 *);
		void EC_GROUP_free(EC_GROUP *);
		void EC_GROUP_clear_free(EC_GROUP *);
		int EC_GROUP_copy(EC_GROUP , const 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 *);

		/* 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);

		/* TODO: 'set' and 'get' functions for EC_GROUPs */

		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_POINT_new(const EC_GROUP );
		void EC_POINT_free(EC_POINT *);
		@@ -170,7 +174,10 @@ void ERR_load_EC_strings(void);
		#define EC_F_EC_GFP_SIMPLE_OCT2POINT 103
		#define EC_F_EC_GFP_SIMPLE_POINT2OCT 104
		#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_GET_CURVE_GFP 130
		#define EC_F_EC_GROUP_GET_EXTRA_DATA 107
		#define EC_F_EC_GROUP_NEW 108
		#define EC_F_EC_GROUP_SET_CURVE_GFP 109
		@@ -196,6 +203,8 @@ 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_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

crypto/ec/ec_err.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -72,7 +72,10 @@ static ERR_STRING_DATA EC_str_functs[]=
		{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_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_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_NEW,0), "EC_GROUP_new"},
		{ERR_PACK(0,EC_F_EC_GROUP_SET_CURVE_GFP,0), "EC_GROUP_set_curve_GFp"},
		@@ -101,6 +104,8 @@ static ERR_STRING_DATA EC_str_reasons[]=
		{
		{EC_R_BUFFER_TOO_SMALL ,"buffer too small"},
		{EC_R_INCOMPATIBLE_OBJECTS ,"incompatible objects"},
		{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"},

crypto/ec/ec_lcl.h

+16 −8

Original line number	Diff line number	Diff line
		@@ -63,19 +63,24 @@
		* so all this may change in future versions. */

		struct ec_method_st {
		/* used by EC_GROUP_new, EC_GROUP_set_curve_GFp, EC_GROUP_free, EC_GROUP_clear_free, EC_GROUP_copy: */
		/* used by EC_GROUP_new, EC_GROUP_free, EC_GROUP_clear_free, EC_GROUP_copy: */
		int (group_init)(EC_GROUP );
		int (group_set_curve_GFp)(EC_GROUP , const BIGNUM p, const BIGNUM a, const BIGNUM b, BN_CTX );
		void (group_finish)(EC_GROUP );
		void (group_clear_finish)(EC_GROUP );
		int (group_copy)(EC_GROUP , const EC_GROUP *);

		/* used by EC_GROUP_set_generator: */
		/* used by EC_GROUP_set_curve_GFp and EC_GROUP_get_curve_GFp: */
		int (group_set_curve_GFp)(EC_GROUP , const BIGNUM p, const BIGNUM a, const BIGNUM b, BN_CTX );
		int (group_get_curve_GFp)(EC_GROUP , BIGNUM p, BIGNUM a, BIGNUM b, BN_CTX );

		/* used by EC_GROUP_set_generator, EC_group_get0_generator,
		* EC_GROUP_get_order, EC_GROUP_get_cofactor:
		*/
		int (group_set_generator)(EC_GROUP , const EC_POINT *generator,
		const BIGNUM order, const BIGNUM cofactor);

		/* TODO: 'set' and 'get' functions for EC_GROUPs */

		EC_POINT (group_get0_generator)(EC_GROUP *);
		int (group_get_order)(EC_GROUP , BIGNUM order, BN_CTX );
		int (group_get_cofactor)(EC_GROUP , BIGNUM cofactor, BN_CTX );

		/* used by EC_POINT_new, EC_POINT_free, EC_POINT_clear_free, EC_POINT_copy: */
		int (point_init)(EC_POINT );
		@@ -195,13 +200,16 @@ struct ec_point_st {

		/* method functions in ecp_smpl.c */
		int ec_GFp_simple_group_init(EC_GROUP *);
		int ec_GFp_simple_group_set_curve_GFp(EC_GROUP , const BIGNUM p, const BIGNUM a, const BIGNUM b, BN_CTX *);
		void ec_GFp_simple_group_finish(EC_GROUP *);
		void ec_GFp_simple_group_clear_finish(EC_GROUP *);
		int ec_GFp_simple_group_copy(EC_GROUP , const EC_GROUP );
		int ec_GFp_simple_group_set_curve_GFp(EC_GROUP , const BIGNUM p, const BIGNUM a, const BIGNUM b, BN_CTX *);
		int ec_GFp_simple_group_get_curve_GFp(EC_GROUP , BIGNUM p, BIGNUM a, BIGNUM b, BN_CTX *);
		int ec_GFp_simple_group_set_generator(EC_GROUP , const EC_POINT generator,
		const BIGNUM order, const BIGNUM cofactor);
		/* TODO: 'set' and 'get' functions for EC_GROUPs */
		EC_POINT ec_GFp_simple_group_get0_generator(EC_GROUP );
		int ec_GFp_simple_group_get_order(EC_GROUP , BIGNUM order, BN_CTX *);
		int ec_GFp_simple_group_get_cofactor(EC_GROUP , BIGNUM cofactor, BN_CTX *);
		int ec_GFp_simple_point_init(EC_POINT *);
		void ec_GFp_simple_point_finish(EC_POINT *);
		void ec_GFp_simple_point_clear_finish(EC_POINT *);

crypto/ec/ec_lib.c

+25 −14

Original line number	Diff line number	Diff line
		@@ -56,9 +56,12 @@
		#include <string.h>

		#include <openssl/err.h>
		#include <openssl/opensslv.h>

		#include "ec_lcl.h"

		static const char EC_version[] = "EC" OPENSSL_VERSION_PTEXT;


		/* functions for EC_GROUP objects */

		@@ -101,17 +104,6 @@ EC_GROUP EC_GROUP_new(const EC_METHOD meth)
		}


		int EC_GROUP_set_curve_GFp(EC_GROUP group, const BIGNUM p, const BIGNUM a, const BIGNUM b, BN_CTX *ctx)
		{
		if (group->meth->group_set_curve_GFp == 0)
		{
		ECerr(EC_F_EC_GROUP_SET_CURVE_GFP, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
		return 0;
		}
		return group->meth->group_set_curve_GFp(group, p, a, b, ctx);
		}


		void EC_GROUP_free(EC_GROUP *group)
		{
		if (group->meth->group_finish != 0)
		@@ -171,6 +163,28 @@ int EC_GROUP_copy(EC_GROUP dest, const EC_GROUP src)
		}


		int EC_GROUP_set_curve_GFp(EC_GROUP group, const BIGNUM p, const BIGNUM a, const BIGNUM b, BN_CTX *ctx)
		{
		if (group->meth->group_set_curve_GFp == 0)
		{
		ECerr(EC_F_EC_GROUP_SET_CURVE_GFP, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
		return 0;
		}
		return group->meth->group_set_curve_GFp(group, p, a, b, ctx);
		}


		int EC_GROUP_get_curve_GFp(EC_GROUP group, BIGNUM p, BIGNUM a, BIGNUM b, BN_CTX *ctx)
		{
		if (group->meth->group_get_curve_GFp == 0)
		{
		ECerr(EC_F_EC_GROUP_GET_CURVE_GFP, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
		return 0;
		}
		return group->meth->group_get_curve_GFp(group, p, a, b, ctx);
		}


		int EC_GROUP_set_generator(EC_GROUP group, const EC_POINT generator, const BIGNUM order, const BIGNUM cofactor)
		{
		if (group->meth->group_set_generator == 0)
		@@ -182,9 +196,6 @@ int EC_GROUP_set_generator(EC_GROUP group, const EC_POINT generator, const BIG
		}


		/* TODO: 'set' and 'get' functions for EC_GROUPs */


		/* this has 'package' visibility */
		int EC_GROUP_set_extra_data(EC_GROUP group, void extra_data, void (extra_data_dup_func)(void *),
		void (extra_data_free_func)(void ), void (extra_data_clear_free_func)(void ))