Commit b6d1e52d authored by Geoff Thorpe's avatar Geoff Thorpe
Browse files

This change replaces the ENGINE's underlying mechanics with the new 

ENGINE_TABLE-based stuff - as described in crypto/engine/README.

Associated miscellaneous changes;
 - the previous cipher/digest hooks that hardwired directly to EVP's
   OBJ_NAME-based storage have been backed out. New cipher/digest support
   has been constructed and will be committed shortly.
 - each implementation defines its own ENGINE_load_<name> function now.
 - the "openssl" ENGINE isn't needed or loaded any more.
 - core (not algorithm or class specific) ENGINE code has been split into
   multiple files to increase readability and decrease linker bloat.
 - ENGINE_cpy() has been removed as it wasn't really a good idea in the
   first place and now, because of registration issues, can't be
   meaningfully defined any more.
 - BN_MOD_EXP[_CRT] support is removed as per the README.
 - a bug in enginetest.c has been fixed.

NB: This commit almost certainly breaks compilation until subsequent
changes are committed.
parent f185e725

crypto/engine/Makefile.ssl

+116 −16
Original line number Diff line number Diff line
@@ -23,12 +23,16 @@ TEST= enginetest.c 
APPS=



LIB=$(TOP)/libcrypto.a

LIBSRC= eng_err.c eng_lib.c eng_list.c eng_all.c eng_openssl.c \

	eng_dyn.c eng_evp.c \

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_dh.c tb_rand.c \

	eng_openssl.c eng_dyn.c \

	hw_atalla.c hw_cswift.c hw_ncipher.c hw_nuron.c hw_ubsec.c \

	hw_openbsd_dev_crypto.c

LIBOBJ= eng_err.o eng_lib.o eng_list.o eng_all.o eng_openssl.o \

	eng_dyn.o eng_evp.o \

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_dh.o tb_rand.o \

	eng_openssl.o eng_dyn.o \

	hw_atalla.o hw_cswift.o hw_ncipher.o hw_nuron.o hw_ubsec.o \

	hw_openbsd_dev_crypto.o
@@ -95,6 +99,18 @@ eng_all.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h 
eng_all.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h

eng_all.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h

eng_all.o: ../../include/openssl/ui.h eng_all.c eng_int.h

eng_ctrl.o: ../../e_os.h ../../include/openssl/asn1.h

eng_ctrl.o: ../../include/openssl/bio.h ../../include/openssl/bn.h

eng_ctrl.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h

eng_ctrl.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h

eng_ctrl.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h

eng_ctrl.o: ../../include/openssl/err.h ../../include/openssl/lhash.h

eng_ctrl.o: ../../include/openssl/opensslconf.h

eng_ctrl.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h

eng_ctrl.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h

eng_ctrl.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h

eng_ctrl.o: ../../include/openssl/types.h ../../include/openssl/ui.h

eng_ctrl.o: ../cryptlib.h eng_ctrl.c eng_int.h

eng_dyn.o: ../../e_os.h ../../include/openssl/asn1.h

eng_dyn.o: ../../include/openssl/bio.h ../../include/openssl/bn.h

eng_dyn.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
@@ -117,18 +133,29 @@ eng_err.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h 
eng_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h

eng_err.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h

eng_err.o: ../../include/openssl/ui.h eng_err.c

eng_evp.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h

eng_evp.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h

eng_evp.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h

eng_evp.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h

eng_evp.o: ../../include/openssl/err.h ../../include/openssl/evp.h

eng_evp.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h

eng_evp.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h

eng_evp.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h

eng_evp.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h

eng_evp.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h

eng_evp.o: ../../include/openssl/types.h ../../include/openssl/ui.h eng_evp.c

eng_evp.o: eng_int.h

eng_fat.o: ../../e_os.h ../../include/openssl/asn1.h

eng_fat.o: ../../include/openssl/bio.h ../../include/openssl/bn.h

eng_fat.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h

eng_fat.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h

eng_fat.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h

