mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* ext/openssl/ossl_ssl.c: Only show a warning if the default
DH callback is actually used. * ext/openssl/ossl_rand.c: New method: random_add(). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@14726 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
a4afe2df99
commit
55180306dd
3 changed files with 30 additions and 1 deletions
|
@ -260,6 +260,8 @@ ossl_tmp_dh_callback(SSL *ssl, int is_export, int keylength)
|
|||
static DH*
|
||||
ossl_default_tmp_dh_callback(SSL *ssl, int is_export, int keylength)
|
||||
{
|
||||
rb_warning("using default DH parameters.");
|
||||
|
||||
switch(keylength){
|
||||
case 512:
|
||||
return OSSL_DEFAULT_DH_512;
|
||||
|
@ -453,7 +455,6 @@ ossl_sslctx_setup(VALUE self)
|
|||
SSL_CTX_set_tmp_dh_callback(ctx, ossl_tmp_dh_callback);
|
||||
}
|
||||
else{
|
||||
rb_warning("using default DH parameters.");
|
||||
SSL_CTX_set_tmp_dh_callback(ctx, ossl_default_tmp_dh_callback);
|
||||
}
|
||||
#endif
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue