diff options
| author | gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-03-12 17:38:37 +0000 |
|---|---|---|
| committer | gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-03-12 17:38:37 +0000 |
| commit | 8e6b05531b52f597810a74337e945e68e16f227f (patch) | |
| tree | 0a643d4f56dd441070dd53b51ccf96da4f48407d | |
| parent | d94cbeaa2756a08f2c979385269edd06adbb6fa1 (diff) | |
| download | ruby-8e6b05531b52f597810a74337e945e68e16f227f.tar.gz ruby-8e6b05531b52f597810a74337e945e68e16f227f.tar.xz ruby-8e6b05531b52f597810a74337e945e68e16f227f.zip | |
* ext/openssl/ossl_ssl.c (ossl_tmp_dh_callback): should get DH
parameter from the current SSL object.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@8139 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/openssl/ossl_ssl.c | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Sun Mar 13 02:32:54 2005 GOTOU Yuuzou <gotoyuzo@notwork.org> + + * ext/openssl/ossl_ssl.c (ossl_tmp_dh_callback): should get DH + parameter from the current SSL object. + Sun Mar 13 02:09:03 2005 GOTOU Yuuzou <gotoyuzo@notwork.org> * ext/openssl/ossl_pkey_dh.c (ossl_create_dh): fix typo. diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c index cd535d2b2..f494a59bb 100644 --- a/ext/openssl/ossl_ssl.c +++ b/ext/openssl/ossl_ssl.c @@ -231,7 +231,7 @@ ossl_call_tmp_dh_callback(VALUE *args) static DH* ossl_tmp_dh_callback(SSL *ssl, int is_export, int keylength) { - VALUE obj, args[3]; + VALUE args[3]; int status, success; args[0] = (VALUE)SSL_get_ex_data(ssl, ossl_ssl_ex_ptr_idx); @@ -241,7 +241,7 @@ ossl_tmp_dh_callback(SSL *ssl, int is_export, int keylength) (VALUE)args, &status); if (status || !success) return NULL; - return GetPKeyPtr(ossl_ssl_get_tmp_dh(obj))->pkey.dh; + return GetPKeyPtr(ossl_ssl_get_tmp_dh(args[0]))->pkey.dh; } static DH* |