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 /ssl/ssl_rsa.c | |
| parent | aedac96c1172ca9a9efe72e027e935504b599e2f (diff) | |
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_rsa.c')
| -rw-r--r-- | ssl/ssl_rsa.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ssl/ssl_rsa.c b/ssl/ssl_rsa.c index 76270b677e..51604b8a87 100644 --- a/ssl/ssl_rsa.c +++ b/ssl/ssl_rsa.c @@ -64,7 +64,7 @@ int SSL_use_certificate_file(SSL *ssl, const char *file, int type) SSLerr(SSL_F_SSL_USE_CERTIFICATE_FILE, SSL_R_BAD_SSL_FILETYPE); goto end; } - x = X509_new_with_libctx(ssl->ctx->libctx, ssl->ctx->propq); + x = X509_new_ex(ssl->ctx->libctx, ssl->ctx->propq); if (x == NULL) { SSLerr(0, ERR_R_MALLOC_FAILURE); goto end; @@ -98,7 +98,7 @@ int SSL_use_certificate_ASN1(SSL *ssl, const unsigned char *d, int len) X509 *x; int ret; - x = X509_new_with_libctx(ssl->ctx->libctx, ssl->ctx->propq); + x = X509_new_ex(ssl->ctx->libctx, ssl->ctx->propq); if (x == NULL) { SSLerr(0, ERR_R_MALLOC_FAILURE); return 0; @@ -398,7 +398,7 @@ int SSL_CTX_use_certificate_file(SSL_CTX *ctx, const char *file, int type) SSLerr(SSL_F_SSL_CTX_USE_CERTIFICATE_FILE, SSL_R_BAD_SSL_FILETYPE); goto end; } - x = X509_new_with_libctx(ctx->libctx, ctx->propq); + x = X509_new_ex(ctx->libctx, ctx->propq); if (x == NULL) { SSLerr(0, ERR_R_MALLOC_FAILURE); goto end; @@ -428,7 +428,7 @@ int SSL_CTX_use_certificate_ASN1(SSL_CTX *ctx, int len, const unsigned char *d) X509 *x; int ret; - x = X509_new_with_libctx(ctx->libctx, ctx->propq); + x = X509_new_ex(ctx->libctx, ctx->propq); if (x == NULL) { SSLerr(0, ERR_R_MALLOC_FAILURE); return 0; @@ -634,7 +634,7 @@ static int use_certificate_chain_file(SSL_CTX *ctx, SSL *ssl, const char *file) goto end; } - x = X509_new_with_libctx(real_ctx->libctx, real_ctx->propq); + x = X509_new_ex(real_ctx->libctx, real_ctx->propq); if (x == NULL) { SSLerr(SSL_F_USE_CERTIFICATE_CHAIN_FILE, ERR_R_MALLOC_FAILURE); goto end; @@ -673,7 +673,7 @@ static int use_certificate_chain_file(SSL_CTX *ctx, SSL *ssl, const char *file) } while (1) { - ca = X509_new_with_libctx(real_ctx->libctx, real_ctx->propq); + ca = X509_new_ex(real_ctx->libctx, real_ctx->propq); if (ca == NULL) { SSLerr(SSL_F_USE_CERTIFICATE_CHAIN_FILE, ERR_R_MALLOC_FAILURE); goto end; |