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

ENGINE module additions.

Add "init" command to control ENGINE
initialization.

Call ENGINE_finish on initialized ENGINEs on exit.

Reorder shutdown in apps.c: modules should be shut
down first.

Add test private key loader to openssl ENGINE: this
just loads a private key in PEM format.

Fix print format for dh length parameter.
parent 36c19463

CHANGES

+8 −0
Original line number Diff line number Diff line
@@ -43,6 +43,14 @@ 
         *) applies to 0.9.6a ... 0.9.6d and 0.9.7

         +) applies to 0.9.7 only



  +) Add an "init" command to the ENGINE config module and auto initialize

     ENGINEs. Without any "init" command the ENGINE will be initialized 

     after all ctrl commands have been executed on it. If init=1 the 

     ENGINE is initailized at that point (ctrls before that point are run

     on the uninitialized ENGINE and after on the initialized one). If

     init=0 then the ENGINE will not be iniatialized at all.

     [Steve Henson]



  +) Fix the 'app_verify_callback' interface so that the user-defined

     argument is actually passed to the callback: In the

     SSL_CTX_set_cert_verify_callback() prototype, the callback

apps/apps.h

+4 −4
Original line number Diff line number Diff line
@@ -195,10 +195,10 @@ extern BIO *bio_err; 
		setup_ui_method(); } while(0)

#  endif

#  define apps_shutdown() \

		do { destroy_ui_method(); EVP_cleanup(); \

		ENGINE_cleanup(); CRYPTO_cleanup_all_ex_data(); \

		ERR_remove_state(0); ERR_free_strings(); \

		CONF_modules_unload(1); } while(0)

		do { CONF_modules_unload(1); destroy_ui_method(); \

		EVP_cleanup(); ENGINE_cleanup(); \

		CRYPTO_cleanup_all_ex_data(); ERR_remove_state(0); \

		ERR_free_strings(); } while(0)

#endif



typedef struct args_st

apps/dhparam.c

+1 −1
Original line number Diff line number Diff line
@@ -490,7 +490,7 @@ bad: 
		printf("\tif ((dh->p == NULL) || (dh->g == NULL))\n");

		printf("\t\t{ DH_free(dh); return(NULL); }\n");

		if (dh->length)

			printf("\tdh->length = %d;\n", dh->length);

			printf("\tdh->length = %ld;\n", dh->length);

		printf("\treturn(dh);\n\t}\n");

		OPENSSL_free(data);

		}

crypto/engine/eng_cnf.c

+50 −2
Original line number Diff line number Diff line
@@ -75,10 +75,28 @@ static char *skip_dot(char *name) 
	return name;

	}



static STACK_OF(ENGINE) *initialized_engines = NULL;



static int int_engine_init(ENGINE *e)

	{

	if (!ENGINE_init(e))

		return 0;

	if (!initialized_engines)

		initialized_engines = sk_ENGINE_new_null();

	if (!initialized_engines || !sk_ENGINE_push(initialized_engines, e))

		{

		ENGINE_finish(e);

		return 0;

		}

	return 1;

	}

	



int int_engine_configure(char *name, char *value, const CONF *cnf)

	{

	int i;

	int ret = 0;

	long do_init = -1;

	STACK_OF(CONF_VALUE) *ecmds;

	CONF_VALUE *ecmd;

	char *ctrlname, *ctrlvalue;
@@ -140,7 +158,22 @@ int int_engine_configure(char *name, char *value, const CONF *cnf) 
		 	 */

			if (!strcmp(ctrlvalue, "EMPTY"))

				ctrlvalue = NULL;

			if (!strcmp(ctrlname, "default_algorithms"))

			else if (!strcmp(ctrlname, "init"))

				{

				if (!NCONF_get_number_e(cnf, value, "init", &do_init))

					goto err;

				if (do_init == 1)

					{

					if (!int_engine_init(e))

						goto err;

					}

				else if (do_init != 0)

					{

					ENGINEerr(ENGINE_F_INT_ENGINE_CONFIGURE, ENGINE_R_INVALID_INIT_VALUE);

					goto err;

					}

				}

			else if (!strcmp(ctrlname, "default_algorithms"))

				{

				if (!ENGINE_set_default_string(e, ctrlvalue))

					goto err;
@@ -151,7 +184,10 @@ int int_engine_configure(char *name, char *value, const CONF *cnf) 
			}







		}

	if (e && (do_init == -1) && !int_engine_init(e))

		goto err;

	ret = 1;

	err:

	if (e)
@@ -188,7 +224,19 @@ static int int_engine_module_init(CONF_IMODULE *md, const CONF *cnf) 
	return 1;

	}



static void int_engine_module_finish(CONF_IMODULE *md)

	{

	ENGINE *e;

	while ((e = sk_ENGINE_pop(initialized_engines)))

		ENGINE_finish(e);

	sk_ENGINE_free(initialized_engines);

	initialized_engines = NULL;

	}

	



void ENGINE_add_conf_module(void)

	{

	CONF_module_add("engines", int_engine_module_init, 0);

	CONF_module_add("engines",

			int_engine_module_init,

			int_engine_module_finish);

	}

crypto/engine/eng_err.c

+1 −0
Original line number Diff line number Diff line
@@ -129,6 +129,7 @@ static ERR_STRING_DATA ENGINE_str_reasons[]= 
{ENGINE_R_INVALID_ARGUMENT               ,"invalid argument"},

{ENGINE_R_INVALID_CMD_NAME               ,"invalid cmd name"},

{ENGINE_R_INVALID_CMD_NUMBER             ,"invalid cmd number"},

{ENGINE_R_INVALID_INIT_VALUE             ,"invalid init value"},

{ENGINE_R_INVALID_STRING                 ,"invalid string"},

{ENGINE_R_NOT_INITIALISED                ,"not initialised"},

{ENGINE_R_NOT_LOADED                     ,"not loaded"},