generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make {RSA,DSA,DH}_new_method obtain and release an ENGINE

Browse Source 
functional reference.
This commit is contained in:
Dr. Stephen Henson
2002-03-09 18:24:14 +00:00
parent a1a4e8b6bb
commit 1619add90c
7 changed files with 47 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
crypto/dh/dh_lib.c
View File

@@ -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();
ret->engine = engine;
if(!ret->engine)
if (engine)
{
if (!ENGINE_init(engine))
{
DSAerr(DH_F_DH_NEW_METHOD, ERR_R_ENGINE_LIB);
OPENSSL_free(ret);
return NULL;
}
ret->engine = 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;