Commit 0c372b94 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files 

Make {RSA,DSA,DH}_new_method obtain and release an ENGINE
functional reference in all cases.
parent 26e12373

crypto/dh/dh.h

+1 −1
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ void ERR_load_DH_strings(void); 
#define DH_F_DH_COMPUTE_KEY				 102

#define DH_F_DH_GENERATE_KEY				 103

#define DH_F_DH_GENERATE_PARAMETERS			 104

#define DH_F_DH_NEW					 105

#define DH_F_DH_NEW_METHOD				 105



/* Reason codes. */

#define DH_R_NO_PRIVATE_VALUE				 100

crypto/dh/dh_err.c

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ static ERR_STRING_DATA DH_str_functs[]= 
{ERR_PACK(0,DH_F_DH_COMPUTE_KEY,0),	"DH_compute_key"},

{ERR_PACK(0,DH_F_DH_GENERATE_KEY,0),	"DH_generate_key"},

{ERR_PACK(0,DH_F_DH_GENERATE_PARAMETERS,0),	"DH_generate_parameters"},

{ERR_PACK(0,DH_F_DH_NEW,0),	"DH_new"},

{ERR_PACK(0,DH_F_DH_NEW_METHOD,0),	"DH_new_method"},

{0,NULL}

	};

crypto/dh/dh_lib.c

+15 −4
Original line number Diff line number Diff line
@@ -107,20 +107,29 @@ DH *DH_new_method(ENGINE *engine) 
	ret=(DH *)OPENSSL_malloc(sizeof(DH));

	if (ret == NULL)

		{

		DHerr(DH_F_DH_NEW,ERR_R_MALLOC_FAILURE);

		DHerr(DH_F_DH_NEW_METHOD,ERR_R_MALLOC_FAILURE);

		return(NULL);

		}



	ret->meth = DH_get_default_method();

	if (engine)

		{

		if (!ENGINE_init(engine))

			{

			DSAerr(DH_F_DH_NEW_METHOD, ERR_R_ENGINE_LIB);

			OPENSSL_free(ret);

			return NULL;

			}

		ret->engine = engine;

	if(!ret->engine)

		}

	else

		ret->engine = ENGINE_get_default_DH();

	if(ret->engine)

		{

		ret->meth = ENGINE_get_DH(ret->engine);

		if(!ret->meth)

			{

			DHerr(DH_F_DH_NEW,ERR_R_ENGINE_LIB);

			DHerr(DH_F_DH_NEW_METHOD,ERR_R_ENGINE_LIB);

			ENGINE_finish(ret->engine);

			OPENSSL_free(ret);

			return NULL;
@@ -145,6 +154,8 @@ DH *DH_new_method(ENGINE *engine) 
	CRYPTO_new_ex_data(CRYPTO_EX_INDEX_DH, ret, &ret->ex_data);

	if ((ret->meth->init != NULL) && !ret->meth->init(ret))

		{

		if (ret->engine)

			ENGINE_finish(ret->engine);

		CRYPTO_free_ex_data(CRYPTO_EX_INDEX_DH, ret, &ret->ex_data);

		OPENSSL_free(ret);

		ret=NULL;

crypto/dsa/dsa.h

+1 −1
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ void ERR_load_DSA_strings(void); 
#define DSA_F_DSAPARAMS_PRINT_FP			 101

#define DSA_F_DSA_DO_SIGN				 112

#define DSA_F_DSA_DO_VERIFY				 113

#define DSA_F_DSA_NEW					 103

#define DSA_F_DSA_NEW_METHOD				 103

#define DSA_F_DSA_PRINT					 104

#define DSA_F_DSA_PRINT_FP				 105

#define DSA_F_DSA_SIGN					 106

crypto/dsa/dsa_err.c

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ static ERR_STRING_DATA DSA_str_functs[]= 
{ERR_PACK(0,DSA_F_DSAPARAMS_PRINT_FP,0),	"DSAparams_print_fp"},

{ERR_PACK(0,DSA_F_DSA_DO_SIGN,0),	"DSA_do_sign"},

{ERR_PACK(0,DSA_F_DSA_DO_VERIFY,0),	"DSA_do_verify"},

{ERR_PACK(0,DSA_F_DSA_NEW,0),	"DSA_new"},

{ERR_PACK(0,DSA_F_DSA_NEW_METHOD,0),	"DSA_new_method"},

{ERR_PACK(0,DSA_F_DSA_PRINT,0),	"DSA_print"},

{ERR_PACK(0,DSA_F_DSA_PRINT_FP,0),	"DSA_print_fp"},

{ERR_PACK(0,DSA_F_DSA_SIGN,0),	"DSA_sign"},