summaryrefslogtreecommitdiff
path: root/ext/openssl/ossl_ssl.c
diff options
context:
space:
mode:
authortenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-07-25 23:16:49 +0000
committertenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-07-25 23:16:49 +0000
commit486e6e02c264b90c5c323fb98dfffeec1fc289ae (patch)
tree5e677eb6f23b37788bd51acf6c06aaab9e781479 /ext/openssl/ossl_ssl.c
parentd9fcc9ba5e3a8f3eac6a2e06ba8477b0a648c492 (diff)
* ext/openssl/lib/openssl/ssl.rb (module OpenSSL): support
specifically setting the tmp_dh_callback to nil. * ext/openssl/ossl_ssl.c (Init_ossl_ssl): ditto * test/openssl/test_pair.rb (module OpenSSL): add a test git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51381 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/openssl/ossl_ssl.c')
-rw-r--r--ext/openssl/ossl_ssl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c
index 3e756eae5f..ca5f43cf0e 100644
--- a/ext/openssl/ossl_ssl.c
+++ b/ext/openssl/ossl_ssl.c
@@ -2122,7 +2122,7 @@ Init_ossl_ssl(void)
* The callback must return an OpenSSL::PKey::DH instance of the correct
* key length.
*/
- rb_attr(cSSLContext, rb_intern("tmp_dh_callback"), 1, 1, Qfalse);
+ rb_attr(cSSLContext, rb_intern("tmp_dh_callback"), 1, 0, Qfalse);
/*
* Sets the context in which a session can be reused. This allows