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 /crypto/init.c | |
| 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 'crypto/init.c')
| -rw-r--r-- | crypto/init.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crypto/init.c b/crypto/init.c index 2344f991d2..693037fe00 100644 --- a/crypto/init.c +++ b/crypto/init.c @@ -153,15 +153,15 @@ static void ossl_init_no_add_algs(void) static CRYPTO_ONCE config = CRYPTO_ONCE_STATIC_INIT; static int config_inited = 0; -static const char *config_filename; +static const char *appname; static void ossl_init_config(void) { #ifdef OPENSSL_INIT_DEBUG fprintf(stderr, "OPENSSL_INIT: ossl_init_config: openssl_config(%s)\n", - config_filename==NULL?"NULL":config_filename); + appname == NULL ? "NULL" : appname); #endif - openssl_config_int(config_filename); + openssl_config_int(appname); config_inited = 1; } static void ossl_init_no_config(void) @@ -512,7 +512,7 @@ int OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings) if (opts & OPENSSL_INIT_LOAD_CONFIG) { int ret; CRYPTO_THREAD_write_lock(init_lock); - config_filename = (settings == NULL) ? NULL : settings->config_name; + appname = (settings == NULL) ? NULL : settings->appname; ret = CRYPTO_THREAD_run_once(&config, ossl_init_config); CRYPTO_THREAD_unlock(init_lock); if (!ret) |