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

Initial public key ASN1 method engine support. Not integrated yet.

parent 7e5b0681

CHANGES

+2 −0
Original line number Diff line number Diff line
@@ -4,6 +4,8 @@ 


 Changes between 0.9.8b and 0.9.9  [xx XXX xxxx]



  *) Initial engine support for EVP_PKEY_ASN1_METHOD.



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

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

     functional reference processing.

crypto/engine/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -20,12 +20,12 @@ LIB=$(TOP)/libcrypto.a 
LIBSRC= eng_err.c eng_lib.c eng_list.c eng_init.c eng_ctrl.c \

	eng_table.c eng_pkey.c eng_fat.c eng_all.c \

	tb_rsa.c tb_dsa.c tb_ecdsa.c tb_dh.c tb_ecdh.c tb_rand.c tb_store.c \

	tb_cipher.c tb_digest.c tb_pkmeth.c \

	tb_cipher.c tb_digest.c tb_pkmeth.c tb_asnmth.c \

	eng_openssl.c eng_cnf.c eng_dyn.c eng_cryptodev.c eng_padlock.c

LIBOBJ= eng_err.o eng_lib.o eng_list.o eng_init.o eng_ctrl.o \

	eng_table.o eng_pkey.o eng_fat.o eng_all.o \

	tb_rsa.o tb_dsa.o tb_ecdsa.o tb_dh.o tb_ecdh.o tb_rand.o tb_store.o \

	tb_cipher.o tb_digest.o tb_pkmeth.o \

	tb_cipher.o tb_digest.o tb_pkmeth.o tb_asnmth.o \

	eng_openssl.o eng_cnf.o eng_dyn.o eng_cryptodev.o eng_padlock.o



SRC= $(LIBSRC)

crypto/engine/eng_err.c

+1 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ static ERR_STRING_DATA ENGINE_str_functs[]= 
{ERR_FUNC(ENGINE_F_ENGINE_GET_DEFAULT_TYPE),	"ENGINE_GET_DEFAULT_TYPE"},

{ERR_FUNC(ENGINE_F_ENGINE_GET_DIGEST),	"ENGINE_get_digest"},

{ERR_FUNC(ENGINE_F_ENGINE_GET_NEXT),	"ENGINE_get_next"},

{ERR_FUNC(ENGINE_F_ENGINE_GET_PKEY_ASN1_METH),	"ENGINE_get_pkey_asn1_meth"},

{ERR_FUNC(ENGINE_F_ENGINE_GET_PKEY_METH),	"ENGINE_get_pkey_meth"},

{ERR_FUNC(ENGINE_F_ENGINE_GET_PREV),	"ENGINE_get_prev"},

{ERR_FUNC(ENGINE_F_ENGINE_INIT),	"ENGINE_init"},

crypto/engine/eng_int.h

+2 −0
Original line number Diff line number Diff line
@@ -166,6 +166,8 @@ struct engine_st 
	ENGINE_DIGESTS_PTR digests;

	/* Public key handling via this callback */

	ENGINE_PKEY_METHS_PTR pkey_meths;

	/* ASN1 public key handling via this callback */

	ENGINE_PKEY_ASN1_METHS_PTR pkey_asn1_meths;



	ENGINE_GEN_INT_FUNC_PTR	destroy;

crypto/engine/engine.h

+5 −0
Original line number Diff line number Diff line
@@ -294,6 +294,7 @@ typedef EVP_PKEY * (*ENGINE_LOAD_KEY_PTR)(ENGINE *, const char *, 
typedef int (*ENGINE_CIPHERS_PTR)(ENGINE *, const EVP_CIPHER **, const int **, int);

typedef int (*ENGINE_DIGESTS_PTR)(ENGINE *, const EVP_MD **, const int **, int);

typedef int (*ENGINE_PKEY_METHS_PTR)(ENGINE *, EVP_PKEY_METHOD **, const int **, int);

typedef int (*ENGINE_PKEY_ASN1_METHS_PTR)(ENGINE *, EVP_PKEY_ASN1_METHOD **, const int **, int);

/* STRUCTURE functions ... all of these functions deal with pointers to ENGINE

 * structures where the pointers have a "structural reference". This means that

 * their reference is to allowed access to the structure but it does not imply
@@ -467,6 +468,7 @@ int ENGINE_set_load_pubkey_function(ENGINE *e, ENGINE_LOAD_KEY_PTR loadpub_f); 
int ENGINE_set_ciphers(ENGINE *e, ENGINE_CIPHERS_PTR f);

int ENGINE_set_digests(ENGINE *e, ENGINE_DIGESTS_PTR f);

int ENGINE_set_pkey_meths(ENGINE *e, ENGINE_PKEY_METHS_PTR f);

int ENGINE_set_pkey_asn1_meths(ENGINE *e, ENGINE_PKEY_ASN1_METHS_PTR f);

int ENGINE_set_flags(ENGINE *e, int flags);

int ENGINE_set_cmd_defns(ENGINE *e, const ENGINE_CMD_DEFN *defns);

/* These functions allow control over any per-structure ENGINE data. */
@@ -503,9 +505,11 @@ ENGINE_LOAD_KEY_PTR ENGINE_get_load_pubkey_function(const ENGINE *e); 
ENGINE_CIPHERS_PTR ENGINE_get_ciphers(const ENGINE *e);

ENGINE_DIGESTS_PTR ENGINE_get_digests(const ENGINE *e);

ENGINE_PKEY_METHS_PTR ENGINE_get_pkey_meths(const ENGINE *e);

ENGINE_PKEY_ASN1_METHS_PTR ENGINE_get_pkey_asn1_meths(const ENGINE *e);

const EVP_CIPHER *ENGINE_get_cipher(ENGINE *e, int nid);

const EVP_MD *ENGINE_get_digest(ENGINE *e, int nid);

const EVP_PKEY_METHOD *ENGINE_get_pkey_meth(ENGINE *e, int nid);

const EVP_PKEY_ASN1_METHOD *ENGINE_get_pkey_asn1_meth(ENGINE *e, int nid);

const ENGINE_CMD_DEFN *ENGINE_get_cmd_defns(const ENGINE *e);

int ENGINE_get_flags(const ENGINE *e);
@@ -727,6 +731,7 @@ void ERR_load_ENGINE_strings(void); 
#define ENGINE_F_ENGINE_GET_DEFAULT_TYPE		 177

#define ENGINE_F_ENGINE_GET_DIGEST			 186

#define ENGINE_F_ENGINE_GET_NEXT			 115

#define ENGINE_F_ENGINE_GET_PKEY_ASN1_METH		 193

#define ENGINE_F_ENGINE_GET_PKEY_METH			 192

#define ENGINE_F_ENGINE_GET_PREV			 116

#define ENGINE_F_ENGINE_INIT				 119