eng_fat.o: ../../include/openssl/err.h ../../include/openssl/lhash.h

eng_fat.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h

eng_fat.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h

eng_fat.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h

eng_fat.o: ../../include/openssl/symhacks.h ../../include/openssl/types.h

eng_fat.o: ../../include/openssl/ui.h ../cryptlib.h eng_fat.c eng_int.h

eng_init.o: ../../e_os.h ../../include/openssl/asn1.h

eng_init.o: ../../include/openssl/bio.h ../../include/openssl/bn.h

eng_init.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h

eng_init.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h

eng_init.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h

eng_init.o: ../../include/openssl/err.h ../../include/openssl/lhash.h

eng_init.o: ../../include/openssl/opensslconf.h

eng_init.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h

eng_init.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h

eng_init.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h

eng_init.o: ../../include/openssl/types.h ../../include/openssl/ui.h

eng_init.o: ../cryptlib.h eng_init.c eng_int.h

eng_lib.o: ../../e_os.h ../../include/openssl/asn1.h

eng_lib.o: ../../include/openssl/bio.h ../../include/openssl/bn.h

eng_lib.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
@@ -165,6 +192,31 @@ eng_openssl.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 
eng_openssl.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h

eng_openssl.o: ../../include/openssl/types.h ../../include/openssl/ui.h

eng_openssl.o: ../cryptlib.h eng_openssl.c

eng_pkey.o: ../../e_os.h ../../include/openssl/asn1.h

eng_pkey.o: ../../include/openssl/bio.h ../../include/openssl/bn.h

eng_pkey.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h

eng_pkey.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h

eng_pkey.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h

eng_pkey.o: ../../include/openssl/err.h ../../include/openssl/lhash.h

eng_pkey.o: ../../include/openssl/opensslconf.h

eng_pkey.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h

eng_pkey.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h

eng_pkey.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h

eng_pkey.o: ../../include/openssl/types.h ../../include/openssl/ui.h

eng_pkey.o: ../cryptlib.h eng_int.h eng_pkey.c

eng_table.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h

eng_table.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h

eng_table.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h

eng_table.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h

eng_table.o: ../../include/openssl/err.h ../../include/openssl/evp.h

eng_table.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h

eng_table.o: ../../include/openssl/objects.h

eng_table.o: ../../include/openssl/opensslconf.h

eng_table.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h

eng_table.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h

eng_table.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h

eng_table.o: ../../include/openssl/types.h ../../include/openssl/ui.h eng_int.h

eng_table.o: eng_table.c

hw_atalla.o: ../../e_os.h ../../include/openssl/asn1.h

hw_atalla.o: ../../include/openssl/bio.h ../../include/openssl/bn.h

hw_atalla.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
@@ -231,3 +283,51 @@ hw_ubsec.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 
hw_ubsec.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h

hw_ubsec.o: ../../include/openssl/types.h ../../include/openssl/ui.h

hw_ubsec.o: ../cryptlib.h hw_ubsec.c vendor_defns/hw_ubsec.h

tb_dh.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h

tb_dh.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h

tb_dh.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h

tb_dh.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h

tb_dh.o: ../../include/openssl/err.h ../../include/openssl/evp.h

tb_dh.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h

tb_dh.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h

tb_dh.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h

tb_dh.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h

tb_dh.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h

tb_dh.o: ../../include/openssl/types.h ../../include/openssl/ui.h eng_int.h

tb_dh.o: tb_dh.c

tb_dsa.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h

tb_dsa.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h

tb_dsa.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h

tb_dsa.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h

tb_dsa.o: ../../include/openssl/err.h ../../include/openssl/evp.h

tb_dsa.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h

tb_dsa.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h

tb_dsa.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h

tb_dsa.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h

tb_dsa.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h

tb_dsa.o: ../../include/openssl/types.h ../../include/openssl/ui.h eng_int.h

tb_dsa.o: tb_dsa.c

tb_rand.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h

tb_rand.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h

tb_rand.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h

tb_rand.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h

