[前][次][番号順一覧][スレッド一覧]

ruby-changes:72476

From: Jeremy <ko1@a...>
Date: Sat, 9 Jul 2022 00:31:58 +0900 (JST)
Subject: [ruby-changes:72476] def445303a (master): [ruby/openssl] Fix test of cipher name to pass in LibreSSL 3.4

https://git.ruby-lang.org/ruby.git/commit/?id=def445303a

From def445303a93c69dd16a9b849b9171d4e89c6dc5 Mon Sep 17 00:00:00 2001
From: Jeremy Evans <code@j...>
Date: Fri, 25 Mar 2022 13:50:10 -0700
Subject: [ruby/openssl] Fix test of cipher name to pass in LibreSSL 3.4

LibreSSL 3.5 switched the cipher naming to match OpenSSL.

https://github.com/ruby/openssl/commit/bf198278bd
---
 test/openssl/test_ssl.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/test/openssl/test_ssl.rb b/test/openssl/test_ssl.rb
index b3d7cba6e6..3ba8b39863 100644
--- a/test/openssl/test_ssl.rb
+++ b/test/openssl/test_ssl.rb
@@ -1586,7 +1586,11 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase https://github.com/ruby/ruby/blob/trunk/test/openssl/test_ssl.rb#L1586
 
         server_connect(port, cli_ctx) do |ssl|
           assert_equal('TLSv1.3', ssl.ssl_version)
-          assert_equal(csuite[0], ssl.cipher[0])
+          if libressl?(3, 4, 0) && !libressl?(3, 5, 0)
+            assert_equal("AEAD-AES128-GCM-SHA256", ssl.cipher[0]) 
+          else
+            assert_equal(csuite[0], ssl.cipher[0]) 
+          end
           ssl.puts('abc'); assert_equal("abc\n", ssl.gets)
         end
       end
-- 
cgit v1.2.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]