aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--test/openssl/test_ssl_session.rb4
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 15ab7b2e3d..8e5412f06a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Fri Sep 23 13:46:59 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
+
+ * test/openssl/test_ssl_session.rb: execute test_session_exts_read
+ only for OpenSSL versions >= 0.9.8k. Thanks, Eric Wong, for
+ reporting this.
+ [Bug #4961] [ruby-core:37726]
+
Fri Sep 23 11:59:08 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
* test/openssl/test_ssl_session.rb: ensure server calls callbacks in
diff --git a/test/openssl/test_ssl_session.rb b/test/openssl/test_ssl_session.rb
index 28d40ddcf2..12c6152f9b 100644
--- a/test/openssl/test_ssl_session.rb
+++ b/test/openssl/test_ssl_session.rb
@@ -108,11 +108,9 @@ __EOS__
assert_equal(2**31 - 1, sess.timeout.to_i)
end
-if OpenSSL::OPENSSL_VERSION_NUMBER >= 0x0090806f
def test_session_exts_read
assert(OpenSSL::SSL::Session.new(DUMMY_SESSION))
- end
-end
+ end if OpenSSL::OPENSSL_VERSION_NUMBER >= 0x009080bf
def test_client_session
last_session = nil