tb_rand.o: ../../include/openssl/err.h ../../include/openssl/evp.h

tb_rand.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h

tb_rand.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h

tb_rand.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h

tb_rand.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h

tb_rand.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h

tb_rand.o: ../../include/openssl/types.h ../../include/openssl/ui.h eng_int.h

tb_rand.o: tb_rand.c

tb_rsa.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h

tb_rsa.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h

tb_rsa.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h

tb_rsa.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h

tb_rsa.o: ../../include/openssl/err.h ../../include/openssl/evp.h

tb_rsa.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h

tb_rsa.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h

tb_rsa.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h

tb_rsa.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h

tb_rsa.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h

tb_rsa.o: ../../include/openssl/types.h ../../include/openssl/ui.h eng_int.h

tb_rsa.o: tb_rsa.c

crypto/engine/eng_all.c

+21 −70
Original line number Diff line number Diff line
@@ -60,83 +60,34 @@ 
#include <openssl/engine.h>

#include "eng_int.h"



static int engine_add(ENGINE *e)

	{

	int toret = 1;

	if (!ENGINE_by_id(ENGINE_get_id(e)))

		{

		(void)ERR_get_error();

		toret = ENGINE_add(e);

		}

	ENGINE_free(e);

	return toret;

	}



void ENGINE_load_cswift(void)

	{

#ifndef OPENSSL_NO_HW

#ifndef OPENSSL_NO_HW_CSWIFT

	engine_add(ENGINE_cswift());

#endif /* !OPENSSL_NO_HW_CSWIFT */

#endif /* !OPENSSL_NO_HW */

	}



void ENGINE_load_chil(void)

	{

#ifndef OPENSSL_NO_HW

#ifndef OPENSSL_NO_HW_CSWIFT

	engine_add(ENGINE_ncipher());

#endif /* !OPENSSL_NO_HW_CSWIFT */

#endif /* !OPENSSL_NO_HW */

	}



void ENGINE_load_atalla(void)

	{

#ifndef OPENSSL_NO_HW

#ifndef OPENSSL_NO_HW_CSWIFT

	engine_add(ENGINE_atalla());

#endif /* !OPENSSL_NO_HW_CSWIFT */

#endif /* !OPENSSL_NO_HW */

	}



void ENGINE_load_nuron(void)

void ENGINE_load_builtin_engines(void)

	{

	/* There's no longer any need for an "openssl" ENGINE unless, one day,

	 * it is the *only* way for standard builtin implementations to be be

	 * accessed (ie. it would be possible to statically link binaries with

	 * *no* builtin implementations). */

#if 0

	ENGINE_load_openssl();

#endif

	ENGINE_load_dynamic();

#ifndef OPENSSL_NO_HW

#ifndef OPENSSL_NO_HW_CSWIFT

	engine_add(ENGINE_nuron());

#endif /* !OPENSSL_NO_HW_CSWIFT */

#endif /* !OPENSSL_NO_HW */

	}



void ENGINE_load_ubsec(void)

	{

#ifndef OPENSSL_NO_HW

#ifndef OPENSSL_NO_HW_UBSEC

	engine_add(ENGINE_ubsec());

#endif /* !OPENSSL_NO_HW_UBSEC */

#endif /* !OPENSSL_NO_HW */

	}



void ENGINE_load_openbsd_dev_crypto(void)

	{

#ifndef OPENSSL_NO_HW

# ifdef OPENSSL_OPENBSD_DEV_CRYPTO

	engine_add(ENGINE_openbsd_dev_crypto());

# endif

#endif /* !OPENSSL_NO_HW */

	}



void ENGINE_load_builtin_engines(void)

	{

	static int done=0;



	if (done) return;

	done=1;



	ENGINE_load_cswift();

#endif

#ifndef OPENSSL_NO_HW_NCIPHER

	ENGINE_load_chil();

#endif

#ifndef OPENSSL_NO_HW_ATALLA

	ENGINE_load_atalla();

#endif

#ifndef OPENSSL_NO_HW_NURON

	ENGINE_load_nuron();

#endif

#ifndef OPENSSL_NO_HW_UBSEC

	ENGINE_load_ubsec();

#endif

#ifdef OPENSSL_OPENBSD_DEV_CRYPTO

	ENGINE_load_openbsd_dev_crypto();

#endif

#endif

	}

