summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-10-31 11:16:02 +0000
committerhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-10-31 11:16:02 +0000
commita8438d3033a87f93f7a3a8c6ce32f6279ca7ad84 (patch)
tree4be5ffb111e7d9c730877ffea45d859006a5c507
parentbd362b70ba88ad41a8bc6186d1096af8f6b63fc4 (diff)
* test/openssl/test_pair.rb: skipped tests if openssl doesn't support
ECDH cipher. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52412 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--test/openssl/test_pair.rb6
2 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 9ee6eb5..ba4cd1a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Oct 31 20:15:48 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org>
+
+ * test/openssl/test_pair.rb: skipped tests if openssl doesn't support
+ ECDH cipher.
+
Sat Oct 31 14:58:10 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* man/ruby.1 (SYNOPSIS): remove extraneous space for -F option as
diff --git a/test/openssl/test_pair.rb b/test/openssl/test_pair.rb
index 977d11a..9324265 100644
--- a/test/openssl/test_pair.rb
+++ b/test/openssl/test_pair.rb
@@ -372,6 +372,12 @@ module OpenSSL::TestPairM
accepted = s2.accept
assert called, 'ecdh callback should be called'
+ rescue OpenSSL::SSL::SSLError => e
+ if e.message =~ /no cipher match/
+ skip "ECDH cipher not supported."
+ else
+ raise e
+ end
ensure
th.join if th
s1.close if s1