|
 |
7c49434 |
From 71057ca5963108bac1e2c31bd0e8e205ba74cc19 Mon Sep 17 00:00:00 2001
|
|
|
7c49434 |
From: Kazuki Yamaguchi <k@rhe.jp>
|
|
|
7c49434 |
Date: Fri, 11 May 2018 13:43:32 +0900
|
|
|
7c49434 |
Subject: [PATCH 1/2] test/test_pkey_rsa: fix test failure with OpenSSL 1.1.1
|
|
|
7c49434 |
|
|
|
7c49434 |
OpenSSL 1.1.1 raised the minimum size for RSA keys to 512 bits.
|
|
|
7c49434 |
---
|
|
|
7c49434 |
test/openssl/test_pkey_rsa.rb | 9 ++++++++-
|
|
|
7c49434 |
1 file changed, 8 insertions(+), 1 deletion(-)
|
|
|
7c49434 |
|
|
|
7c49434 |
diff --git a/test/openssl/test_pkey_rsa.rb b/test/openssl/test_pkey_rsa.rb
|
|
|
7c49434 |
index c1205563..b4393e68 100644
|
|
|
7c49434 |
--- a/test/openssl/test_pkey_rsa.rb
|
|
|
7c49434 |
+++ b/test/openssl/test_pkey_rsa.rb
|
|
|
7c49434 |
@@ -60,6 +60,13 @@ def test_new_with_exponent
|
|
|
7c49434 |
end
|
|
|
7c49434 |
end
|
|
|
7c49434 |
|
|
|
7c49434 |
+ def test_generate
|
|
|
7c49434 |
+ key = OpenSSL::PKey::RSA.generate(512, 17)
|
|
|
7c49434 |
+ assert_equal 512, key.n.num_bits
|
|
|
7c49434 |
+ assert_equal 17, key.e
|
|
|
7c49434 |
+ assert_not_nil key.d
|
|
|
7c49434 |
+ end
|
|
|
7c49434 |
+
|
|
|
7c49434 |
def test_new_break
|
|
|
7c49434 |
assert_nil(OpenSSL::PKey::RSA.new(1024) { break })
|
|
|
7c49434 |
assert_raise(RuntimeError) do
|
|
|
7c49434 |
@@ -256,7 +263,7 @@ def test_pem_passwd
|
|
|
7c49434 |
end
|
|
|
7c49434 |
|
|
|
7c49434 |
def test_dup
|
|
|
7c49434 |
- key = OpenSSL::PKey::RSA.generate(256, 17)
|
|
|
7c49434 |
+ key = Fixtures.pkey("rsa1024")
|
|
|
7c49434 |
key2 = key.dup
|
|
|
7c49434 |
assert_equal key.params, key2.params
|
|
|
7c49434 |
key2.set_key(key2.n, 3, key2.d)
|
|
|
7c49434 |
|
|
|
7c49434 |
From a5e26bc1345fe325bdc619f9b1768b7ad3c94214 Mon Sep 17 00:00:00 2001
|
|
|
7c49434 |
From: Kazuki Yamaguchi <k@rhe.jp>
|
|
|
7c49434 |
Date: Fri, 11 May 2018 14:12:39 +0900
|
|
|
7c49434 |
Subject: [PATCH 2/2] test/test_ssl_session: set client protocol version
|
|
|
7c49434 |
explicitly
|
|
|
7c49434 |
|
|
|
7c49434 |
Clients that implement TLS 1.3's Middlebox Compatibility Mode will
|
|
|
7c49434 |
always provide a non-empty session ID in the ClientHello. This means
|
|
|
7c49434 |
the "get" callback for the server-side session caching may be called
|
|
|
7c49434 |
for the initial connection.
|
|
|
7c49434 |
---
|
|
|
7c49434 |
test/openssl/test_ssl_session.rb | 14 +++++++++-----
|
|
|
7c49434 |
1 file changed, 9 insertions(+), 5 deletions(-)
|
|
|
7c49434 |
|
|
|
7c49434 |
diff --git a/test/openssl/test_ssl_session.rb b/test/openssl/test_ssl_session.rb
|
|
|
7c49434 |
index af8c65b1..6db0c2d1 100644
|
|
|
7c49434 |
--- a/test/openssl/test_ssl_session.rb
|
|
|
7c49434 |
+++ b/test/openssl/test_ssl_session.rb
|
|
|
7c49434 |
@@ -198,7 +198,9 @@ def test_server_session_cache
|
|
|
7c49434 |
first_session = nil
|
|
|
7c49434 |
10.times do |i|
|
|
|
7c49434 |
connections = i
|
|
|
7c49434 |
- server_connect_with_session(port, nil, first_session) { |ssl|
|
|
|
7c49434 |
+ cctx = OpenSSL::SSL::SSLContext.new
|
|
|
7c49434 |
+ cctx.ssl_version = :TLSv1_2
|
|
|
7c49434 |
+ server_connect_with_session(port, cctx, first_session) { |ssl|
|
|
|
7c49434 |
ssl.puts("abc"); assert_equal "abc\n", ssl.gets
|
|
|
7c49434 |
first_session ||= ssl.session
|
|
|
7c49434 |
|
|
|
7c49434 |
@@ -257,6 +259,8 @@ def test_ctx_server_session_cb
|
|
|
7c49434 |
|
|
|
7c49434 |
connections = nil
|
|
|
7c49434 |
called = {}
|
|
|
7c49434 |
+ cctx = OpenSSL::SSL::SSLContext.new
|
|
|
7c49434 |
+ cctx.ssl_version = :TLSv1_2
|
|
|
7c49434 |
sctx = nil
|
|
|
7c49434 |
ctx_proc = Proc.new { |ctx|
|
|
|
7c49434 |
sctx = ctx
|
|
|
7c49434 |
@@ -292,7 +296,7 @@ def test_ctx_server_session_cb
|
|
|
7c49434 |
}
|
|
|
7c49434 |
start_server(ctx_proc: ctx_proc) do |port|
|
|
|
7c49434 |
connections = 0
|
|
|
7c49434 |
- sess0 = server_connect_with_session(port, nil, nil) { |ssl|
|
|
|
7c49434 |
+ sess0 = server_connect_with_session(port, cctx, nil) { |ssl|
|
|
|
7c49434 |
ssl.puts("abc"); assert_equal "abc\n", ssl.gets
|
|
|
7c49434 |
assert_equal false, ssl.session_reused?
|
|
|
7c49434 |
ssl.session
|
|
|
7c49434 |
@@ -307,7 +311,7 @@ def test_ctx_server_session_cb
|
|
|
7c49434 |
|
|
|
7c49434 |
# Internal cache hit
|
|
|
7c49434 |
connections = 1
|
|
|
7c49434 |
- server_connect_with_session(port, nil, sess0.dup) { |ssl|
|
|
|
7c49434 |
+ server_connect_with_session(port, cctx, sess0.dup) { |ssl|
|
|
|
7c49434 |
ssl.puts("abc"); assert_equal "abc\n", ssl.gets
|
|
|
7c49434 |
assert_equal true, ssl.session_reused?
|
|
|
7c49434 |
ssl.session
|
|
|
7c49434 |
@@ -328,7 +332,7 @@ def test_ctx_server_session_cb
|
|
|
7c49434 |
|
|
|
7c49434 |
# External cache hit
|
|
|
7c49434 |
connections = 2
|
|
|
7c49434 |
- sess2 = server_connect_with_session(port, nil, sess0.dup) { |ssl|
|
|
|
7c49434 |
+ sess2 = server_connect_with_session(port, cctx, sess0.dup) { |ssl|
|
|
|
7c49434 |
ssl.puts("abc"); assert_equal "abc\n", ssl.gets
|
|
|
7c49434 |
if !ssl.session_reused? && openssl?(1, 1, 0) && !openssl?(1, 1, 0, 7)
|
|
|
7c49434 |
# OpenSSL >= 1.1.0, < 1.1.0g
|
|
|
7c49434 |
@@ -355,7 +359,7 @@ def test_ctx_server_session_cb
|
|
|
7c49434 |
|
|
|
7c49434 |
# Cache miss
|
|
|
7c49434 |
connections = 3
|
|
|
7c49434 |
- sess3 = server_connect_with_session(port, nil, sess0.dup) { |ssl|
|
|
|
7c49434 |
+ sess3 = server_connect_with_session(port, cctx, sess0.dup) { |ssl|
|
|
|
7c49434 |
ssl.puts("abc"); assert_equal "abc\n", ssl.gets
|
|
|
7c49434 |
assert_equal false, ssl.session_reused?
|
|
|
7c49434 |
ssl.session
|