diff options
author | nahi <nahi@ruby-lang.org> | 2011-09-01 07:42:29 +0000 |
---|---|---|
committer | nahi <nahi@ruby-lang.org> | 2011-09-01 07:42:29 +0000 |
commit | a585207f730b7072b3fba3872c64bba3df3a91cc (patch) | |
tree | 6ce6294f4dc52d7119a26ec46265dfad8a01133b /test | |
parent | d8d7ade891fb20a6032a2f5617aed5468fbd8db1 (diff) | |
download | ruby-openssl-history-a585207f730b7072b3fba3872c64bba3df3a91cc.tar.gz |
* 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
Diffstat (limited to 'test')
-rw-r--r-- | test/test_pkey_dh.rb | 7 | ||||
-rw-r--r-- | test/test_pkey_dsa.rb | 7 | ||||
-rw-r--r-- | test/test_pkey_rsa.rb | 7 |
3 files changed, 21 insertions, 0 deletions
diff --git a/test/test_pkey_dh.rb b/test/test_pkey_dh.rb index bcba400..79a3e0a 100644 --- a/test/test_pkey_dh.rb +++ b/test/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 diff --git a/test/test_pkey_dsa.rb b/test/test_pkey_dsa.rb index e498e3c..4bf64a5 100644 --- a/test/test_pkey_dsa.rb +++ b/test/test_pkey_dsa.rb @@ -22,6 +22,13 @@ class OpenSSL::TestPKeyDSA < Test::Unit::TestCase assert_equal([], OpenSSL.errors) end + def test_new_break + assert_nil(OpenSSL::PKey::DSA.new(512) { break }) + assert_raise(RuntimeError) do + OpenSSL::PKey::DSA.new(512) { raise } + end + end + def test_sys_sign_verify key = OpenSSL::TestUtils::TEST_KEY_DSA256 data = 'Sign me!' diff --git a/test/test_pkey_rsa.rb b/test/test_pkey_rsa.rb index 5ba1422..a7e8e22 100644 --- a/test/test_pkey_rsa.rb +++ b/test/test_pkey_rsa.rb @@ -48,6 +48,13 @@ class OpenSSL::TestPKeyRSA < Test::Unit::TestCase assert_equal([], OpenSSL.errors) end + def test_new_break + assert_nil(OpenSSL::PKey::RSA.new(1024) { break }) + assert_raise(RuntimeError) do + OpenSSL::PKey::RSA.new(1024) { raise } + end + end + def test_sign_verify key = OpenSSL::TestUtils::TEST_KEY_RSA1024 digest = OpenSSL::Digest::SHA1.new |