projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
arm_arch.h: allow to specify __ARM_ARCH__ elsewhere.
[oweals/openssl.git]
/
crypto
/
conf
/
conf_mod.c
diff --git
a/crypto/conf/conf_mod.c
b/crypto/conf/conf_mod.c
index 7c9b42f7678e76fa97447380f61c7bdf96a814b2..df1642a0a56216f3dff4bdd04ed6a96126af1f8b 100644
(file)
--- a/
crypto/conf/conf_mod.c
+++ b/
crypto/conf/conf_mod.c
@@
-1,5
+1,5
@@
/* conf_mod.c */
/* conf_mod.c */
-/* Written by Stephen Henson (s
henson@bigfoot.com
) for the OpenSSL
+/* Written by Stephen Henson (s
teve@openssl.org
) for the OpenSSL
* project 2001.
*/
/* ====================================================================
* project 2001.
*/
/* ====================================================================
@@
-126,17
+126,18
@@
int CONF_modules_load(const CONF *cnf, const char *appname,
{
STACK_OF(CONF_VALUE) *values;
CONF_VALUE *vl;
{
STACK_OF(CONF_VALUE) *values;
CONF_VALUE *vl;
- char *vsection;
+ char *vsection
= NULL
;
int ret, i;
if (!cnf)
return 1;
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)
{
if (!vsection)
{
@@
-431,7
+432,7
@@
void CONF_modules_unload(int all)
if (((md->links > 0) || !md->dso) && !all)
continue;
/* Since we're working in reverse this is OK */
if (((md->links > 0) || !md->dso) && !all)
continue;
/* Since we're working in reverse this is OK */
- sk_CONF_MODULE_delete(supported_modules, i);
+
(void)
sk_CONF_MODULE_delete(supported_modules, i);
module_free(md);
}
if (sk_CONF_MODULE_num(supported_modules) == 0)
module_free(md);
}
if (sk_CONF_MODULE_num(supported_modules) == 0)