From ab35549a60010ed9a791bf266139b0656cdb396a Mon Sep 17 00:00:00 2001 From: "William T. Nelson" <35801+wtn@users.noreply.github.com> Date: Thu, 12 Nov 2026 08:29:59 -0600 Subject: [PATCH] ssl: reset chain in add_certificate When extra_certs is omitted, SSLContext#add_certificate and SSLSocket#add_certificate keep the extra certificates set earlier for the same key type. Pass a NULL chain to SSL_CTX_set0_chain() and SSL_set0_chain() to remove the earlier extra certificates. Co-authored-by: Claude Mythos 5.2 --- ext/openssl/ossl_ssl.c | 8 ++++++-- test/openssl/test_ssl.rb | 35 +++++++++++++++++++++++++++++++++-- 2 files changed, 39 insertions(+), 4 deletions(-) diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c index b29e45f84..25f3cc4f2 100644 --- a/ext/openssl/ossl_ssl.c +++ b/ext/openssl/ossl_ssl.c @@ -1410,6 +1410,10 @@ get_cert_and_key(VALUE cert, VALUE key, X509 **x509, EVP_PKEY **pkey) * repeated calls of this method, and OpenSSL will choose the most appropriate * certificate during the handshake. * + * If a certificate with the same public key type was already added, the + * earlier certificate and its extra certificates are replaced. If + * _extra_certs_ is omitted, the earlier extra certificates are discarded. + * * #cert=, #key=, and #extra_chain_cert= are old accessor methods for setting * certificate and internally call this method. * @@ -1459,7 +1463,7 @@ ossl_sslctx_add_certificate(int argc, VALUE *argv, VALUE self) sk_X509_pop_free(extra_chain, X509_free); ossl_raise(eSSLError, "SSL_CTX_use_PrivateKey"); } - if (extra_chain && !SSL_CTX_set0_chain(ctx, extra_chain)) { + if (!SSL_CTX_set0_chain(ctx, extra_chain)) { sk_X509_pop_free(extra_chain, X509_free); ossl_raise(eSSLError, "SSL_CTX_set0_chain"); } @@ -1497,7 +1501,7 @@ ossl_ssl_add_certificate(int argc, VALUE *argv, VALUE self) sk_X509_pop_free(extra_chain, X509_free); ossl_raise(eSSLError, "SSL_use_PrivateKey"); } - if (extra_chain && !SSL_set0_chain(ssl, extra_chain)) { + if (!SSL_set0_chain(ssl, extra_chain)) { sk_X509_pop_free(extra_chain, X509_free); ossl_raise(eSSLError, "SSL_set0_chain"); } diff --git a/test/openssl/test_ssl.rb b/test/openssl/test_ssl.rb index 3a548e36f..d65949744 100644 --- a/test/openssl/test_ssl.rb +++ b/test/openssl/test_ssl.rb @@ -303,6 +303,19 @@ def test_add_certificate ssl.puts "abc"; assert_equal "abc\n", ssl.gets } end + + # Extra certificates from an earlier call are not sent + sctx = OpenSSL::SSL::SSLContext.new + sctx.add_certificate(@svr_cert, @svr_key, [@ca_cert]) + sctx.add_certificate(@cli_cert, @cli_key) + + start_server(sctx) do |port| + server_connect(port) { |ssl| + assert_equal [@cli_cert], ssl.peer_cert_chain + + ssl.puts "abc"; assert_equal "abc\n", ssl.gets + } + end end def test_socket_add_certificate @@ -321,6 +334,23 @@ def test_socket_add_certificate } } + # Extra certificates copied from the SSLContext are not sent + server_proc = -> sock { + ctx = OpenSSL::SSL::SSLContext.new + ctx.add_certificate(@svr_cert, @svr_key, [@ca_cert]) + ssl = OpenSSL::SSL::SSLSocket.new(sock, ctx) + ssl.add_certificate(@cli_cert, @cli_key) + ssl.accept + readwrite_loop(ssl) + } + start_server_proc(server_proc) { |port| + server_connect(port) { |ssl| + assert_equal [@cli_cert], ssl.peer_cert_chain + + ssl.puts "abc"; assert_equal "abc\n", ssl.gets + } + } + # Invalid IO.pipe { |r, _w| ssl = OpenSSL::SSL::SSLSocket.new(r) @@ -1187,7 +1217,8 @@ def test_tlsext_hostname def test_servername_cb_add_certificate called = [] - sctx = make_server_context + sctx = OpenSSL::SSL::SSLContext.new + sctx.add_certificate(@svr_cert, @svr_key, [@ca_cert]) sctx.servername_cb = proc do |ssl, servername| called << servername ssl.add_certificate(@cli_cert, @cli_key) @@ -1198,7 +1229,7 @@ def test_servername_cb_add_certificate ssl = OpenSSL::SSL::SSLSocket.new(sock) ssl.hostname = "example.org" ssl.connect - assert_equal(@cli_cert, ssl.peer_cert) + assert_equal([@cli_cert], ssl.peer_cert_chain) assert_equal(["example.org"], called) ssl.puts("abc"); ssl.gets ensure