summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_rsa.c
diff options
context:
space:
mode:
authortb <>2022-06-29 21:18:04 +0000
committertb <>2022-06-29 21:18:04 +0000
commit831bfdd11f50ae38c3e5fe343d11393a2e503f51 (patch)
tree473d8a8c4710121d3c89d14c161565036d7a3301 /src/lib/libssl/ssl_rsa.c
parent4f5e300043721913395d3fbf45b68d4cc92ea802 (diff)
downloadopenbsd-831bfdd11f50ae38c3e5fe343d11393a2e503f51.tar.gz
openbsd-831bfdd11f50ae38c3e5fe343d11393a2e503f51.tar.bz2
openbsd-831bfdd11f50ae38c3e5fe343d11393a2e503f51.zip
Make ssl_cert_add{0,1}_chain_cert() take ssl/ctx
ok beck jsing
Diffstat (limited to 'src/lib/libssl/ssl_rsa.c')
-rw-r--r--src/lib/libssl/ssl_rsa.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/lib/libssl/ssl_rsa.c b/src/lib/libssl/ssl_rsa.c
index 32634a7f0d..9a1f916e57 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.43 2022/06/29 21:17:22 tb Exp $ */ 1/* $OpenBSD: ssl_rsa.c,v 1.44 2022/06/29 21:18:04 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 *
@@ -641,7 +641,6 @@ use_certificate_chain_bio(SSL_CTX *ctx, SSL *ssl, BIO *in)
641{ 641{
642 pem_password_cb *passwd_cb; 642 pem_password_cb *passwd_cb;
643 void *passwd_arg; 643 void *passwd_arg;
644 SSL_CERT *cert;
645 X509 *ca, *x = NULL; 644 X509 *ca, *x = NULL;
646 unsigned long err; 645 unsigned long err;
647 int ret = 0; 646 int ret = 0;
@@ -655,9 +654,6 @@ use_certificate_chain_bio(SSL_CTX *ctx, SSL *ssl, BIO *in)
655 goto err; 654 goto err;
656 } 655 }
657 656
658 if ((cert = ssl_get0_cert(ctx, ssl)) == NULL)
659 goto err;
660
661 if (!ssl_set_cert(ctx, ssl, x)) 657 if (!ssl_set_cert(ctx, ssl, x))
662 goto err; 658 goto err;
663 659
@@ -667,7 +663,7 @@ use_certificate_chain_bio(SSL_CTX *ctx, SSL *ssl, BIO *in)
667 /* Process any additional CA certificates. */ 663 /* Process any additional CA certificates. */
668 while ((ca = PEM_read_bio_X509(in, NULL, passwd_cb, passwd_arg)) != 664 while ((ca = PEM_read_bio_X509(in, NULL, passwd_cb, passwd_arg)) !=
669 NULL) { 665 NULL) {
670 if (!ssl_cert_add0_chain_cert(cert, ca)) { 666 if (!ssl_cert_add0_chain_cert(ctx, ssl, ca)) {
671 X509_free(ca); 667 X509_free(ca);
672 goto err; 668 goto err;
673 } 669 }