generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

From branch OpenSSL_0_9_8-stable: Allow soft-loading engines.

Browse Source 
Also, fix CHANGES (consistency with stable branch).
This commit is contained in:
Bodo Möller 2008-09-15 20:41:24 +00:00
parent 8c864e5466
commit 1a489c9af1
3 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
CHANGES
View File

@ -703,13 +703,7 @@
*) Change 'Configure' script to enable Camellia by default. *) Change 'Configure' script to enable Camellia by default.
[NTT] [NTT]
*) Fix bug in X509_ATTRIBUTE creation: dont set attribute using Changes between 0.9.8h and 0.9.8i [15 Sep 2008]
ASN1_TYPE_set1 if MBSTRING flag set. This bug would crash certain
attribute creation routines such as certifcate requests and PKCS#12
files.
[Steve Henson]
Changes between 0.9.8h and 0.9.8i [xx XXX xxxx]
*) Fix a state transitition in s3_srvr.c and d1_srvr.c *) Fix a state transitition in s3_srvr.c and d1_srvr.c
(was using SSL3_ST_CW_CLNT_HELLO_B, should be ..._ST_SW_SRVR_...). (was using SSL3_ST_CW_CLNT_HELLO_B, should be ..._ST_SW_SRVR_...).
@ -741,6 +735,10 @@
[Neel Mehta, Bodo Moeller] [Neel Mehta, Bodo Moeller]
*) Allow engines to be "soft loaded" - i.e. optionally don't die if
the load fails. Useful for distros.
[Ben Laurie and the FreeBSD team]
*) Add support for Local Machine Keyset attribute in PKCS#12 files. *) Add support for Local Machine Keyset attribute in PKCS#12 files.
[Steve Henson] [Steve Henson]
@ -759,11 +757,11 @@
This work was sponsored by Logica. This work was sponsored by Logica.
[Steve Henson] [Steve Henson]
>>> Note: this change doesn't apply to the 0.9.9-dev branch (yet). *) Fix bug in X509_ATTRIBUTE creation: dont set attribute using
*) Allow engines to be "soft loaded" - i.e. optionally don't die if ASN1_TYPE_set1 if MBSTRING flag set. This bug would crash certain
the load fails. Useful for distros. attribute creation routines such as certifcate requests and PKCS#12
[Ben Laurie and the FreeBSD team] files.
<<< [Steve Henson]
Changes between 0.9.8g and 0.9.8h [28 May 2008] Changes between 0.9.8g and 0.9.8h [28 May 2008]

14
apps/openssl.c
View File

@ -272,9 +272,21 @@ int main(int Argc, char *Argv[])
i=NCONF_load(config,p,&errline); i=NCONF_load(config,p,&errline);
if (i == 0) if (i == 0)
{ {
if (ERR_GET_REASON(ERR_peek_last_error())
== CONF_R_NO_SUCH_FILE)
{
BIO_printf(bio_err,
"WARNING: can't open config file: %s\n",p);
ERR_clear_error();
NCONF_free(config); NCONF_free(config);
config = NULL; config = NULL;
ERR_clear_error(); }
else
{
ERR_print_errors(bio_err);
NCONF_free(config);
exit(1);
}
} }
prog=prog_init(); prog=prog_init();

9
crypto/engine/eng_cnf.c
View File

@ -98,6 +98,8 @@ static int int_engine_configure(char *name, char *value, const CONF *cnf)
CONF_VALUE *ecmd; CONF_VALUE *ecmd;
char *ctrlname, *ctrlvalue; char *ctrlname, *ctrlvalue;
ENGINE *e = NULL; ENGINE *e = NULL;
int soft = 0;
name = skip_dot(name); name = skip_dot(name);
#ifdef ENGINE_CONF_DEBUG #ifdef ENGINE_CONF_DEBUG
fprintf(stderr, "Configuring engine %s\n", name); fprintf(stderr, "Configuring engine %s\n", name);
@ -125,6 +127,8 @@ static int int_engine_configure(char *name, char *value, const CONF *cnf)
/* Override engine name to use */ /* Override engine name to use */
if (!strcmp(ctrlname, "engine_id")) if (!strcmp(ctrlname, "engine_id"))
name = ctrlvalue; name = ctrlvalue;
else if (!strcmp(ctrlname, "soft_load"))
soft = 1;
/* Load a dynamic ENGINE */ /* Load a dynamic ENGINE */
else if (!strcmp(ctrlname, "dynamic_path")) else if (!strcmp(ctrlname, "dynamic_path"))
{ {
@ -147,6 +151,11 @@ static int int_engine_configure(char *name, char *value, const CONF *cnf)
if (!e) if (!e)
{ {
e = ENGINE_by_id(name); e = ENGINE_by_id(name);
if (!e && soft)
{
ERR_clear_error();
return 1;
}
if (!e) if (!e)
return 0; return 0;
} }