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

Add argument to OPENSSL_config() and add flag to

Browse Source 
tolerate missing config file.
This commit is contained in:
Dr. Stephen Henson
2002-02-14 23:39:36 +00:00
parent 4598be561a
commit 86a0d0234d
4 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGES
View File

@@ -13,6 +13,11 @@
*) applies to 0.9.6a/0.9.6b/0.9.6c and 0.9.7 *) applies to 0.9.6a/0.9.6b/0.9.6c and 0.9.7
+) applies to 0.9.7 only +) applies to 0.9.7 only
+) Add an argument to OPENSSL_config() to allow the use of an alternative
config section name. Add a new flag to tolerate a missing config file
and move code to CONF_modules_load_file().
[Steve Henson]
*) Add information about CygWin 1.3 and on, and preserve proper *) Add information about CygWin 1.3 and on, and preserve proper
configuration for the versions before that. configuration for the versions before that.
[Corinna Vinschen <vinschen@redhat.com> and Richard Levitte] [Corinna Vinschen <vinschen@redhat.com> and Richard Levitte]

3
crypto/conf/conf.h
View File

@@ -112,6 +112,7 @@ typedef void conf_finish_func(CONF_IMODULE *md);
#define CONF_MFLAGS_IGNORE_RETURN_CODES 0x2 #define CONF_MFLAGS_IGNORE_RETURN_CODES 0x2
#define CONF_MFLAGS_SILENT 0x4 #define CONF_MFLAGS_SILENT 0x4
#define CONF_MFLAGS_NO_DSO 0x8 #define CONF_MFLAGS_NO_DSO 0x8
#define CONF_MFLAGS_IGNORE_MISSING_FILE 0x10
int CONF_set_default_method(CONF_METHOD *meth); int CONF_set_default_method(CONF_METHOD *meth);
void CONF_set_nconf(CONF *conf,LHASH *hash); void CONF_set_nconf(CONF *conf,LHASH *hash);
@@ -127,7 +128,7 @@ void CONF_free(LHASH *conf);
int CONF_dump_fp(LHASH *conf, FILE *out); int CONF_dump_fp(LHASH *conf, FILE *out);
int CONF_dump_bio(LHASH *conf, BIO *out); int CONF_dump_bio(LHASH *conf, BIO *out);
void OPENSSL_config(void); void OPENSSL_config(char *config_name);
/* New conf code. The semantics are different from the functions above. /* New conf code. The semantics are different from the functions above.
If that wasn't the case, the above functions would have been replaced */ If that wasn't the case, the above functions would have been replaced */

13
crypto/conf/conf_mall.c
View File

@@ -81,7 +81,7 @@ void OPENSSL_load_builtin_modules(void)
static int openssl_configured = 0; static int openssl_configured = 0;
void OPENSSL_config(void) void OPENSSL_config(char *config_name)
{ {
int err_exit = 0; int err_exit = 0;
char *file; char *file;
@@ -93,15 +93,13 @@ void OPENSSL_config(void)
file = CONF_get1_default_config_file(); file = CONF_get1_default_config_file();
if (!file) if (!file)
return; return;
if (config_name == NULL)
config_name = "openssl_conf";
ERR_clear_error(); ERR_clear_error();
if (CONF_modules_load_file(file, "openssl_config", 0) <= 0) if (CONF_modules_load_file(file, config_name,
{ CONF_MFLAGS_IGNORE_MISSING_FILE) <= 0)
if (ERR_GET_REASON(ERR_peek_last_error()) == CONF_R_NO_SUCH_FILE)
ERR_clear_error();
else
err_exit = 1; err_exit = 1;
}
OPENSSL_free(file); OPENSSL_free(file);
if (err_exit) if (err_exit)
@@ -113,6 +111,7 @@ void OPENSSL_config(void)
BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT); BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
BIO_printf(bio_err,"Auto configuration failed\n"); BIO_printf(bio_err,"Auto configuration failed\n");
ERR_print_errors(bio_err); ERR_print_errors(bio_err);
BIO_free(bio_err);
} }
exit(1); exit(1);
} }

8
crypto/conf/conf_mod.c
View File

@@ -170,7 +170,15 @@ int CONF_modules_load_file(const char *filename, const char *appname,
goto err; goto err;
if (NCONF_load(conf, filename, NULL) <= 0) if (NCONF_load(conf, filename, NULL) <= 0)
{
if ((flags & CONF_MFLAGS_IGNORE_MISSING_FILE) &&
(ERR_GET_REASON(ERR_peek_last_error()) == CONF_R_NO_SUCH_FILE))
{
ERR_clear_error();
ret = 1;
}
goto err; goto err;
}
ret = CONF_modules_load(conf, appname, flags); ret = CONF_modules_load(conf, appname, flags);