crypto/engine/eng_ctrl.c

0 → 100644
+387 −0
Original line number Diff line number Diff line 
/* crypto/engine/eng_ctrl.c */

/* ====================================================================

 * Copyright (c) 1999-2001 The OpenSSL Project.  All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions

 * are met:

 *

 * 1. Redistributions of source code must retain the above copyright

 *    notice, this list of conditions and the following disclaimer. 

 *

 * 2. Redistributions in binary form must reproduce the above copyright

 *    notice, this list of conditions and the following disclaimer in

 *    the documentation and/or other materials provided with the

 *    distribution.

 *

 * 3. All advertising materials mentioning features or use of this

 *    software must display the following acknowledgment:

 *    "This product includes software developed by the OpenSSL Project

 *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"

 *

 * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to

 *    endorse or promote products derived from this software without

 *    prior written permission. For written permission, please contact

 *    licensing@OpenSSL.org.

 *

 * 5. Products derived from this software may not be called "OpenSSL"

 *    nor may "OpenSSL" appear in their names without prior written

 *    permission of the OpenSSL Project.

 *

 * 6. Redistributions of any form whatsoever must retain the following

 *    acknowledgment:

 *    "This product includes software developed by the OpenSSL Project

 *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"

 *

 * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY

 * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

 * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR

 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT

 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)

 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,

 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED

 * OF THE POSSIBILITY OF SUCH DAMAGE.

 * ====================================================================

 *

 * This product includes cryptographic software written by Eric Young

 * (eay@cryptsoft.com).  This product includes software written by Tim

 * Hudson (tjh@cryptsoft.com).

 *

 */



#include <openssl/crypto.h>

#include "cryptlib.h"

#include "eng_int.h"

#include <openssl/engine.h>



/* When querying a ENGINE-specific control command's 'description', this string

 * is used if the ENGINE_CMD_DEFN has cmd_desc set to NULL. */

static const char *int_no_description = "";



/* These internal functions handle 'CMD'-related control commands when the

 * ENGINE in question has asked us to take care of it (ie. the ENGINE did not

 * set the ENGINE_FLAGS_MANUAL_CMD_CTRL flag. */



static int int_ctrl_cmd_is_null(const ENGINE_CMD_DEFN *defn)

	{

	if((defn->cmd_num == 0) || (defn->cmd_name == NULL))

		return 1;

	return 0;

	}



static int int_ctrl_cmd_by_name(const ENGINE_CMD_DEFN *defn, const char *s)

	{

	int idx = 0;

	while(!int_ctrl_cmd_is_null(defn) && (strcmp(defn->cmd_name, s) != 0))

		{

		idx++;

		defn++;

		}

	if(int_ctrl_cmd_is_null(defn))

		/* The given name wasn't found */

		return -1;

	return idx;

	}



static int int_ctrl_cmd_by_num(const ENGINE_CMD_DEFN *defn, unsigned int num)

	{

	int idx = 0;

	/* NB: It is stipulated that 'cmd_defn' lists are ordered by cmd_num. So

	 * our searches don't need to take any longer than necessary. */

	while(!int_ctrl_cmd_is_null(defn) && (defn->cmd_num < num))

		{

		idx++;

		defn++;

		}

	if(defn->cmd_num == num)

		return idx;

	/* The given cmd_num wasn't found */

	return -1;

	}



