diff options
| author | Theo Buehler <tb@cvs.openbsd.org> | 2021-11-29 18:36:28 +0000 |
|---|---|---|
| committer | Theo Buehler <tb@cvs.openbsd.org> | 2021-11-29 18:36:28 +0000 |
| commit | c74fd262bd3fc3ea8fdf6fa34d99daf1de31bbf6 (patch) | |
| tree | 4001e52e7d1b3cc570f110abb01e22506b9464dc /lib | |
| parent | e56fefb3c27d3a2a808041578e7c2e47b92d39bc (diff) | |
Stop using BIO_s_file_inernal() in libssl.
BIO_s_file_internal() should never have leaked out of libcrypto,
but it did. As a first step of getting rid of it, stop using it
internally.
ok jsing
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libssl/ssl_cert.c | 6 | ||||
| -rw-r--r-- | lib/libssl/ssl_rsa.c | 16 | ||||
| -rw-r--r-- | lib/libssl/ssl_txt.c | 4 |
3 files changed, 13 insertions, 13 deletions
diff --git a/lib/libssl/ssl_cert.c b/lib/libssl/ssl_cert.c index e7de31949f7..3b388201ac4 100644 --- a/lib/libssl/ssl_cert.c +++ b/lib/libssl/ssl_cert.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_cert.c,v 1.87 2021/11/26 16:41:42 tb Exp $ */ +/* $OpenBSD: ssl_cert.c,v 1.88 2021/11/29 18:36:27 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -584,7 +584,7 @@ SSL_load_client_CA_file(const char *file) sk = sk_X509_NAME_new(xname_cmp); - in = BIO_new(BIO_s_file_internal()); + in = BIO_new(BIO_s_file()); if ((sk == NULL) || (in == NULL)) { SSLerrorx(ERR_R_MALLOC_FAILURE); @@ -653,7 +653,7 @@ SSL_add_file_cert_subjects_to_stack(STACK_OF(X509_NAME) *stack, oldcmp = sk_X509_NAME_set_cmp_func(stack, xname_cmp); - in = BIO_new(BIO_s_file_internal()); + in = BIO_new(BIO_s_file()); if (in == NULL) { SSLerrorx(ERR_R_MALLOC_FAILURE); diff --git a/lib/libssl/ssl_rsa.c b/lib/libssl/ssl_rsa.c index eb60c2a3728..e25b9387d7e 100644 --- a/lib/libssl/ssl_rsa.c +++ b/lib/libssl/ssl_rsa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_rsa.c,v 1.36 2021/11/26 16:40:02 tb Exp $ */ +/* $OpenBSD: ssl_rsa.c,v 1.37 2021/11/29 18:36:27 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -91,7 +91,7 @@ SSL_use_certificate_file(SSL *ssl, const char *file, int type) int ret = 0; X509 *x = NULL; - in = BIO_new(BIO_s_file_internal()); + in = BIO_new(BIO_s_file()); if (in == NULL) { SSLerror(ssl, ERR_R_BUF_LIB); goto end; @@ -214,7 +214,7 @@ SSL_use_RSAPrivateKey_file(SSL *ssl, const char *file, int type) BIO *in; RSA *rsa = NULL; - in = BIO_new(BIO_s_file_internal()); + in = BIO_new(BIO_s_file()); if (in == NULL) { SSLerror(ssl, ERR_R_BUF_LIB); goto end; @@ -283,7 +283,7 @@ SSL_use_PrivateKey_file(SSL *ssl, const char *file, int type) BIO *in; EVP_PKEY *pkey = NULL; - in = BIO_new(BIO_s_file_internal()); + in = BIO_new(BIO_s_file()); if (in == NULL) { SSLerror(ssl, ERR_R_BUF_LIB); goto end; @@ -406,7 +406,7 @@ SSL_CTX_use_certificate_file(SSL_CTX *ctx, const char *file, int type) int ret = 0; X509 *x = NULL; - in = BIO_new(BIO_s_file_internal()); + in = BIO_new(BIO_s_file()); if (in == NULL) { SSLerrorx(ERR_R_BUF_LIB); goto end; @@ -487,7 +487,7 @@ SSL_CTX_use_RSAPrivateKey_file(SSL_CTX *ctx, const char *file, int type) BIO *in; RSA *rsa = NULL; - in = BIO_new(BIO_s_file_internal()); + in = BIO_new(BIO_s_file()); if (in == NULL) { SSLerrorx(ERR_R_BUF_LIB); goto end; @@ -553,7 +553,7 @@ SSL_CTX_use_PrivateKey_file(SSL_CTX *ctx, const char *file, int type) BIO *in; EVP_PKEY *pkey = NULL; - in = BIO_new(BIO_s_file_internal()); + in = BIO_new(BIO_s_file()); if (in == NULL) { SSLerrorx(ERR_R_BUF_LIB); goto end; @@ -659,7 +659,7 @@ use_certificate_chain_file(const char *file, CERT *cert, BIO *in; int ret = 0; - in = BIO_new(BIO_s_file_internal()); + in = BIO_new(BIO_s_file()); if (in == NULL) { SSLerrorx(ERR_R_BUF_LIB); goto end; diff --git a/lib/libssl/ssl_txt.c b/lib/libssl/ssl_txt.c index e06808ac800..72ce1a0bce4 100644 --- a/lib/libssl/ssl_txt.c +++ b/lib/libssl/ssl_txt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_txt.c,v 1.30 2021/10/23 08:13:02 jsing Exp $ */ +/* $OpenBSD: ssl_txt.c,v 1.31 2021/11/29 18:36:27 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -94,7 +94,7 @@ SSL_SESSION_print_fp(FILE *fp, const SSL_SESSION *x) BIO *b; int ret; - if ((b = BIO_new(BIO_s_file_internal())) == NULL) { + if ((b = BIO_new(BIO_s_file())) == NULL) { SSLerrorx(ERR_R_BUF_LIB); return (0); } |