diff options
| author | Matt Caswell <matt@openssl.org> | 2020-09-24 10:42:23 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-10-01 09:25:20 +0100 |
| commit | d8652be06e2778e8898453a391deb7253e1a35a2 (patch) | |
| tree | fe40e22edb39642aa7ae633320c1900388f2e7ee /crypto/conf | |
| parent | aedac96c1172ca9a9efe72e027e935504b599e2f (diff) | |
| download | openssl-new-d8652be06e2778e8898453a391deb7253e1a35a2.tar.gz | |
Run the withlibctx.pl script
Automatically rename all instances of _with_libctx() to _ex() as per
our coding style.
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/12970)
Diffstat (limited to 'crypto/conf')
| -rw-r--r-- | crypto/conf/conf_lib.c | 4 | ||||
| -rw-r--r-- | crypto/conf/conf_mod.c | 9 |
2 files changed, 6 insertions, 7 deletions
diff --git a/crypto/conf/conf_lib.c b/crypto/conf/conf_lib.c index a9d960b721..4cc698400c 100644 --- a/crypto/conf/conf_lib.c +++ b/crypto/conf/conf_lib.c @@ -174,7 +174,7 @@ int CONF_dump_bio(LHASH_OF(CONF_VALUE) *conf, BIO *out) * the "CONF classic" functions, for consistency. */ -CONF *NCONF_new_with_libctx(OPENSSL_CTX *libctx, CONF_METHOD *meth) +CONF *NCONF_new_ex(OPENSSL_CTX *libctx, CONF_METHOD *meth) { CONF *ret; @@ -193,7 +193,7 @@ CONF *NCONF_new_with_libctx(OPENSSL_CTX *libctx, CONF_METHOD *meth) CONF *NCONF_new(CONF_METHOD *meth) { - return NCONF_new_with_libctx(NULL, meth); + return NCONF_new_ex(NULL, meth); } void NCONF_free(CONF *conf) diff --git a/crypto/conf/conf_mod.c b/crypto/conf/conf_mod.c index fa7f6b9d9f..5359a7e06d 100644 --- a/crypto/conf/conf_mod.c +++ b/crypto/conf/conf_mod.c @@ -145,15 +145,14 @@ int CONF_modules_load(const CONF *cnf, const char *appname, } -int CONF_modules_load_file_with_libctx(OPENSSL_CTX *libctx, - const char *filename, - const char *appname, unsigned long flags) +int CONF_modules_load_file_ex(OPENSSL_CTX *libctx, const char *filename, + const char *appname, unsigned long flags) { char *file = NULL; CONF *conf = NULL; int ret = 0, diagnostics = 0; - conf = NCONF_new_with_libctx(libctx, NULL); + conf = NCONF_new_ex(libctx, NULL); if (conf == NULL) goto err; @@ -191,7 +190,7 @@ int CONF_modules_load_file_with_libctx(OPENSSL_CTX *libctx, int CONF_modules_load_file(const char *filename, const char *appname, unsigned long flags) { - return CONF_modules_load_file_with_libctx(NULL, filename, appname, flags); + return CONF_modules_load_file_ex(NULL, filename, appname, flags); } DEFINE_RUN_ONCE_STATIC(do_load_builtin_modules) |