aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrhe <rhe@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-05-30 16:52:10 +0000
committerrhe <rhe@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-05-30 16:52:10 +0000
commit60a35bc2ded9e34e2bb8f81d702ca48a9889aa8c (patch)
tree193724b5464e001b9d524e63361e4d4b2d549cca
parent1942c7b8bee835fdcb4dc026da1bb68f12f40132 (diff)
downloadruby-60a35bc2ded9e34e2bb8f81d702ca48a9889aa8c.tar.gz
openssl: fix test failure on Fedora 23
* test/openssl/test_pair.rb (test_ecdh_curves): Avoid P-224. The FIPS patch from RHEL disables it. The curve has to be chosen from: { secp256k1, secp384r1, secp521r1, prime256v1 }. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55224 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--test/openssl/test_pair.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/openssl/test_pair.rb b/test/openssl/test_pair.rb
index d9341ad123..86aa2798d7 100644
--- a/test/openssl/test_pair.rb
+++ b/test/openssl/test_pair.rb
@@ -425,7 +425,7 @@ module OpenSSL::TestPairM
ctx1 = OpenSSL::SSL::SSLContext.new
ctx1.ciphers = "ECDH"
- ctx1.ecdh_curves = "P-384:P-224"
+ ctx1.ecdh_curves = "P-384:P-521"
s1 = OpenSSL::SSL::SSLSocket.new(sock1, ctx1)
ctx2 = OpenSSL::SSL::SSLContext.new