aboutsummaryrefslogtreecommitdiffstats
path: root/test/test_pair.rb
diff options
context:
space:
mode:
authorZachary Scott <e@zzak.io>2015-11-13 11:02:30 +0900
committerZachary Scott <e@zzak.io>2015-11-13 11:10:06 +0900
commitcc36e11b6621281e2f3e700a1b38327adcff2b71 (patch)
tree07ff07acd6797c66a3c599a90c840206e5c81791 /test/test_pair.rb
parent908a62cc0cff25f1861fcb69b70e10a31590e3d2 (diff)
downloadruby-openssl-cc36e11b6621281e2f3e700a1b38327adcff2b71.tar.gz
Merge trunk upstream
Diffstat (limited to 'test/test_pair.rb')
-rw-r--r--test/test_pair.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/test/test_pair.rb b/test/test_pair.rb
index ee77aebd..8e879a67 100644
--- a/test/test_pair.rb
+++ b/test/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