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

Make no-engine work again.

Browse Source
This commit is contained in:
Dr. Stephen Henson 2009-02-15 15:28:18 +00:00
parent b3f3407850
commit a63bf2c53c
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Configure
View File

@ -1423,6 +1423,7 @@ while (<IN>)
} }
} }
$sdirs = 0 unless /\\$/; $sdirs = 0 unless /\\$/;
s/engines // if (/^DIRS=/ && $disabled{"engine"});
s/^VERSION=.*/VERSION=$version/; s/^VERSION=.*/VERSION=$version/;
s/^MAJOR=.*/MAJOR=$major/; s/^MAJOR=.*/MAJOR=$major/;
s/^MINOR=.*/MINOR=$minor/; s/^MINOR=.*/MINOR=$minor/;

4
crypto/evp/pmeth_lib.c
View File

@ -125,6 +125,7 @@ static EVP_PKEY_CTX *int_ctx_new(EVP_PKEY *pkey, ENGINE *e, int id)
return NULL; return NULL;
id = pkey->ameth->pkey_id; id = pkey->ameth->pkey_id;
} }
#ifndef OPENSSL_NO_ENGINE
/* Try to find an ENGINE which implements this method */ /* Try to find an ENGINE which implements this method */
if (e) if (e)
{ {
@ -144,6 +145,7 @@ static EVP_PKEY_CTX *int_ctx_new(EVP_PKEY *pkey, ENGINE *e, int id)
if (e) if (e)
pmeth = ENGINE_get_pkey_meth(e, id); pmeth = ENGINE_get_pkey_meth(e, id);
else else
#endif
pmeth = EVP_PKEY_meth_find(id); pmeth = EVP_PKEY_meth_find(id);
if (pmeth == NULL) if (pmeth == NULL)
@ -155,8 +157,10 @@ static EVP_PKEY_CTX *int_ctx_new(EVP_PKEY *pkey, ENGINE *e, int id)
ret = OPENSSL_malloc(sizeof(EVP_PKEY_CTX)); ret = OPENSSL_malloc(sizeof(EVP_PKEY_CTX));
if (!ret) if (!ret)
{ {
#ifndef OPENSSL_NO_ENGINE
if (e) if (e)
ENGINE_finish(e); ENGINE_finish(e);
#endif
EVPerr(EVP_F_INT_CTX_NEW,ERR_R_MALLOC_FAILURE); EVPerr(EVP_F_INT_CTX_NEW,ERR_R_MALLOC_FAILURE);
return NULL; return NULL;
} }