diff options
| author | Rich Salz <rsalz@openssl.org> | 2016-06-13 03:49:40 +0200 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-06-14 18:30:37 +0200 |
| commit | cda3ae5bd0798c56fef5a5c1462d51ca1776504e (patch) | |
| tree | 3fcc90ce98682102ec3c07e65c7e086a7d70a603 /include | |
| parent | Free memory on an error path (diff) | |
| download | openssl-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 'include')
| -rw-r--r-- | include/internal/conf.h | 4 | ||||
| -rw-r--r-- | include/openssl/crypto.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/internal/conf.h b/include/internal/conf.h index 8f3e09c896..ada3f92b4d 100644 --- a/include/internal/conf.h +++ b/include/internal/conf.h @@ -18,10 +18,10 @@ extern "C" { struct ossl_init_settings_st { - char *config_name; + char *appname; }; -void openssl_config_int(const char *config_name); +void openssl_config_int(const char *appname); void openssl_no_config_int(void); void conf_modules_free_int(void); diff --git a/include/openssl/crypto.h b/include/openssl/crypto.h index c4b31d92f3..0f593498db 100644 --- a/include/openssl/crypto.h +++ b/include/openssl/crypto.h @@ -380,8 +380,8 @@ void OPENSSL_thread_stop(void); /* Low-level control of initialization */ 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 *config_file); #endif void OPENSSL_INIT_free(OPENSSL_INIT_SETTINGS *settings); |