diff options
| author | Matt Caswell <matt@openssl.org> | 2020-09-24 11:42:23 +0200 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-10-01 10:25:20 +0200 |
| commit | d8652be06e2778e8898453a391deb7253e1a35a2 (patch) | |
| tree | fe40e22edb39642aa7ae633320c1900388f2e7ee /ssl/ssl_conf.c | |
| parent | Perl util to do with_libctx renaming (diff) | |
| download | openssl-d8652be06e2778e8898453a391deb7253e1a35a2.tar.xz openssl-d8652be06e2778e8898453a391deb7253e1a35a2.zip | |
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 'ssl/ssl_conf.c')
| -rw-r--r-- | ssl/ssl_conf.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/ssl/ssl_conf.c b/ssl/ssl_conf.c index acf9385785..26071cc2a1 100644 --- a/ssl/ssl_conf.c +++ b/ssl/ssl_conf.c @@ -492,13 +492,12 @@ static int do_store(SSL_CONF_CTX *cctx, return 0; } - if (CAfile != NULL && !X509_STORE_load_file_with_libctx(*st, CAfile, - libctx, propq)) + if (CAfile != NULL && !X509_STORE_load_file_ex(*st, CAfile, libctx, propq)) return 0; if (CApath != NULL && !X509_STORE_load_path(*st, CApath)) return 0; - if (CAstore != NULL && !X509_STORE_load_store_with_libctx(*st, CAstore, - libctx, propq)) + if (CAstore != NULL && !X509_STORE_load_store_ex(*st, CAstore, libctx, + propq)) return 0; return 1; } |