From 831bfdd11f50ae38c3e5fe343d11393a2e503f51 Mon Sep 17 00:00:00 2001 From: tb <> Date: Wed, 29 Jun 2022 21:18:04 +0000 Subject: Make ssl_cert_add{0,1}_chain_cert() take ssl/ctx ok beck jsing --- src/lib/libssl/ssl_rsa.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'src/lib/libssl/ssl_rsa.c') 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 @@ -/* $OpenBSD: ssl_rsa.c,v 1.43 2022/06/29 21:17:22 tb Exp $ */ +/* $OpenBSD: ssl_rsa.c,v 1.44 2022/06/29 21:18:04 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -641,7 +641,6 @@ use_certificate_chain_bio(SSL_CTX *ctx, SSL *ssl, BIO *in) { pem_password_cb *passwd_cb; void *passwd_arg; - SSL_CERT *cert; X509 *ca, *x = NULL; unsigned long err; int ret = 0; @@ -655,9 +654,6 @@ use_certificate_chain_bio(SSL_CTX *ctx, SSL *ssl, BIO *in) goto err; } - if ((cert = ssl_get0_cert(ctx, ssl)) == NULL) - goto err; - if (!ssl_set_cert(ctx, ssl, x)) goto err; @@ -667,7 +663,7 @@ use_certificate_chain_bio(SSL_CTX *ctx, SSL *ssl, BIO *in) /* Process any additional CA certificates. */ while ((ca = PEM_read_bio_X509(in, NULL, passwd_cb, passwd_arg)) != NULL) { - if (!ssl_cert_add0_chain_cert(cert, ca)) { + if (!ssl_cert_add0_chain_cert(ctx, ssl, ca)) { X509_free(ca); goto err; } -- cgit v1.2.3-55-g6feb