diff options
Diffstat (limited to 'src/lib/libssl/ssl_rsa.c')
| -rw-r--r-- | src/lib/libssl/ssl_rsa.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/lib/libssl/ssl_rsa.c b/src/lib/libssl/ssl_rsa.c index e25b9387d7..6b1010e413 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.37 2021/11/29 18:36:27 tb Exp $ */ | 1 | /* $OpenBSD: ssl_rsa.c,v 1.38 2022/01/08 12:43:44 jsing 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 | * |
| @@ -66,11 +66,11 @@ | |||
| 66 | 66 | ||
| 67 | #include "ssl_locl.h" | 67 | #include "ssl_locl.h" |
| 68 | 68 | ||
| 69 | static int ssl_set_cert(CERT *c, X509 *x509); | 69 | static int ssl_set_cert(SSL_CERT *c, X509 *x509); |
| 70 | static int ssl_set_pkey(CERT *c, EVP_PKEY *pkey); | 70 | static int ssl_set_pkey(SSL_CERT *c, EVP_PKEY *pkey); |
| 71 | static int use_certificate_chain_bio(BIO *in, CERT *cert, | 71 | static int use_certificate_chain_bio(BIO *in, SSL_CERT *cert, |
| 72 | pem_password_cb *passwd_cb, void *passwd_arg); | 72 | pem_password_cb *passwd_cb, void *passwd_arg); |
| 73 | static int use_certificate_chain_file(const char *file, CERT *cert, | 73 | static int use_certificate_chain_file(const char *file, SSL_CERT *cert, |
| 74 | pem_password_cb *passwd_cb, void *passwd_arg); | 74 | pem_password_cb *passwd_cb, void *passwd_arg); |
| 75 | 75 | ||
| 76 | int | 76 | int |
| @@ -167,7 +167,7 @@ SSL_use_RSAPrivateKey(SSL *ssl, RSA *rsa) | |||
| 167 | } | 167 | } |
| 168 | 168 | ||
| 169 | static int | 169 | static int |
| 170 | ssl_set_pkey(CERT *c, EVP_PKEY *pkey) | 170 | ssl_set_pkey(SSL_CERT *c, EVP_PKEY *pkey) |
| 171 | { | 171 | { |
| 172 | int i; | 172 | int i; |
| 173 | 173 | ||
| @@ -343,7 +343,7 @@ SSL_CTX_use_certificate(SSL_CTX *ctx, X509 *x) | |||
| 343 | } | 343 | } |
| 344 | 344 | ||
| 345 | static int | 345 | static int |
| 346 | ssl_set_cert(CERT *c, X509 *x) | 346 | ssl_set_cert(SSL_CERT *c, X509 *x) |
| 347 | { | 347 | { |
| 348 | EVP_PKEY *pkey; | 348 | EVP_PKEY *pkey; |
| 349 | int i; | 349 | int i; |
| @@ -610,7 +610,7 @@ SSL_CTX_use_PrivateKey_ASN1(int type, SSL_CTX *ctx, const unsigned char *d, | |||
| 610 | * sent to the peer in the Certificate message. | 610 | * sent to the peer in the Certificate message. |
| 611 | */ | 611 | */ |
| 612 | static int | 612 | static int |
| 613 | use_certificate_chain_bio(BIO *in, CERT *cert, pem_password_cb *passwd_cb, | 613 | use_certificate_chain_bio(BIO *in, SSL_CERT *cert, pem_password_cb *passwd_cb, |
| 614 | void *passwd_arg) | 614 | void *passwd_arg) |
| 615 | { | 615 | { |
| 616 | X509 *ca, *x = NULL; | 616 | X509 *ca, *x = NULL; |
| @@ -653,7 +653,7 @@ use_certificate_chain_bio(BIO *in, CERT *cert, pem_password_cb *passwd_cb, | |||
| 653 | } | 653 | } |
| 654 | 654 | ||
| 655 | int | 655 | int |
| 656 | use_certificate_chain_file(const char *file, CERT *cert, | 656 | use_certificate_chain_file(const char *file, SSL_CERT *cert, |
| 657 | pem_password_cb *passwd_cb, void *passwd_arg) | 657 | pem_password_cb *passwd_cb, void *passwd_arg) |
| 658 | { | 658 | { |
| 659 | BIO *in; | 659 | BIO *in; |
