summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorheadius <headius@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-10-31 20:49:51 +0000
committerheadius <headius@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-10-31 20:49:51 +0000
commit88326272bc079cd0f47759e02e174f9ff1a73774 (patch)
tree5c2c538fe8d04c1a5f00ae53544787bd6b7b13d0
parente697783d6e3286054accd3fb95b3fcb972e4e342 (diff)
* test/openssl/test_ssl.rb: Add certificate verification chain
test from JRuby community. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48216 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--test/openssl/test_ssl.rb7
2 files changed, 12 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index a5fb3c9bc7..701e3a477f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Oct 31 15:26:02 2014 Charles Oliver Nutter <headius@headius.com>
+
+ * test/openssl/test_ssl.rb: Add certificate verification chain
+ test from JRuby community.
+
Fri Oct 31 18:58:02 2014 Charles Oliver Nutter <headius@headius.com>
* test/psych/test_emitter.rb: Fix line_width test...initial value
diff --git a/test/openssl/test_ssl.rb b/test/openssl/test_ssl.rb
index ddc3be5b05..4f6e41b5eb 100644
--- a/test/openssl/test_ssl.rb
+++ b/test/openssl/test_ssl.rb
@@ -19,6 +19,13 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase
ctx.options & OpenSSL::SSL::OP_NO_COMPRESSION)
end if defined?(OpenSSL::SSL::OP_NO_COMPRESSION)
+ def test_ctx_setup_with_extra_chain_cert
+ ctx = OpenSSL::SSL::SSLContext.new
+ ctx.extra_chain_cert = [@ca_cert, @cli_cert]
+ assert_equal(ctx.setup, true)
+ assert_equal(ctx.setup, nil)
+ end
+
def test_not_started_session
skip "non socket argument of SSLSocket.new is not supported on this platform" if /mswin|mingw/ =~ RUBY_PLATFORM
open(__FILE__) do |f|