From 7ff4c7c70a4c97b8460cb1e8b75a243cc4a9d986 Mon Sep 17 00:00:00 2001 From: gotoyuzo Date: Sat, 12 Mar 2005 17:38:37 +0000 Subject: [PATCH] * ext/openssl/ossl_ssl.c (ossl_tmp_dh_callback): should get DH parameter from the current SSL object. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8139 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ext/openssl/ossl_ssl.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6ec65d0b47..6504c6deae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Mar 13 02:32:54 2005 GOTOU Yuuzou + + * 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 * 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 cd535d2b21..f494a59bbe 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*