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

Add ENGINE support for EVP_PKEY_METHOD including lookups of ENGINE 

implementations and functional reference counting when a context
is allocated, free or copied.
parent 3aedd213

CHANGES

+2 −1
Original line number Diff line number Diff line
@@ -5,7 +5,8 @@ 
 Changes between 0.9.8b and 0.9.9  [xx XXX xxxx]



  *) Initial engine support for EVP_PKEY_METHOD. New functions to permit

     an engine to register a method. 

     an engine to register a method. Add ENGINE lookups for methods and

     functional reference processing.

     [Steve Henson]



  *) New functions EVP_Digest{Sign,Verify)*. These are enchance versions of

crypto/engine/engine.h

+1 −0
Original line number Diff line number Diff line
@@ -552,6 +552,7 @@ ENGINE *ENGINE_get_default_RAND(void); 
 * ciphering or digesting corresponding to "nid". */

ENGINE *ENGINE_get_cipher_engine(int nid);

ENGINE *ENGINE_get_digest_engine(int nid);

ENGINE *ENGINE_get_pkey_meth_engine(int nid);



/* This sets a new default ENGINE structure for performing RSA

 * operations. If the result is non-zero (success) then the ENGINE

crypto/evp/evp.h

+3 −1
Original line number Diff line number Diff line
@@ -954,7 +954,7 @@ void EVP_PKEY_asn1_set_ctrl(EVP_PKEY_ASN1_METHOD *ameth, 


#define EVP_PKEY_FLAG_AUTOARGLEN	2



const EVP_PKEY_METHOD *EVP_PKEY_meth_find(int type, ENGINE *e);

const EVP_PKEY_METHOD *EVP_PKEY_meth_find(int type);

EVP_PKEY_METHOD* EVP_PKEY_meth_new(int id, int flags);

void EVP_PKEY_meth_free(EVP_PKEY_METHOD *pmeth);

int EVP_PKEY_meth_add0(const EVP_PKEY_METHOD *pmeth);
@@ -1109,6 +1109,7 @@ void ERR_load_EVP_strings(void); 
#define EVP_F_EVP_PKEY_COPY_PARAMETERS			 103

#define EVP_F_EVP_PKEY_CTX_CTRL				 137

#define EVP_F_EVP_PKEY_CTX_CTRL_STR			 150

#define EVP_F_EVP_PKEY_CTX_DUP				 156

#define EVP_F_EVP_PKEY_DECRYPT				 104

#define EVP_F_EVP_PKEY_DECRYPT_INIT			 138

#define EVP_F_EVP_PKEY_DECRYPT_OLD			 151
@@ -1137,6 +1138,7 @@ void ERR_load_EVP_strings(void); 
#define EVP_F_EVP_RIJNDAEL				 126

#define EVP_F_EVP_SIGNFINAL				 107

#define EVP_F_EVP_VERIFYFINAL				 108

#define EVP_F_INT_CTX_NEW				 157

#define EVP_F_PKCS5_PBE_KEYIVGEN			 117

#define EVP_F_PKCS5_V2_PBE_KEYIVGEN			 118

#define EVP_F_PKCS8_SET_BROKEN				 112

crypto/evp/evp_err.c

+2 −0
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ static ERR_STRING_DATA EVP_str_functs[]= 
{ERR_FUNC(EVP_F_EVP_PKEY_COPY_PARAMETERS),	"EVP_PKEY_copy_parameters"},

{ERR_FUNC(EVP_F_EVP_PKEY_CTX_CTRL),	"EVP_PKEY_CTX_ctrl"},

{ERR_FUNC(EVP_F_EVP_PKEY_CTX_CTRL_STR),	"EVP_PKEY_CTX_ctrl_str"},

{ERR_FUNC(EVP_F_EVP_PKEY_CTX_DUP),	"EVP_PKEY_CTX_dup"},

{ERR_FUNC(EVP_F_EVP_PKEY_DECRYPT),	"EVP_PKEY_decrypt"},

{ERR_FUNC(EVP_F_EVP_PKEY_DECRYPT_INIT),	"EVP_PKEY_decrypt_init"},

{ERR_FUNC(EVP_F_EVP_PKEY_DECRYPT_OLD),	"EVP_PKEY_decrypt_old"},
@@ -120,6 +121,7 @@ static ERR_STRING_DATA EVP_str_functs[]= 
{ERR_FUNC(EVP_F_EVP_RIJNDAEL),	"EVP_RIJNDAEL"},

{ERR_FUNC(EVP_F_EVP_SIGNFINAL),	"EVP_SignFinal"},

{ERR_FUNC(EVP_F_EVP_VERIFYFINAL),	"EVP_VerifyFinal"},

{ERR_FUNC(EVP_F_INT_CTX_NEW),	"INT_CTX_NEW"},

{ERR_FUNC(EVP_F_PKCS5_PBE_KEYIVGEN),	"PKCS5_PBE_keyivgen"},

{ERR_FUNC(EVP_F_PKCS5_V2_PBE_KEYIVGEN),	"PKCS5_v2_PBE_keyivgen"},

{ERR_FUNC(EVP_F_PKCS8_SET_BROKEN),	"PKCS8_set_broken"},

crypto/evp/evp_locl.h

+2 −0
Original line number Diff line number Diff line
@@ -239,6 +239,8 @@ struct evp_pkey_ctx_st 
	{

	/* Method associated with this operation */

	const EVP_PKEY_METHOD *pmeth;

	/* Engine that implements this method or NULL if builtin */

	ENGINE *engine;

	/* Key: may be NULL */

	EVP_PKEY *pkey;

	/* Peer key for key agreement, may be NULL */