diff options
Diffstat (limited to 'src/lib/libssl/ssl_rsa.c')
| -rw-r--r-- | src/lib/libssl/ssl_rsa.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/lib/libssl/ssl_rsa.c b/src/lib/libssl/ssl_rsa.c index 9a1f916e57..192dc4291e 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.44 2022/06/29 21:18:04 tb Exp $ */ | 1 | /* $OpenBSD: ssl_rsa.c,v 1.45 2022/06/30 09:08:35 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 | * |
| @@ -70,8 +70,9 @@ static int ssl_get_password_cb_and_arg(SSL_CTX *ctx, SSL *ssl, | |||
| 70 | pem_password_cb **passwd_cb, void **passwd_arg); | 70 | pem_password_cb **passwd_cb, void **passwd_arg); |
| 71 | static int ssl_set_cert(SSL_CTX *ctx, SSL *ssl, X509 *x509); | 71 | static int ssl_set_cert(SSL_CTX *ctx, SSL *ssl, X509 *x509); |
| 72 | static int ssl_set_pkey(SSL_CTX *ctx, SSL *ssl, EVP_PKEY *pkey); | 72 | static int ssl_set_pkey(SSL_CTX *ctx, SSL *ssl, EVP_PKEY *pkey); |
| 73 | static int use_certificate_chain_bio(SSL_CTX *ctx, SSL *ssl, BIO *in); | 73 | static int ssl_use_certificate_chain_bio(SSL_CTX *ctx, SSL *ssl, BIO *in); |
| 74 | static int use_certificate_chain_file(SSL_CTX *ctx, SSL *ssl, const char *file); | 74 | static int ssl_use_certificate_chain_file(SSL_CTX *ctx, SSL *ssl, |
| 75 | const char *file); | ||
| 75 | 76 | ||
| 76 | int | 77 | int |
| 77 | SSL_use_certificate(SSL *ssl, X509 *x) | 78 | SSL_use_certificate(SSL *ssl, X509 *x) |
| @@ -637,7 +638,7 @@ SSL_CTX_use_PrivateKey_ASN1(int type, SSL_CTX *ctx, const unsigned char *d, | |||
| 637 | * sent to the peer in the Certificate message. | 638 | * sent to the peer in the Certificate message. |
| 638 | */ | 639 | */ |
| 639 | static int | 640 | static int |
| 640 | use_certificate_chain_bio(SSL_CTX *ctx, SSL *ssl, BIO *in) | 641 | ssl_use_certificate_chain_bio(SSL_CTX *ctx, SSL *ssl, BIO *in) |
| 641 | { | 642 | { |
| 642 | pem_password_cb *passwd_cb; | 643 | pem_password_cb *passwd_cb; |
| 643 | void *passwd_arg; | 644 | void *passwd_arg; |
| @@ -684,7 +685,7 @@ use_certificate_chain_bio(SSL_CTX *ctx, SSL *ssl, BIO *in) | |||
| 684 | } | 685 | } |
| 685 | 686 | ||
| 686 | int | 687 | int |
| 687 | use_certificate_chain_file(SSL_CTX *ctx, SSL *ssl, const char *file) | 688 | ssl_use_certificate_chain_file(SSL_CTX *ctx, SSL *ssl, const char *file) |
| 688 | { | 689 | { |
| 689 | BIO *in; | 690 | BIO *in; |
| 690 | int ret = 0; | 691 | int ret = 0; |
| @@ -700,7 +701,7 @@ use_certificate_chain_file(SSL_CTX *ctx, SSL *ssl, const char *file) | |||
| 700 | goto end; | 701 | goto end; |
| 701 | } | 702 | } |
| 702 | 703 | ||
| 703 | ret = use_certificate_chain_bio(ctx, ssl, in); | 704 | ret = ssl_use_certificate_chain_bio(ctx, ssl, in); |
| 704 | 705 | ||
| 705 | end: | 706 | end: |
| 706 | BIO_free(in); | 707 | BIO_free(in); |
| @@ -710,13 +711,13 @@ use_certificate_chain_file(SSL_CTX *ctx, SSL *ssl, const char *file) | |||
| 710 | int | 711 | int |
| 711 | SSL_CTX_use_certificate_chain_file(SSL_CTX *ctx, const char *file) | 712 | SSL_CTX_use_certificate_chain_file(SSL_CTX *ctx, const char *file) |
| 712 | { | 713 | { |
| 713 | return use_certificate_chain_file(ctx, NULL, file); | 714 | return ssl_use_certificate_chain_file(ctx, NULL, file); |
| 714 | } | 715 | } |
| 715 | 716 | ||
| 716 | int | 717 | int |
| 717 | SSL_use_certificate_chain_file(SSL *ssl, const char *file) | 718 | SSL_use_certificate_chain_file(SSL *ssl, const char *file) |
| 718 | { | 719 | { |
| 719 | return use_certificate_chain_file(NULL, ssl, file); | 720 | return ssl_use_certificate_chain_file(NULL, ssl, file); |
| 720 | } | 721 | } |
| 721 | 722 | ||
| 722 | int | 723 | int |
| @@ -731,7 +732,7 @@ SSL_CTX_use_certificate_chain_mem(SSL_CTX *ctx, void *buf, int len) | |||
| 731 | goto end; | 732 | goto end; |
| 732 | } | 733 | } |
| 733 | 734 | ||
| 734 | ret = use_certificate_chain_bio(ctx, NULL, in); | 735 | ret = ssl_use_certificate_chain_bio(ctx, NULL, in); |
| 735 | 736 | ||
| 736 | end: | 737 | end: |
| 737 | BIO_free(in); | 738 | BIO_free(in); |
