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 | 074353cabc934fdcfdd1b3943e6ce4513d671263 (patch) | |
tree | 57778b86417fcf09d237bbdf4e46531a6aadd695 /ext/openssl | |
parent | 6f093fc4a8ffc22dc4b46f64d9e6bc83f7fff28f (diff) | |
download | ruby-074353cabc934fdcfdd1b3943e6ce4513d671263.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
Diffstat (limited to 'ext/openssl')
-rw-r--r-- | ext/openssl/ossl_ssl.c | 6 |
1 files changed, 6 insertions, 0 deletions
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. |