mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* ext/openssl/openssl_missing.h (i2d_of_void): cast for callbacks.
[ruby-core:22860] * ext/openssl/ossl_engine.c (ossl_engine_s_by_id): suppress a warning. * ext/openssl/ossl_ssl.c (ossl_sslctx_flush_sessions): time_t may be larger than long. * ext/openssl/ossl_ssl_session.c (ossl_ssl_session_get_time), (ossl_ssl_session_get_timeout): use TIMET2NUM() to convert time_t. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22925 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
9300355bec
commit
1f46af14e4
6 changed files with 30 additions and 12 deletions
|
@ -119,7 +119,7 @@ ossl_engine_s_by_id(VALUE klass, VALUE id)
|
|||
if(!ENGINE_init(e))
|
||||
ossl_raise(eEngineError, NULL);
|
||||
ENGINE_ctrl(e, ENGINE_CTRL_SET_PASSWORD_CALLBACK,
|
||||
0, NULL, (void(*)())ossl_pem_passwd_cb);
|
||||
0, NULL, (void(*)(void))ossl_pem_passwd_cb);
|
||||
ERR_clear_error();
|
||||
|
||||
return obj;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue