summaryrefslogtreecommitdiffstats
path: root/crypto/conf/conf_lib.c
diff options
context:
space:
mode:
authorRich Salz <rsalz@openssl.org>2016-06-13 03:49:40 +0200
committerRich Salz <rsalz@openssl.org>2016-06-14 18:30:37 +0200
commitcda3ae5bd0798c56fef5a5c1462d51ca1776504e (patch)
tree3fcc90ce98682102ec3c07e65c7e086a7d70a603 /crypto/conf/conf_lib.c
parentFree memory on an error path (diff)
downloadopenssl-cda3ae5bd0798c56fef5a5c1462d51ca1776504e.tar.xz
openssl-cda3ae5bd0798c56fef5a5c1462d51ca1776504e.zip
RT4562: Fix misleading doc on OPENSSL_config
Also changed the code to use "appname" not "filename" Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'crypto/conf/conf_lib.c')
-rw-r--r--crypto/conf/conf_lib.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/crypto/conf/conf_lib.c b/crypto/conf/conf_lib.c
index c99837387e..3532114917 100644
--- a/crypto/conf/conf_lib.c
+++ b/crypto/conf/conf_lib.c
@@ -340,19 +340,19 @@ OPENSSL_INIT_SETTINGS *OPENSSL_INIT_new(void)
#ifndef OPENSSL_NO_STDIO
-int OPENSSL_INIT_set_config_filename(OPENSSL_INIT_SETTINGS *settings,
- const char *config_file)
+int OPENSSL_INIT_set_config_appname(OPENSSL_INIT_SETTINGS *settings,
+ const char *appname)
{
- char *new_config_file = NULL;
+ char *newappname = NULL;
- if (config_file != NULL) {
- new_config_file = strdup(config_file);
- if (new_config_file == NULL)
+ if (appname != NULL) {
+ newappname = strdup(appname);
+ if (newappname == NULL)
return 0;
}
- free(settings->config_name);
- settings->config_name = new_config_file;
+ free(settings->appname);
+ settings->appname = newappname;
return 1;
}
@@ -360,6 +360,6 @@ int OPENSSL_INIT_set_config_filename(OPENSSL_INIT_SETTINGS *settings,
void OPENSSL_INIT_free(OPENSSL_INIT_SETTINGS *settings)
{
- free(settings->config_name);
+ free(settings->appname);
free(settings);
}