Skip to content

Commit 42e30d8

Browse files
committed
Drop support for LibreSSL 2.4
LibreSSL 2.4 reached its EOL in 2017-09.
1 parent e345225 commit 42e30d8

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ matrix:
2121
- env: RUBY_VERSION=ruby-2.4 OPENSSL_VERSION=openssl-1.0.1
2222
- env: RUBY_VERSION=ruby-2.4 OPENSSL_VERSION=openssl-1.0.2
2323
- env: RUBY_VERSION=ruby-2.4 OPENSSL_VERSION=openssl-1.1.0
24-
- env: RUBY_VERSION=ruby-2.4 OPENSSL_VERSION=libressl-2.4
2524
- env: RUBY_VERSION=ruby-2.4 OPENSSL_VERSION=libressl-2.5
2625
- env: RUBY_VERSION=ruby-2.4 OPENSSL_VERSION=libressl-2.6
2726
- language: ruby

test/test_ocsp.rb

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -122,12 +122,12 @@ def test_request_sign_verify
122122

123123
assert_equal true, req.verify([@cert], store, OpenSSL::OCSP::NOINTERN)
124124
ret = req.verify([@cert], store)
125-
if ret || openssl?(1, 0, 2) || libressl?(2, 4, 2)
125+
if ret || openssl?(1, 0, 2)
126126
assert_equal true, ret
127127
else
128128
# RT2560; OCSP_request_verify() does not find signer cert from 'certs' when
129129
# OCSP_NOINTERN is not specified.
130-
# fixed by OpenSSL 1.0.1j, 1.0.2 and LibreSSL 2.4.2
130+
# fixed by OpenSSL 1.0.1j, 1.0.2
131131
pend "RT2560: ocsp_req_find_signer"
132132
end
133133

@@ -262,11 +262,6 @@ def test_single_response_check_validity
262262
bres.add_status(cid2, OpenSSL::OCSP::V_CERTSTATUS_REVOKED, OpenSSL::OCSP::REVOKED_STATUS_UNSPECIFIED, -400, -300, nil, [])
263263
bres.add_status(cid2, OpenSSL::OCSP::V_CERTSTATUS_GOOD, nil, nil, Time.now + 100, nil, nil)
264264

265-
if bres.responses[2].check_validity # thisUpdate is in future; must fail
266-
# LibreSSL bug; skip for now
267-
pend "OCSP_check_validity() is broken"
268-
end
269-
270265
single1 = bres.responses[0]
271266
assert_equal false, single1.check_validity
272267
assert_equal false, single1.check_validity(30)
@@ -275,6 +270,8 @@ def test_single_response_check_validity
275270
assert_equal true, single2.check_validity
276271
assert_equal true, single2.check_validity(0, 500)
277272
assert_equal false, single2.check_validity(0, 200)
273+
single3 = bres.responses[2]
274+
assert_equal false, single3.check_validity
278275
end
279276

280277
def test_response

0 commit comments

Comments
 (0)