static int int_ctrl_helper(ENGINE *e, int cmd, long i, void *p, void (*f)())

	{

	int idx;

	char *s = (char *)p;

	/* Take care of the easy one first (eg. it requires no searches) */

	if(cmd == ENGINE_CTRL_GET_FIRST_CMD_TYPE)

		{

		if((e->cmd_defns == NULL) || int_ctrl_cmd_is_null(e->cmd_defns))

			return 0;

		return e->cmd_defns->cmd_num;

		}

	/* One or two commands require that "p" be a valid string buffer */

	if((cmd == ENGINE_CTRL_GET_CMD_FROM_NAME) ||

			(cmd == ENGINE_CTRL_GET_NAME_FROM_CMD) ||

			(cmd == ENGINE_CTRL_GET_DESC_FROM_CMD))

		{

		if(s == NULL)

			{

			ENGINEerr(ENGINE_F_INT_CTRL_HELPER,

				ERR_R_PASSED_NULL_PARAMETER);

			return -1;

			}

		}

	/* Now handle cmd_name -> cmd_num conversion */

	if(cmd == ENGINE_CTRL_GET_CMD_FROM_NAME)

		{

		if((e->cmd_defns == NULL) || ((idx = int_ctrl_cmd_by_name(

						e->cmd_defns, s)) < 0))

			{

			ENGINEerr(ENGINE_F_INT_CTRL_HELPER,

				ENGINE_R_INVALID_CMD_NAME);

			return -1;

			}

		return e->cmd_defns[idx].cmd_num;

		}

	/* For the rest of the commands, the 'long' argument must specify a

	 * valie command number - so we need to conduct a search. */

	if((e->cmd_defns == NULL) || ((idx = int_ctrl_cmd_by_num(e->cmd_defns,

					(unsigned int)i)) < 0))

		{

		ENGINEerr(ENGINE_F_INT_CTRL_HELPER,

			ENGINE_R_INVALID_CMD_NUMBER);

		return -1;

		}

	/* Now the logic splits depending on command type */

	switch(cmd)

		{

	case ENGINE_CTRL_GET_NEXT_CMD_TYPE:

		idx++;

		if(int_ctrl_cmd_is_null(e->cmd_defns + idx))

			/* end-of-list */

			return 0;

		else

			return e->cmd_defns[idx].cmd_num;

	case ENGINE_CTRL_GET_NAME_LEN_FROM_CMD:

		return strlen(e->cmd_defns[idx].cmd_name);

	case ENGINE_CTRL_GET_NAME_FROM_CMD:

		return sprintf(s, "%s", e->cmd_defns[idx].cmd_name);

	case ENGINE_CTRL_GET_DESC_LEN_FROM_CMD:

		if(e->cmd_defns[idx].cmd_desc)

			return strlen(e->cmd_defns[idx].cmd_desc);

		return strlen(int_no_description);

	case ENGINE_CTRL_GET_DESC_FROM_CMD:

		if(e->cmd_defns[idx].cmd_desc)

			return sprintf(s, "%s", e->cmd_defns[idx].cmd_desc);

		return sprintf(s, "%s", int_no_description);

	case ENGINE_CTRL_GET_CMD_FLAGS:

		return e->cmd_defns[idx].cmd_flags;

		}

	/* Shouldn't really be here ... */

	ENGINEerr(ENGINE_F_INT_CTRL_HELPER,ENGINE_R_INTERNAL_LIST_ERROR);

	return -1;

	}



