mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* 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
This commit is contained in:
parent
a59c198a12
commit
7ff4c7c70a
2 changed files with 7 additions and 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>
|
Sun Mar 13 02:09:03 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
|
||||||
|
|
||||||
* ext/openssl/ossl_pkey_dh.c (ossl_create_dh): fix typo.
|
* ext/openssl/ossl_pkey_dh.c (ossl_create_dh): fix typo.
|
||||||
|
|
|
@ -231,7 +231,7 @@ ossl_call_tmp_dh_callback(VALUE *args)
|
||||||
static DH*
|
static DH*
|
||||||
ossl_tmp_dh_callback(SSL *ssl, int is_export, int keylength)
|
ossl_tmp_dh_callback(SSL *ssl, int is_export, int keylength)
|
||||||
{
|
{
|
||||||
VALUE obj, args[3];
|
VALUE args[3];
|
||||||
int status, success;
|
int status, success;
|
||||||
|
|
||||||
args[0] = (VALUE)SSL_get_ex_data(ssl, ossl_ssl_ex_ptr_idx);
|
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);
|
(VALUE)args, &status);
|
||||||
if (status || !success) return NULL;
|
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*
|
static DH*
|
||||||
|
|
Loading…
Reference in a new issue