kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ext/openssl/ossl_ssl.c (ossl_call_tmp_dh_callback): create an array

Browse source 
and use `rb_apply` to clean up calls to `rb_protect`.

* ext/openssl/ossl_ssl.c (ossl_tmp_dh_callback): ditto

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51458 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
tenderlove 2015-07-31 18:44:12 +00:00
parent cbb45e2f4e
commit 568ba1cfdb
2 changed files with 18 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Sat Aug 1 03:43:10 2015 Aaron Patterson <tenderlove@ruby-lang.org>
* ext/openssl/ossl_ssl.c (ossl_call_tmp_dh_callback): create an array
and use `rb_apply` to clean up calls to `rb_protect`.
* ext/openssl/ossl_ssl.c (ossl_tmp_dh_callback): ditto
Sat Aug 1 03:27:12 2015 Aaron Patterson <tenderlove@ruby-lang.org> Sat Aug 1 03:27:12 2015 Aaron Patterson <tenderlove@ruby-lang.org>
* ext/openssl/ossl_ssl.c (ossl_call_tmp_ecdh_callback): The SSL socket * ext/openssl/ossl_ssl.c (ossl_call_tmp_ecdh_callback): The SSL socket

22
ext/openssl/ossl_ssl.c
View file

@ -250,19 +250,19 @@ ossl_client_cert_cb(SSL *ssl, X509 **x509, EVP_PKEY **pkey)
#if !defined(OPENSSL_NO_DH) #if !defined(OPENSSL_NO_DH)
static VALUE static VALUE
ossl_call_tmp_dh_callback(VALUE *args) ossl_call_tmp_dh_callback(VALUE args)
{ {
SSL *ssl; SSL *ssl;
VALUE cb, dh; VALUE cb, dh;
EVP_PKEY *pkey; EVP_PKEY *pkey;
GetSSL(args[0], ssl); GetSSL(rb_ary_entry(args, 0), ssl);
cb = (VALUE)SSL_get_ex_data(ssl, ossl_ssl_ex_tmp_dh_callback_idx); cb = (VALUE)SSL_get_ex_data(ssl, ossl_ssl_ex_tmp_dh_callback_idx);
if (NIL_P(cb)) return Qfalse; if (NIL_P(cb)) return Qfalse;
dh = rb_funcall(cb, rb_intern("call"), 3, args[0], args[1], args[2]); dh = rb_apply(cb, rb_intern("call"), args);
pkey = GetPKeyPtr(dh); pkey = GetPKeyPtr(dh);
if (EVP_PKEY_type(pkey->type) != EVP_PKEY_DH) return Qfalse; if (EVP_PKEY_type(pkey->type) != EVP_PKEY_DH) return Qfalse;
ossl_ssl_set_tmp_dh(args[0], dh); ossl_ssl_set_tmp_dh(rb_ary_entry(args, 0), dh);
return Qtrue; return Qtrue;
} }
@ -270,16 +270,16 @@ 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 args[3], success; VALUE args, success, rb_ssl;
args[0] = (VALUE)SSL_get_ex_data(ssl, ossl_ssl_ex_ptr_idx); rb_ssl = (VALUE)SSL_get_ex_data(ssl, ossl_ssl_ex_ptr_idx);
args[1] = INT2FIX(is_export);
args[2] = INT2FIX(keylength); args = rb_ary_new_from_args(3, rb_ssl, INT2FIX(is_export), INT2FIX(keylength));
success = rb_protect((VALUE(*)_((VALUE)))ossl_call_tmp_dh_callback,
(VALUE)args, NULL); success = rb_protect(ossl_call_tmp_dh_callback, args, NULL);
if (!RTEST(success)) return NULL; if (!RTEST(success)) return NULL;
return GetPKeyPtr(ossl_ssl_get_tmp_dh(args[0]))->pkey.dh; return GetPKeyPtr(ossl_ssl_get_tmp_dh(rb_ssl))->pkey.dh;
} }
#endif /* OPENSSL_NO_DH */ #endif /* OPENSSL_NO_DH */