From dd05607f9a76ebab24fe7cf720bda102a81e5b0d Mon Sep 17 00:00:00 2001
From: rhe <rhe@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 9 Jun 2016 10:46:46 +0000
Subject: openssl: fix build with OPENSSL_NO_EC

* ext/openssl/ossl_ssl.c: Add define guards for OPENSSL_NO_EC.
  SSL_CTX_set_ecdh_auto() is defined even when ECDH is disabled in
  OpenSSL's configuration. This fixes r55214.

* test/openssl/test_pair.rb (test_ecdh_curves): Skip if the OpenSSL does
  not support ECDH.

* test/openssl/utils.rb (start_server): Ignore error in
  SSLContext#ecdh_curves=.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55342 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/openssl/test_pair.rb | 7 ++++++-
 test/openssl/utils.rb     | 5 ++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'test')

diff --git a/test/openssl/test_pair.rb b/test/openssl/test_pair.rb
index 5cb6627c87..b90b4de372 100644
--- a/test/openssl/test_pair.rb
+++ b/test/openssl/test_pair.rb
@@ -433,7 +433,12 @@ module OpenSSL::TestPairM
     sock1, sock2 = tcp_pair
 
     ctx1 = OpenSSL::SSL::SSLContext.new
-    ctx1.ciphers = "ECDH"
+    begin
+      ctx1.ciphers = "ECDH"
+    rescue OpenSSL::SSL::SSLError
+      skip "ECDH is not enabled in this OpenSSL" if $!.message =~ /no cipher match/
+      raise
+    end
     ctx1.ecdh_curves = "P-384:P-521"
     ctx1.security_level = 0
     s1 = OpenSSL::SSL::SSLSocket.new(sock1, ctx1)
diff --git a/test/openssl/utils.rb b/test/openssl/utils.rb
index e4861fa688..f306b5d3d8 100644
--- a/test/openssl/utils.rb
+++ b/test/openssl/utils.rb
@@ -298,7 +298,10 @@ AQjjxMXhwULlmuR/K+WwlaZPiLIBYalLAZQ7ZbOPeVkJ8ePao0eLAgEC
         ctx.cert = @svr_cert
         ctx.key = @svr_key
         ctx.tmp_dh_callback = proc { OpenSSL::TestUtils::TEST_KEY_DH1024 }
-        ctx.ecdh_curves = "P-256"
+        begin
+          ctx.ecdh_curves = "P-256"
+        rescue NotImplementedError
+        end
         ctx.verify_mode = verify_mode
         ctx_proc.call(ctx) if ctx_proc
 
-- 
cgit v1.2.3