diff options
| author | zzak <zzak@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-11-13 04:10:58 +0000 |
|---|---|---|
| committer | zzak <zzak@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-11-13 04:10:58 +0000 |
| commit | 47135def057554c4e9432a30020d659c26089c4f (patch) | |
| tree | 57778b86417fcf09d237bbdf4e46531a6aadd695 | |
| parent | 2069c9e031fc968d6d3d0fe30a9316851e4d91d8 (diff) | |
| download | ruby-47135def057554c4e9432a30020d659c26089c4f.tar.gz | |
* ext/openssl/ossl_ssl.c: Merge ruby/openssl@81e1a30
* test/openssl/test_ssl.rb: ditto
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52555 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ext/openssl/ossl_ssl.c | 6 | ||||
| -rw-r--r-- | test/openssl/test_ssl.rb | 2 |
3 files changed, 13 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Fri Nov 13 13:09:16 2015 Zachary Scott <zzak@ruby-lang.org> + + * ext/openssl/ossl_ssl.c: Merge ruby/openssl@81e1a30 + + * test/openssl/test_ssl.rb: ditto + Fri Nov 13 13:05:37 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> * prelude.rb (Thread.exclusive): warn as deprecated. diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c index 09d8dd2453..538ba37f24 100644 --- a/ext/openssl/ossl_ssl.c +++ b/ext/openssl/ossl_ssl.c @@ -2107,6 +2107,12 @@ Init_ossl_ssl(void) rb_define_const(mSSLExtConfig, "HAVE_TLSEXT_HOST_NAME", Qfalse); #endif +#ifdef TLS_DH_anon_WITH_AES_256_GCM_SHA384 + rb_define_const(mSSLExtConfig, "TLS_DH_anon_WITH_AES_256_GCM_SHA384", Qtrue); +#else + rb_define_const(mSSLExtConfig, "TLS_DH_anon_WITH_AES_256_GCM_SHA384", Qfalse); +#endif + /* * A callback invoked whenever a new handshake is initiated. May be used * to disable renegotiation entirely. diff --git a/test/openssl/test_ssl.rb b/test/openssl/test_ssl.rb index 0cbfcba590..9e98a21d33 100644 --- a/test/openssl/test_ssl.rb +++ b/test/openssl/test_ssl.rb @@ -415,7 +415,7 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase assert_raise_with_message(sslerr,msg){ssl.post_connection_check("localhost.localdomain")} } } - end + end if OpenSSL::ExtConfig::TLS_DH_anon_WITH_AES_256_GCM_SHA384 def test_post_connection_check sslerr = OpenSSL::SSL::SSLError |