From d3507e3ea697be7aab4e9344c379d6b277cf81cf Mon Sep 17 00:00:00 2001 From: nahi Date: Thu, 1 Sep 2011 07:42:29 +0000 Subject: * Release GVL while OpenSSL's public key generation. t = Thread.new { print "."; sleep 0.1 } key = OpenSSL::PKey::RSA.new(2048) #=> Thread t works in parallel with public key generation if OS/machine allows it. This works with OpenSSL >= 0.9.8. From this version, it has new public key generation function which allows us to interrupt the execution while pkey generation iterations. * ext/openssl/extconf.rb: Check existence of OpenSSL's new public key generation function. (DH_generate_parameters_ex, DSA_generate_parameters_ex and RSA_generate_key_ex. * ext/openssl/ossl_pkey.{h,c} (ossl_generate_cb_2, ossl_generate_cb_stop): Added new callback function for OpenSSL pkey generation which handles Thread interruption by Ruby. ossl_generate_cb_stop is the unblock function(ubf) for Ruby which sets a stop flag. New pkey generation callback ossl_generate_cb_2 checks the stop flag at each iterations of OpenSSL and interrupts pkey generation when the flag is set. * ext/openssl/ossl_pkey_dsa.c (dsa_generate): Call rb_thread_blocking_region with the above unblock function to release GVL while pkey generation. * ext/openssl/ossl_pkey_rsa.c (rsa_generate): ditto. * ext/openssl/ossl_pkey_dh.c (dh_generate): ditto. * test/openssl/test_pkey_{dh,dsa,rsa}.rb: Test it. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33155 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/openssl/test_pkey_dh.rb | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'test/openssl/test_pkey_dh.rb') diff --git a/test/openssl/test_pkey_dh.rb b/test/openssl/test_pkey_dh.rb index bcba400efe..79a3e0a92c 100644 --- a/test/openssl/test_pkey_dh.rb +++ b/test/openssl/test_pkey_dh.rb @@ -8,6 +8,13 @@ class OpenSSL::TestPKeyDH < Test::Unit::TestCase assert_key(dh) end + def test_new_break + assert_nil(OpenSSL::PKey::DH.new(256) { break }) + assert_raises(RuntimeError) do + OpenSSL::PKey::DH.new(256) { raise } + end + end + def test_to_der dh = OpenSSL::PKey::DH.new(256) der = dh.to_der -- cgit v1.2.3