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

Initial functions for main EVP_PKEY_METHOD operations. 

No method implementations yet.
parent 5da98aa6

CHANGES

+5 −0
Original line number Diff line number Diff line
@@ -4,6 +4,11 @@ 


 Changes between 0.9.8a and 0.9.9  [xx XXX xxxx]



  *) Add functions for main EVP_PKEY_method operations. The undocumented

     functions EVP_PKEY_{encrypt,decrypt} have been renamed to

     EVP_PKEY_{encrypt,decrypt}_old. 

     [Steve Henson]



  *) Initial definitions for EVP_PKEY_METHOD. This will be a high level public

     key API, doesn't do much yet.

     [Steve Henson]

crypto/evp/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ LIBSRC= encode.c digest.c evp_enc.c evp_key.c evp_acnf.c \ 
	bio_md.c bio_b64.c bio_enc.c evp_err.c e_null.c \

	c_all.c c_allc.c c_alld.c evp_lib.c bio_ok.c \

	evp_pkey.c evp_pbe.c p5_crpt.c p5_crpt2.c \

	e_old.c pmeth_lib.c

	e_old.c pmeth_lib.c pmeth_fn.c



LIBOBJ=	encode.o digest.o evp_enc.o evp_key.o evp_acnf.o \

	e_des.o e_bf.o e_idea.o e_des3.o \
@@ -40,7 +40,7 @@ LIBOBJ= encode.o digest.o evp_enc.o evp_key.o evp_acnf.o \ 
	bio_md.o bio_b64.o bio_enc.o evp_err.o e_null.o \

	c_all.o c_allc.o c_alld.o evp_lib.o bio_ok.o \

	evp_pkey.o evp_pbe.o p5_crpt.o p5_crpt2.o \

	e_old.o pmeth_lib.o

	e_old.o pmeth_lib.o pmeth_fn.o



SRC= $(LIBSRC)

crypto/evp/evp.h

+12 −2
Original line number Diff line number Diff line
@@ -768,10 +768,10 @@ const EVP_CIPHER *EVP_get_cipherbyname(const char *name); 
const EVP_MD *EVP_get_digestbyname(const char *name);

void EVP_cleanup(void);



int		EVP_PKEY_decrypt(unsigned char *dec_key,

int		EVP_PKEY_decrypt_old(unsigned char *dec_key,

			const unsigned char *enc_key,int enc_key_len,

			EVP_PKEY *private_key);

int		EVP_PKEY_encrypt(unsigned char *enc_key,

int		EVP_PKEY_encrypt_old(unsigned char *enc_key,

			const unsigned char *key,int key_len,

			EVP_PKEY *pub_key);

int		EVP_PKEY_type(int type);
@@ -943,13 +943,21 @@ 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_DECRYPT				 104

#define EVP_F_EVP_PKEY_DECRYPT_INIT			 138

#define EVP_F_EVP_PKEY_ENCRYPT				 105

#define EVP_F_EVP_PKEY_ENCRYPT_INIT			 139

#define EVP_F_EVP_PKEY_GET1_DH				 119

#define EVP_F_EVP_PKEY_GET1_DSA				 120

#define EVP_F_EVP_PKEY_GET1_ECDSA			 130

#define EVP_F_EVP_PKEY_GET1_EC_KEY			 131

#define EVP_F_EVP_PKEY_GET1_RSA				 121

#define EVP_F_EVP_PKEY_NEW				 106

#define EVP_F_EVP_PKEY_SIGN				 140

#define EVP_F_EVP_PKEY_SIGN_INIT			 141

#define EVP_F_EVP_PKEY_VERIFY				 142

#define EVP_F_EVP_PKEY_VERIFY_INIT			 143

#define EVP_F_EVP_PKEY_VERIFY_RECOVER			 144

#define EVP_F_EVP_PKEY_VERIFY_RECOVER_INIT		 145

#define EVP_F_EVP_RIJNDAEL				 126

#define EVP_F_EVP_SIGNFINAL				 107

#define EVP_F_EVP_VERIFYFINAL				 108
@@ -995,6 +1003,8 @@ void ERR_load_EVP_strings(void); 
#define EVP_R_NO_OPERATION_SET				 149

#define EVP_R_NO_SIGN_FUNCTION_CONFIGURED		 104

#define EVP_R_NO_VERIFY_FUNCTION_CONFIGURED		 105

#define EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE	 150

#define EVP_R_OPERATON_NOT_INITIALIZED			 151

#define EVP_R_PKCS8_UNKNOWN_BROKEN_TYPE			 117

#define EVP_R_PRIVATE_KEY_DECODE_ERROR			 145

#define EVP_R_PRIVATE_KEY_ENCODE_ERROR			 146

crypto/evp/evp_err.c

+13 −3
Original line number Diff line number Diff line
@@ -90,15 +90,23 @@ static ERR_STRING_DATA EVP_str_functs[]= 
{ERR_FUNC(EVP_F_EVP_PKCS82PKEY_BROKEN),	"EVP_PKCS82PKEY_BROKEN"},

{ERR_FUNC(EVP_F_EVP_PKEY2PKCS8_BROKEN),	"EVP_PKEY2PKCS8_broken"},

{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_DECRYPT),	"EVP_PKEY_decrypt"},

{ERR_FUNC(EVP_F_EVP_PKEY_ENCRYPT),	"EVP_PKEY_encrypt"},

{ERR_FUNC(EVP_F_EVP_PKEY_CTX_CTRL),	"EVP_PKEY_CTX_ctrl"},

{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_ENCRYPT),	"EVP_PKEY_ENCRYPT"},

