From 42643e482e1c58cd353d88d0c317d091df80cd3d Mon Sep 17 00:00:00 2001 From: technorama Date: Tue, 25 Dec 2007 11:31:51 +0000 Subject: * 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/trunk@14696 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/openssl/ossl_ssl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'ext/openssl/ossl_ssl.c') diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c index c345a3fdc7..7b2620e4b2 100644 --- a/ext/openssl/ossl_ssl.c +++ b/ext/openssl/ossl_ssl.c @@ -270,6 +270,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; @@ -463,7 +465,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 -- cgit v1.2.3