int ENGINE_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)())

	{

	int ctrl_exists, ref_exists;

	if(e == NULL)

		{

		ENGINEerr(ENGINE_F_ENGINE_CTRL,ERR_R_PASSED_NULL_PARAMETER);

		return 0;

		}

	CRYPTO_w_lock(CRYPTO_LOCK_ENGINE);

	ref_exists = ((e->struct_ref > 0) ? 1 : 0);

	CRYPTO_w_unlock(CRYPTO_LOCK_ENGINE);

	ctrl_exists = ((e->ctrl == NULL) ? 0 : 1);

	if(!ref_exists)

		{

		ENGINEerr(ENGINE_F_ENGINE_CTRL,ENGINE_R_NO_REFERENCE);

		return 0;

		}

	/* Intercept any "root-level" commands before trying to hand them on to

	 * ctrl() handlers. */

	switch(cmd)

		{

	case ENGINE_CTRL_HAS_CTRL_FUNCTION:

		return ctrl_exists;

	case ENGINE_CTRL_GET_FIRST_CMD_TYPE:

	case ENGINE_CTRL_GET_NEXT_CMD_TYPE:

	case ENGINE_CTRL_GET_CMD_FROM_NAME:

	case ENGINE_CTRL_GET_NAME_LEN_FROM_CMD:

	case ENGINE_CTRL_GET_NAME_FROM_CMD:

	case ENGINE_CTRL_GET_DESC_LEN_FROM_CMD:

	case ENGINE_CTRL_GET_DESC_FROM_CMD:

	case ENGINE_CTRL_GET_CMD_FLAGS:

		if(ctrl_exists && !(e->flags & ENGINE_FLAGS_MANUAL_CMD_CTRL))

			return int_ctrl_helper(e,cmd,i,p,f);

		if(!ctrl_exists)

			{

			ENGINEerr(ENGINE_F_ENGINE_CTRL,ENGINE_R_NO_CONTROL_FUNCTION);

			/* For these cmd-related functions, failure is indicated

			 * by a -1 return value (because 0 is used as a valid

			 * return in some places). */

			return -1;

			}

	default:

		break;

		}

	/* Anything else requires a ctrl() handler to exist. */

	if(!ctrl_exists)

		{

		ENGINEerr(ENGINE_F_ENGINE_CTRL,ENGINE_R_NO_CONTROL_FUNCTION);

		return 0;

		}

	return e->ctrl(e, cmd, i, p, f);

	}



int ENGINE_cmd_is_executable(ENGINE *e, int cmd)

	{

	int flags;

	if((flags = ENGINE_ctrl(e, ENGINE_CTRL_GET_CMD_FLAGS, cmd, NULL, NULL)) < 0)

		{

		ENGINEerr(ENGINE_F_ENGINE_CMD_IS_EXECUTABLE,

			ENGINE_R_INVALID_CMD_NUMBER);

		return 0;

		}

	if(!(flags & ENGINE_CMD_FLAG_NO_INPUT) &&

			!(flags & ENGINE_CMD_FLAG_NUMERIC) &&

			!(flags & ENGINE_CMD_FLAG_STRING))

		return 0;

	return 1;

	}



int ENGINE_ctrl_cmd(ENGINE *e, const char *cmd_name,

        long i, void *p, void (*f)(), int cmd_optional)

        {

	int num;



	if((e == NULL) || (cmd_name == NULL))

		{

		ENGINEerr(ENGINE_F_ENGINE_CTRL_CMD_STRING,

			ERR_R_PASSED_NULL_PARAMETER);

		return 0;

		}

	if((e->ctrl == NULL) || ((num = ENGINE_ctrl(e,

					ENGINE_CTRL_GET_CMD_FROM_NAME,

					0, (void *)cmd_name, NULL)) <= 0))

		{

		/* If the command didn't *have* to be supported, we fake

		 * success. This allows certain settings to be specified for

		 * multiple ENGINEs and only require a change of ENGINE id

		 * (without having to selectively apply settings). Eg. changing

		 * from a hardware device back to the regular software ENGINE

		 * without editing the config file, etc. */

		if(cmd_optional)

			{

			ERR_clear_error();

			return 1;

			}

		ENGINEerr(ENGINE_F_ENGINE_CTRL_CMD,

			ENGINE_R_INVALID_CMD_NAME);

		return 0;

		}

	/* Force the result of the control command to 0 or 1, for the reasons

	 * mentioned before. */

        if (ENGINE_ctrl(e, num, i, p, f))

                return 1;

        return 0;

        }



