[ruby/openssl] ssl: update test_verify_hostname_on_connect for LibreSSL
This reverts the change made to this test case in commit https://github.com/ruby/openssl/commit/a0e98d48c91f (Enhance TLS 1.3 support on LibreSSL 3.2/3.3, 2020-12-03). Part of the test case was skipped on LibreSSL because LibreSSL 3.2.2 introduced a stricter check during creation of the extension. The check was then relaxed in LibreSSL 3.4.0. https://github.com/ruby/openssl/commit/187b176ecd
This commit is contained in:
parent
318519caaa
commit
1b515d1c37
@ -1075,13 +1075,11 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase
|
|||||||
|
|
||||||
def test_verify_hostname_on_connect
|
def test_verify_hostname_on_connect
|
||||||
ctx_proc = proc { |ctx|
|
ctx_proc = proc { |ctx|
|
||||||
san = "DNS:a.example.com,DNS:*.b.example.com"
|
|
||||||
san += ",DNS:c*.example.com,DNS:d.*.example.com" unless libressl?
|
|
||||||
exts = [
|
exts = [
|
||||||
["keyUsage", "keyEncipherment,digitalSignature", true],
|
["keyUsage", "keyEncipherment,digitalSignature", true],
|
||||||
["subjectAltName", san],
|
["subjectAltName", "DNS:a.example.com,DNS:*.b.example.com," \
|
||||||
|
"DNS:c*.example.com,DNS:d.*.example.com"],
|
||||||
]
|
]
|
||||||
|
|
||||||
ctx.cert = issue_cert(@svr, @svr_key, 4, exts, @ca_cert, @ca_key)
|
ctx.cert = issue_cert(@svr, @svr_key, 4, exts, @ca_cert, @ca_key)
|
||||||
ctx.key = @svr_key
|
ctx.key = @svr_key
|
||||||
}
|
}
|
||||||
@ -1103,7 +1101,6 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase
|
|||||||
["cx.example.com", true],
|
["cx.example.com", true],
|
||||||
["d.x.example.com", false],
|
["d.x.example.com", false],
|
||||||
].each do |name, expected_ok|
|
].each do |name, expected_ok|
|
||||||
next if name.start_with?('cx') if libressl?
|
|
||||||
begin
|
begin
|
||||||
sock = TCPSocket.new("127.0.0.1", port)
|
sock = TCPSocket.new("127.0.0.1", port)
|
||||||
ssl = OpenSSL::SSL::SSLSocket.new(sock, ctx)
|
ssl = OpenSSL::SSL::SSLSocket.new(sock, ctx)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user