diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libssl/ssl_cert.c | 6 | ||||
| -rw-r--r-- | src/lib/libssl/ssl_rsa.c | 16 | ||||
| -rw-r--r-- | src/lib/libssl/ssl_txt.c | 4 |
3 files changed, 13 insertions, 13 deletions
diff --git a/src/lib/libssl/ssl_cert.c b/src/lib/libssl/ssl_cert.c index e7de31949f..3b388201ac 100644 --- a/src/lib/libssl/ssl_cert.c +++ b/src/lib/libssl/ssl_cert.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ssl_cert.c,v 1.87 2021/11/26 16:41:42 tb Exp $ */ | 1 | /* $OpenBSD: ssl_cert.c,v 1.88 2021/11/29 18:36:27 tb Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -584,7 +584,7 @@ SSL_load_client_CA_file(const char *file) | |||
| 584 | 584 | ||
| 585 | sk = sk_X509_NAME_new(xname_cmp); | 585 | sk = sk_X509_NAME_new(xname_cmp); |
| 586 | 586 | ||
| 587 | in = BIO_new(BIO_s_file_internal()); | 587 | in = BIO_new(BIO_s_file()); |
| 588 | 588 | ||
| 589 | if ((sk == NULL) || (in == NULL)) { | 589 | if ((sk == NULL) || (in == NULL)) { |
| 590 | SSLerrorx(ERR_R_MALLOC_FAILURE); | 590 | SSLerrorx(ERR_R_MALLOC_FAILURE); |
| @@ -653,7 +653,7 @@ SSL_add_file_cert_subjects_to_stack(STACK_OF(X509_NAME) *stack, | |||
| 653 | 653 | ||
| 654 | oldcmp = sk_X509_NAME_set_cmp_func(stack, xname_cmp); | 654 | oldcmp = sk_X509_NAME_set_cmp_func(stack, xname_cmp); |
| 655 | 655 | ||
| 656 | in = BIO_new(BIO_s_file_internal()); | 656 | in = BIO_new(BIO_s_file()); |
| 657 | 657 | ||
| 658 | if (in == NULL) { | 658 | if (in == NULL) { |
| 659 | SSLerrorx(ERR_R_MALLOC_FAILURE); | 659 | SSLerrorx(ERR_R_MALLOC_FAILURE); |
diff --git a/src/lib/libssl/ssl_rsa.c b/src/lib/libssl/ssl_rsa.c index eb60c2a372..e25b9387d7 100644 --- a/src/lib/libssl/ssl_rsa.c +++ b/src/lib/libssl/ssl_rsa.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ssl_rsa.c,v 1.36 2021/11/26 16:40:02 tb Exp $ */ | 1 | /* $OpenBSD: ssl_rsa.c,v 1.37 2021/11/29 18:36:27 tb Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -91,7 +91,7 @@ SSL_use_certificate_file(SSL *ssl, const char *file, int type) | |||
| 91 | int ret = 0; | 91 | int ret = 0; |
| 92 | X509 *x = NULL; | 92 | X509 *x = NULL; |
| 93 | 93 | ||
| 94 | in = BIO_new(BIO_s_file_internal()); | 94 | in = BIO_new(BIO_s_file()); |
| 95 | if (in == NULL) { | 95 | if (in == NULL) { |
| 96 | SSLerror(ssl, ERR_R_BUF_LIB); | 96 | SSLerror(ssl, ERR_R_BUF_LIB); |
| 97 | goto end; | 97 | goto end; |
| @@ -214,7 +214,7 @@ SSL_use_RSAPrivateKey_file(SSL *ssl, const char *file, int type) | |||
| 214 | BIO *in; | 214 | BIO *in; |
| 215 | RSA *rsa = NULL; | 215 | RSA *rsa = NULL; |
| 216 | 216 | ||
| 217 | in = BIO_new(BIO_s_file_internal()); | 217 | in = BIO_new(BIO_s_file()); |
| 218 | if (in == NULL) { | 218 | if (in == NULL) { |
| 219 | SSLerror(ssl, ERR_R_BUF_LIB); | 219 | SSLerror(ssl, ERR_R_BUF_LIB); |
| 220 | goto end; | 220 | goto end; |
| @@ -283,7 +283,7 @@ SSL_use_PrivateKey_file(SSL *ssl, const char *file, int type) | |||
| 283 | BIO *in; | 283 | BIO *in; |
| 284 | EVP_PKEY *pkey = NULL; | 284 | EVP_PKEY *pkey = NULL; |
| 285 | 285 | ||
| 286 | in = BIO_new(BIO_s_file_internal()); | 286 | in = BIO_new(BIO_s_file()); |
| 287 | if (in == NULL) { | 287 | if (in == NULL) { |
| 288 | SSLerror(ssl, ERR_R_BUF_LIB); | 288 | SSLerror(ssl, ERR_R_BUF_LIB); |
| 289 | goto end; | 289 | goto end; |
| @@ -406,7 +406,7 @@ SSL_CTX_use_certificate_file(SSL_CTX *ctx, const char *file, int type) | |||
| 406 | int ret = 0; | 406 | int ret = 0; |
| 407 | X509 *x = NULL; | 407 | X509 *x = NULL; |
| 408 | 408 | ||
| 409 | in = BIO_new(BIO_s_file_internal()); | 409 | in = BIO_new(BIO_s_file()); |
| 410 | if (in == NULL) { | 410 | if (in == NULL) { |
| 411 | SSLerrorx(ERR_R_BUF_LIB); | 411 | SSLerrorx(ERR_R_BUF_LIB); |
| 412 | goto end; | 412 | goto end; |
| @@ -487,7 +487,7 @@ SSL_CTX_use_RSAPrivateKey_file(SSL_CTX *ctx, const char *file, int type) | |||
| 487 | BIO *in; | 487 | BIO *in; |
| 488 | RSA *rsa = NULL; | 488 | RSA *rsa = NULL; |
| 489 | 489 | ||
| 490 | in = BIO_new(BIO_s_file_internal()); | 490 | in = BIO_new(BIO_s_file()); |
| 491 | if (in == NULL) { | 491 | if (in == NULL) { |
| 492 | SSLerrorx(ERR_R_BUF_LIB); | 492 | SSLerrorx(ERR_R_BUF_LIB); |
| 493 | goto end; | 493 | goto end; |
| @@ -553,7 +553,7 @@ SSL_CTX_use_PrivateKey_file(SSL_CTX *ctx, const char *file, int type) | |||
| 553 | BIO *in; | 553 | BIO *in; |
| 554 | EVP_PKEY *pkey = NULL; | 554 | EVP_PKEY *pkey = NULL; |
| 555 | 555 | ||
| 556 | in = BIO_new(BIO_s_file_internal()); | 556 | in = BIO_new(BIO_s_file()); |
| 557 | if (in == NULL) { | 557 | if (in == NULL) { |
| 558 | SSLerrorx(ERR_R_BUF_LIB); | 558 | SSLerrorx(ERR_R_BUF_LIB); |
| 559 | goto end; | 559 | goto end; |
| @@ -659,7 +659,7 @@ use_certificate_chain_file(const char *file, CERT *cert, | |||
| 659 | BIO *in; | 659 | BIO *in; |
| 660 | int ret = 0; | 660 | int ret = 0; |
| 661 | 661 | ||
| 662 | in = BIO_new(BIO_s_file_internal()); | 662 | in = BIO_new(BIO_s_file()); |
| 663 | if (in == NULL) { | 663 | if (in == NULL) { |
| 664 | SSLerrorx(ERR_R_BUF_LIB); | 664 | SSLerrorx(ERR_R_BUF_LIB); |
| 665 | goto end; | 665 | goto end; |
diff --git a/src/lib/libssl/ssl_txt.c b/src/lib/libssl/ssl_txt.c index e06808ac80..72ce1a0bce 100644 --- a/src/lib/libssl/ssl_txt.c +++ b/src/lib/libssl/ssl_txt.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ssl_txt.c,v 1.30 2021/10/23 08:13:02 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_txt.c,v 1.31 2021/11/29 18:36:27 tb Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -94,7 +94,7 @@ SSL_SESSION_print_fp(FILE *fp, const SSL_SESSION *x) | |||
| 94 | BIO *b; | 94 | BIO *b; |
| 95 | int ret; | 95 | int ret; |
| 96 | 96 | ||
| 97 | if ((b = BIO_new(BIO_s_file_internal())) == NULL) { | 97 | if ((b = BIO_new(BIO_s_file())) == NULL) { |
| 98 | SSLerrorx(ERR_R_BUF_LIB); | 98 | SSLerrorx(ERR_R_BUF_LIB); |
| 99 | return (0); | 99 | return (0); |
| 100 | } | 100 | } |