int ENGINE_ctrl_cmd_string(ENGINE *e, const char *cmd_name, const char *arg,

				int cmd_optional)

	{

	int num, flags;

	long l;

	char *ptr;

	if((e == NULL) || (cmd_name == NULL))

		{

		ENGINEerr(ENGINE_F_ENGINE_CTRL_CMD_STRING,

			ERR_R_PASSED_NULL_PARAMETER);

		return 0;

		}

	if((e->ctrl == NULL) || ((num = ENGINE_ctrl(e,

					ENGINE_CTRL_GET_CMD_FROM_NAME,

					0, (void *)cmd_name, NULL)) <= 0))

		{

		/* If the command didn't *have* to be supported, we fake

		 * success. This allows certain settings to be specified for

		 * multiple ENGINEs and only require a change of ENGINE id

		 * (without having to selectively apply settings). Eg. changing

		 * from a hardware device back to the regular software ENGINE

		 * without editing the config file, etc. */

		if(cmd_optional)

			{

			ERR_clear_error();

			return 1;

			}

		ENGINEerr(ENGINE_F_ENGINE_CTRL_CMD_STRING,

			ENGINE_R_INVALID_CMD_NAME);

		return 0;

		}

	if(!ENGINE_cmd_is_executable(e, num))

		{

		ENGINEerr(ENGINE_F_ENGINE_CTRL_CMD_STRING,

			ENGINE_R_CMD_NOT_EXECUTABLE);

		return 0;

		}

	if((flags = ENGINE_ctrl(e, ENGINE_CTRL_GET_CMD_FLAGS, num, NULL, NULL)) < 0)

		{

		/* Shouldn't happen, given that ENGINE_cmd_is_executable()

		 * returned success. */

		ENGINEerr(ENGINE_F_ENGINE_CTRL_CMD_STRING,

			ENGINE_R_INTERNAL_LIST_ERROR);

		return 0;

		}

	/* If the command takes no input, there must be no input. And vice

	 * versa. */

	if(flags & ENGINE_CMD_FLAG_NO_INPUT)

		{

		if(arg != NULL)

			{

			ENGINEerr(ENGINE_F_ENGINE_CTRL_CMD_STRING,

				ENGINE_R_COMMAND_TAKES_NO_INPUT);

			return 0;

			}

		/* We deliberately force the result of ENGINE_ctrl() to 0 or 1

		 * rather than returning it as "return data". This is to ensure

		 * usage of these commands is consistent across applications and

		 * that certain applications don't understand it one way, and

		 * others another. */

		if(ENGINE_ctrl(e, num, 0, (void *)arg, NULL))

			return 1;

		return 0;

		}

	/* So, we require input */

	if(arg == NULL)

		{

		ENGINEerr(ENGINE_F_ENGINE_CTRL_CMD_STRING,

			ENGINE_R_COMMAND_TAKES_INPUT);

		return 0;

		}

	/* If it takes string input, that's easy */

	if(flags & ENGINE_CMD_FLAG_STRING)

		{

		/* Same explanation as above */

		if(ENGINE_ctrl(e, num, 0, (void *)arg, NULL))

			return 1;

		return 0;

		}

	/* If it doesn't take numeric either, then it is unsupported for use in

	 * a config-setting situation, which is what this function is for. This

	 * should never happen though, because ENGINE_cmd_is_executable() was

	 * used. */

	if(!(flags & ENGINE_CMD_FLAG_NUMERIC))

		{

		ENGINEerr(ENGINE_F_ENGINE_CTRL_CMD_STRING,

			ENGINE_R_INTERNAL_LIST_ERROR);

		return 0;

		}

	l = strtol(arg, &ptr, 10);

	if((arg == ptr) || (*ptr != '\0'))

		{

		ENGINEerr(ENGINE_F_ENGINE_CTRL_CMD_STRING,

			ENGINE_R_ARGUMENT_IS_NOT_A_NUMBER);

		return 0;

		}

	/* Force the result of the control command to 0 or 1, for the reasons

	 * mentioned before. */

	if(ENGINE_ctrl(e, num, l, NULL, NULL))

		return 1;

	return 0;

	}

crypto/engine/eng_dyn.c

+15 −3

File changed.

Preview size limit exceeded, changes collapsed.

crypto/engine/eng_err.c

+2 −1

File changed.

Preview size limit exceeded, changes collapsed.