{ERR_FUNC(EVP_F_EVP_PKEY_ENCRYPT_INIT),	"EVP_PKEY_ENCRYPT_INIT"},

{ERR_FUNC(EVP_F_EVP_PKEY_GET1_DH),	"EVP_PKEY_get1_DH"},

{ERR_FUNC(EVP_F_EVP_PKEY_GET1_DSA),	"EVP_PKEY_get1_DSA"},

{ERR_FUNC(EVP_F_EVP_PKEY_GET1_ECDSA),	"EVP_PKEY_GET1_ECDSA"},

{ERR_FUNC(EVP_F_EVP_PKEY_GET1_EC_KEY),	"EVP_PKEY_get1_EC_KEY"},

{ERR_FUNC(EVP_F_EVP_PKEY_GET1_RSA),	"EVP_PKEY_get1_RSA"},

{ERR_FUNC(EVP_F_EVP_PKEY_NEW),	"EVP_PKEY_new"},

{ERR_FUNC(EVP_F_EVP_PKEY_SIGN),	"EVP_PKEY_SIGN"},

{ERR_FUNC(EVP_F_EVP_PKEY_SIGN_INIT),	"EVP_PKEY_SIGN_INIT"},

{ERR_FUNC(EVP_F_EVP_PKEY_VERIFY),	"EVP_PKEY_VERIFY"},

{ERR_FUNC(EVP_F_EVP_PKEY_VERIFY_INIT),	"EVP_PKEY_VERIFY_INIT"},

{ERR_FUNC(EVP_F_EVP_PKEY_VERIFY_RECOVER),	"EVP_PKEY_VERIFY_RECOVER"},

{ERR_FUNC(EVP_F_EVP_PKEY_VERIFY_RECOVER_INIT),	"EVP_PKEY_VERIFY_RECOVER_INIT"},

{ERR_FUNC(EVP_F_EVP_RIJNDAEL),	"EVP_RIJNDAEL"},

{ERR_FUNC(EVP_F_EVP_SIGNFINAL),	"EVP_SignFinal"},

{ERR_FUNC(EVP_F_EVP_VERIFYFINAL),	"EVP_VerifyFinal"},
@@ -147,6 +155,8 @@ static ERR_STRING_DATA EVP_str_reasons[]= 
{ERR_REASON(EVP_R_NO_OPERATION_SET)      ,"no operation set"},

{ERR_REASON(EVP_R_NO_SIGN_FUNCTION_CONFIGURED),"no sign function configured"},

{ERR_REASON(EVP_R_NO_VERIFY_FUNCTION_CONFIGURED),"no verify function configured"},

{ERR_REASON(EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE),"operation not supported for this keytype"},

{ERR_REASON(EVP_R_OPERATON_NOT_INITIALIZED),"operaton not initialized"},

{ERR_REASON(EVP_R_PKCS8_UNKNOWN_BROKEN_TYPE),"pkcs8 unknown broken type"},

{ERR_REASON(EVP_R_PRIVATE_KEY_DECODE_ERROR),"private key decode error"},

{ERR_REASON(EVP_R_PRIVATE_KEY_ENCODE_ERROR),"private key encode error"},

crypto/evp/evp_locl.h

+1 −0
Original line number Diff line number Diff line
@@ -264,6 +264,7 @@ struct evp_pkey_method_st 
	int pkey_id;

	int flags;

	int (*init)(EVP_PKEY_CTX *ctx);



	int (*paramgen_init)(EVP_PKEY_CTX *ctx);

	int (*paramgen)(EVP_PKEY *key, EVP_PKEY_CTX *ctx);