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

default_algorithms option in ENGINE config.
parent 6ce46d69

CHANGES

+6 −0
Original line number Diff line number Diff line
@@ -12,6 +12,12 @@ 
         *) applies to 0.9.6a/0.9.6b/0.9.6c and 0.9.7

         +) applies to 0.9.7 only



  +) default_algorithms option in ENGINE config module. This allows things

     like:

     default_algorithms = ALL

     default_algorithms = RSA, DSA, RAND, CIPHERS, DIGESTS

     [Steve Henson]



  +) Prelminary ENGINE config module.

     [Steve Henson]

crypto/conf/conf.h

+3 −0
Original line number Diff line number Diff line
@@ -190,6 +190,9 @@ void CONF_module_set_usr_data(CONF_MODULE *pmod, void *usr_data); 


char *CONF_get1_default_config_file(void);



int CONF_parse_list(char *list, int sep, int nospc,

		int (*list_cb)(char *elem, int len, void *usr), void *arg);



/* BEGIN ERROR CODES */

/* The following lines are auto generated by the script mkerr.pl. Any changes

 * made after this point may be overwritten when the script is next run.

crypto/conf/conf_mod.c

+46 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ 
 */



#include <stdio.h>

#include <ctype.h>

#include <openssl/crypto.h>

#include "cryptlib.h"

#include <openssl/conf.h>
@@ -549,3 +550,48 @@ char *CONF_get1_default_config_file(void) 


	return file;

	}



/* This function takes a list separated by 'sep' and calls the

 * callback function giving the start and length of each member

 * optionally stripping leading and trailing whitespace. This can

 * be used to parse comma separated lists for example.

 */



int CONF_parse_list(char *list, int sep, int nospc,

		int (*list_cb)(char *elem, int len, void *usr), void *arg)

	{

	int ret;

	char *lstart, *tmpend, *p;

	lstart = list;



	for(;;)

		{

		if (nospc)

			{

			while(*lstart && isspace((unsigned char)*lstart))

				lstart++;

			}

		p = strchr(lstart, sep);

		if (p == lstart || !*lstart)

			ret = list_cb(NULL, 0, arg);

		else

			{

			if (p)

				tmpend = p - 1;

			else 

				tmpend = lstart + strlen(lstart) - 1;

			if (nospc)

				{

				while(isspace((unsigned char)*tmpend))

					tmpend--;

				}

			ret = list_cb(lstart, tmpend - lstart + 1, arg);

			}

		if (ret <= 0)

			return ret;

		if (p == NULL)

			return 1;

		lstart = p + 1;

		}

	}

crypto/engine/eng_cnf.c

+7 −2
Original line number Diff line number Diff line
@@ -138,7 +138,12 @@ int int_engine_configure(char *name, char *value, const CONF *cnf) 
		 	 */

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

				ctrlvalue = NULL;

			if (!ENGINE_ctrl_cmd_string(e,

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

				{

				if (!ENGINE_set_default_string(e, ctrlvalue))

					goto err;

				}

			else if (!ENGINE_ctrl_cmd_string(e,

					ctrlname, ctrlvalue, 0))

				return 0;

			}

crypto/engine/eng_err.c

+2 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ static ERR_STRING_DATA ENGINE_str_functs[]= 
{ERR_PACK(0,ENGINE_F_ENGINE_MODULE_INIT,0),	"ENGINE_MODULE_INIT"},

{ERR_PACK(0,ENGINE_F_ENGINE_NEW,0),	"ENGINE_new"},

{ERR_PACK(0,ENGINE_F_ENGINE_REMOVE,0),	"ENGINE_remove"},

{ERR_PACK(0,ENGINE_F_ENGINE_SET_DEFAULT_STRING,0),	"ENGINE_set_default_string"},

{ERR_PACK(0,ENGINE_F_ENGINE_SET_DEFAULT_TYPE,0),	"ENGINE_SET_DEFAULT_TYPE"},

{ERR_PACK(0,ENGINE_F_ENGINE_SET_ID,0),	"ENGINE_set_id"},

{ERR_PACK(0,ENGINE_F_ENGINE_SET_NAME,0),	"ENGINE_set_name"},
@@ -133,6 +134,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_STRING                 ,"invalid string"},

{ENGINE_R_MISSING_KEY_COMPONENTS         ,"missing key components"},

{ENGINE_R_NOT_INITIALISED                ,"not initialised"},

{ENGINE_R_NOT_LOADED                     ,"not loaded"},