diff options
| author | rhe <rhe@ruby-lang.org> | 2016-06-09 10:46:46 +0000 |
|---|---|---|
| committer | rhe <rhe@ruby-lang.org> | 2016-06-09 10:46:46 +0000 |
| commit | a6e9d827982209fd32cea7c3701df00f04bebe71 (patch) | |
| tree | 234793e8529e8f93d8ce2d7fc2b060e235eaf7a8 /test/test_pair.rb | |
| parent | d576ae8eaa5cebd0a4896ef65ac06147e85393ae (diff) | |
| download | ruby-openssl-history-a6e9d827982209fd32cea7c3701df00f04bebe71.tar.gz | |
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
Diffstat (limited to 'test/test_pair.rb')
| -rw-r--r-- | test/test_pair.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/test/test_pair.rb b/test/test_pair.rb index 5cb6627..b90b4de 100644 --- a/test/test_pair.rb +++ b/test/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) |