Commit 98eab439 authored by Bodo Möller's avatar Bodo Möller
Browse files

EC_GROUP_get_extra_data() should not set an error when it returns NULL. 

(NB: this is not an API change because this internal function is unused
in 0.9.7.  0.9.8-dev will use it, and will contain a similar change).
parent ef03883e

crypto/ec/ec.h

+0 −2
Original line number Diff line number Diff line
@@ -195,7 +195,6 @@ void ERR_load_EC_strings(void); 
#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_PRECOMPUTE_MULT			 142
@@ -232,7 +231,6 @@ void ERR_load_EC_strings(void); 
#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

#define EC_R_SLOT_FULL					 108

crypto/ec/ec_err.c

+0 −2
Original line number Diff line number Diff line
@@ -84,7 +84,6 @@ static ERR_STRING_DATA EC_str_functs[]= 
{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_PRECOMPUTE_MULT,0),	"EC_GROUP_precompute_mult"},
@@ -124,7 +123,6 @@ static ERR_STRING_DATA EC_str_reasons[]= 
{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"},

{EC_R_SLOT_FULL                          ,"slot full"},

crypto/ec/ec_lib.c

+2 −0
Original line number Diff line number Diff line
@@ -268,7 +268,9 @@ void *EC_GROUP_get_extra_data(const EC_GROUP *group, void *(*extra_data_dup_func 
		|| (group->extra_data_free_func != extra_data_free_func)

		|| (group->extra_data_clear_free_func != extra_data_clear_free_func))

		{

#if 0 /* this was an error in 0.9.7, but that does not make a lot of sense */

		ECerr(EC_F_EC_GROUP_GET_EXTRA_DATA, EC_R_NO_SUCH_EXTRA_DATA);

#endif

		return NULL;

		}