diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2007-04-09 11:45:54 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2007-04-09 11:45:54 +0000 |
| commit | d318fb79d291b491b07ee073a0d352f14729786c (patch) | |
| tree | 3c290238e355b8b0f056e19fd05dbf331f592183 /crypto/conf/conf_mod.c | |
| parent | 0cc361f3e7700537699c6668b3415d56acb7c3c3 (diff) | |
| download | openssl-new-d318fb79d291b491b07ee073a0d352f14729786c.tar.gz | |
Don't ignore config_name parameter passed to OPENSSL_config(). Use
"openssl_conf" in config file if config_name variable is missing.
Diffstat (limited to 'crypto/conf/conf_mod.c')
| -rw-r--r-- | crypto/conf/conf_mod.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/crypto/conf/conf_mod.c b/crypto/conf/conf_mod.c index 7c9b42f767..e40cc50dd6 100644 --- a/crypto/conf/conf_mod.c +++ b/crypto/conf/conf_mod.c @@ -126,17 +126,18 @@ int CONF_modules_load(const CONF *cnf, const char *appname, { STACK_OF(CONF_VALUE) *values; CONF_VALUE *vl; - char *vsection; + char *vsection = NULL; int ret, i; if (!cnf) return 1; - if (appname == NULL) - appname = "openssl_conf"; + if (appname) + vsection = NCONF_get_string(cnf, NULL, appname); - vsection = NCONF_get_string(cnf, NULL, appname); + if (!appname || (!vsection && (flags & CONF_MFLAGS_DEFAULT_SECTION))) + vsection = NCONF_get_string(cnf, NULL, "openssl_conf"); if (!vsection) { |