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

Make EVP_PKEY_ASN1_METHOD opaque. Add application level functions to 

initialize it. Initial support for application added public key ASN1.
parent 043b2e9c

crypto/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ TOP= .. 
CC=		cc

INCLUDE=	-I. -I$(TOP) -I../include

# INCLUDES targets sudbirs!

INCLUDES=	-I.. -I../.. -I../../include

INCLUDES=	-I.. -I../.. -I../asn1 -I../../include

CFLAG=		-g

MAKEDEPPROG=	makedepend

MAKEDEPEND=	$(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)

crypto/asn1/ameth_lib.c

+125 −3
Original line number Diff line number Diff line
@@ -81,6 +81,11 @@ const EVP_PKEY_ASN1_METHOD *standard_methods[] = 
	&eckey_asn1_meth

	};



typedef int sk_cmp_fn_type(const char * const *a, const char * const *b);

static STACK *app_methods = NULL;







#ifdef TEST

void main()

	{
@@ -97,14 +102,21 @@ void main() 
static int ameth_cmp(const EVP_PKEY_ASN1_METHOD * const *a,

                const EVP_PKEY_ASN1_METHOD * const *b)

	{

/*fprintf(stderr, "Comparing %d with %d\n", (*a)->pkey_id, (*b)->pkey_id);*/

        return ((*a)->pkey_id - (*b)->pkey_id);

	}



const EVP_PKEY_ASN1_METHOD *EVP_PKEY_ASN1_find(int type)

const EVP_PKEY_ASN1_METHOD *EVP_PKEY_asn1_find(int type)

	{

	EVP_PKEY_ASN1_METHOD tmp, *t = &tmp, **ret;

	tmp.pkey_id = type;

	if (app_methods)

		{

		int idx;

		idx = sk_find(app_methods, (char *)&t);

		if (idx > 0)

			return (EVP_PKEY_ASN1_METHOD *)

				sk_value(app_methods, idx);

		}

	ret = (EVP_PKEY_ASN1_METHOD **) OBJ_bsearch((char *)&t,

        		(char *)standard_methods,

			sizeof(standard_methods)/sizeof(EVP_PKEY_ASN1_METHOD *),
@@ -113,7 +125,117 @@ const EVP_PKEY_ASN1_METHOD *EVP_PKEY_ASN1_find(int type) 
	if (!ret || !*ret)

		return NULL;

	if ((*ret)->pkey_flags & ASN1_PKEY_ALIAS)

		return EVP_PKEY_ASN1_find((*ret)->pkey_base_id);

		return EVP_PKEY_asn1_find((*ret)->pkey_base_id);

	return *ret;

	}



int EVP_PKEY_asn1_add(const EVP_PKEY_ASN1_METHOD *ameth)

	{

	if (app_methods == NULL)

		{

		app_methods = sk_new((sk_cmp_fn_type *)ameth_cmp);

		if (!app_methods)

			return 0;

		}

	if (!sk_push(app_methods, (char *)ameth))

		return 0;

	sk_sort(app_methods);

	return 1;

	}



EVP_PKEY_ASN1_METHOD* EVP_PKEY_asn1_new(int id)

	{

	EVP_PKEY_ASN1_METHOD *ameth;

	ameth = OPENSSL_malloc(sizeof(EVP_PKEY_ASN1_METHOD));

	if (!ameth)

		return NULL;



	ameth->pkey_id = id;

	ameth->pkey_base_id = id;

	ameth->pkey_flags = ASN1_PKEY_DYNAMIC;

	

	ameth->pub_decode = 0;

	ameth->pub_encode = 0;

	ameth->pub_cmp = 0;

	ameth->pub_print = 0;





	ameth->priv_decode = 0;

	ameth->priv_encode = 0;

	ameth->priv_print = 0;

	



	ameth->pkey_size = 0;

	ameth->pkey_bits = 0;



	ameth->param_decode = 0;

	ameth->param_encode = 0;

	ameth->param_missing = 0;

	ameth->param_copy = 0;

	ameth->param_cmp = 0;

	ameth->param_print = 0;





	ameth->pkey_free = 0;

	ameth->pkey_ctrl = 0;



	return ameth;

	}



void EVP_PKEY_asn1_set_public(EVP_PKEY_ASN1_METHOD *ameth,

		int (*pub_decode)(EVP_PKEY *pk, X509_PUBKEY *pub),

		int (*pub_encode)(X509_PUBKEY *pub, const EVP_PKEY *pk),

		int (*pub_cmp)(const EVP_PKEY *a, const EVP_PKEY *b),

		int (*pub_print)(BIO *out, const EVP_PKEY *pkey, int indent,

							ASN1_PCTX *pctx),

		int (*pkey_size)(const EVP_PKEY *pk),

		int (*pkey_bits)(const EVP_PKEY *pk))

	{

	ameth->pub_decode = pub_decode;

	ameth->pub_encode = pub_encode;

	ameth->pub_cmp = pub_cmp;

	ameth->pub_print = pub_print;

	ameth->pkey_size = pkey_size;

	ameth->pkey_bits = pkey_bits;

	}



void EVP_PKEY_asn1_set_private(EVP_PKEY_ASN1_METHOD *ameth,

		int (*priv_decode)(EVP_PKEY *pk, PKCS8_PRIV_KEY_INFO *p8inf),

		int (*priv_encode)(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pk),

		int (*priv_print)(BIO *out, const EVP_PKEY *pkey, int indent,

							ASN1_PCTX *pctx))

	{

	ameth->priv_decode = priv_decode;

	ameth->priv_encode = priv_encode;

	ameth->priv_print = priv_print;

	}



void EVP_PKEY_asn1_set_param(EVP_PKEY_ASN1_METHOD *ameth,

		int (*param_decode)(const EVP_PKEY *pk, X509_PUBKEY *pub),

		int (*param_encode)(X509_PUBKEY *pub, const EVP_PKEY *pk),

		int (*param_missing)(const EVP_PKEY *pk),

		int (*param_copy)(EVP_PKEY *to, const EVP_PKEY *from),

		int (*param_cmp)(const EVP_PKEY *a, const EVP_PKEY *b),

		int (*param_print)(BIO *out, const EVP_PKEY *pkey, int indent,

							ASN1_PCTX *pctx))

	{

	ameth->param_decode = param_decode;

	ameth->param_encode = param_encode;

	ameth->param_missing = param_missing;

	ameth->param_copy = param_copy;

	ameth->param_cmp = param_cmp;

	ameth->param_print = param_print;

	}



void EVP_PKEY_asn1_set_free(EVP_PKEY_ASN1_METHOD *ameth,

		void (*pkey_free)(EVP_PKEY *pkey))

	{

	ameth->pkey_free = pkey_free;

	}



void EVP_PKEY_asn1_set_ctrl(EVP_PKEY_ASN1_METHOD *ameth,

		void (*pkey_ctrl)(EVP_PKEY *pkey, int op,

							long arg1, void *arg2))

	{

	ameth->pkey_ctrl = pkey_ctrl;

	}

crypto/asn1/asn1.h

+0 −36
Original line number Diff line number Diff line
@@ -282,42 +282,6 @@ typedef struct ASN1_TLC_st ASN1_TLC; 
/* This is just an opaque pointer */

typedef struct ASN1_VALUE_st ASN1_VALUE;



/* ASN1 public key method structure */



#define ASN1_PKEY_ALIAS		0x1



struct evp_pkey_asn1_method_st

	{

	int pkey_id;

	int pkey_base_id;

	unsigned long pkey_flags;



	int (*pub_decode)(EVP_PKEY *pk, X509_PUBKEY *pub);

	int (*pub_encode)(X509_PUBKEY *pub, const EVP_PKEY *pk);

	int (*pub_cmp)(const EVP_PKEY *a, const EVP_PKEY *b);

	int (*pub_print)(BIO *out, const EVP_PKEY *pkey, int indent,

							ASN1_PCTX *pctx);



	int (*priv_decode)(EVP_PKEY *pk, PKCS8_PRIV_KEY_INFO *p8inf);

	int (*priv_encode)(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pk);

	int (*priv_print)(BIO *out, const EVP_PKEY *pkey, int indent,

							ASN1_PCTX *pctx);



	int (*pkey_size)(const EVP_PKEY *pk);

	int (*pkey_bits)(const EVP_PKEY *pk);



	int (*param_decode)(const EVP_PKEY *pk, X509_PUBKEY *pub);

	int (*param_encode)(X509_PUBKEY *pub, const EVP_PKEY *pk);

	int (*param_missing)(const EVP_PKEY *pk);

	int (*param_copy)(EVP_PKEY *to, const EVP_PKEY *from);

	int (*param_cmp)(const EVP_PKEY *a, const EVP_PKEY *b);

	int (*param_print)(BIO *out, const EVP_PKEY *pkey, int indent,

							ASN1_PCTX *pctx);



	void (*pkey_free)(EVP_PKEY *pkey);

	void (*pkey_ctrl)(EVP_PKEY *pkey, int op, long arg1, void *arg2);

	} /* EVP_PKEY_ASN1_METHOD */;



/* Declare ASN1 functions: the implement macro in in asn1t.h */



#define DECLARE_ASN1_FUNCTIONS(type) DECLARE_ASN1_FUNCTIONS_name(type, type)

crypto/asn1/asn1_locl.h

+37 −0
Original line number Diff line number Diff line
@@ -68,3 +68,40 @@ struct asn1_pctx_st 
	unsigned long oid_flags;

	unsigned long str_flags;

	} /* ASN1_PCTX */;



/* ASN1 public key method structure */



#define ASN1_PKEY_ALIAS		0x1

#define ASN1_PKEY_DYNAMIC	0x2



struct evp_pkey_asn1_method_st

	{

	int pkey_id;

	int pkey_base_id;

	unsigned long pkey_flags;



	int (*pub_decode)(EVP_PKEY *pk, X509_PUBKEY *pub);

	int (*pub_encode)(X509_PUBKEY *pub, const EVP_PKEY *pk);

	int (*pub_cmp)(const EVP_PKEY *a, const EVP_PKEY *b);

	int (*pub_print)(BIO *out, const EVP_PKEY *pkey, int indent,

							ASN1_PCTX *pctx);



	int (*priv_decode)(EVP_PKEY *pk, PKCS8_PRIV_KEY_INFO *p8inf);

	int (*priv_encode)(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pk);

	int (*priv_print)(BIO *out, const EVP_PKEY *pkey, int indent,

							ASN1_PCTX *pctx);



	int (*pkey_size)(const EVP_PKEY *pk);

	int (*pkey_bits)(const EVP_PKEY *pk);



	int (*param_decode)(const EVP_PKEY *pk, X509_PUBKEY *pub);

	int (*param_encode)(X509_PUBKEY *pub, const EVP_PKEY *pk);

	int (*param_missing)(const EVP_PKEY *pk);

	int (*param_copy)(EVP_PKEY *to, const EVP_PKEY *from);

	int (*param_cmp)(const EVP_PKEY *a, const EVP_PKEY *b);

	int (*param_print)(BIO *out, const EVP_PKEY *pkey, int indent,

							ASN1_PCTX *pctx);



	void (*pkey_free)(EVP_PKEY *pkey);

	void (*pkey_ctrl)(EVP_PKEY *pkey, int op, long arg1, void *arg2);

	} /* EVP_PKEY_ASN1_METHOD */;

crypto/asn1/d2i_pr.c

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ EVP_PKEY *d2i_PrivateKey(int type, EVP_PKEY **a, const unsigned char **pp, 


	ret->save_type=type;

	ret->type=EVP_PKEY_type(type);

	ret->ameth = EVP_PKEY_ASN1_find(type);

	ret->ameth = EVP_PKEY_asn1_find(type);

	switch (ret->type)

		{

#ifndef OPENSSL_NO_RSA