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

Include EVP_PKEY argument in EVP_PKEY_CTX_new(). This avoids the

Browse Source 
need for a separate EVP_PKEY parameter in the other operation
initialization routines.
This commit is contained in:
Dr. Stephen Henson
2006-04-07 17:28:56 +00:00
parent f733a5ef0e
commit cd7638980a
4 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
crypto/evp/pmeth_lib.c
View File

@@ -61,6 +61,7 @@
#include <openssl/objects.h>
#include "cryptlib.h"
#include <openssl/evp.h>
#include "asn1_locl.h"
#include "evp_locl.h"
STACK *app_pkey_methods = NULL;
@@ -100,17 +101,20 @@ const EVP_PKEY_METHOD *EVP_PKEY_meth_find(int type, ENGINE *e)
return *ret;
}
EVP_PKEY_CTX *EVP_PKEY_CTX_new(int ktype, ENGINE *e)
EVP_PKEY_CTX *EVP_PKEY_CTX_new(EVP_PKEY *pkey)
{
EVP_PKEY_CTX *ret;
const EVP_PKEY_METHOD *pmeth;
pmeth = EVP_PKEY_meth_find(ktype, e);
if (!pkey || !pkey->ameth)
return NULL;
pmeth = EVP_PKEY_meth_find(pkey->ameth->pkey_id, NULL);
if (pmeth == NULL)
return NULL;
ret = OPENSSL_malloc(sizeof(EVP_PKEY_CTX));
ret->pmeth = pmeth;
ret->operation = EVP_PKEY_OP_UNDEFINED;
ret->pkey = NULL;
CRYPTO_add(&pkey->references,1,CRYPTO_LOCK_EVP_PKEY);
ret->pkey = pkey;
ret->data = NULL;
if (pmeth->init)