ruby-changes:21801
From: emboss <ko1@a...>
Date: Sat, 26 Nov 2011 23:05:06 +0900 (JST)
Subject: [ruby-changes:21801] emboss:r33850 (trunk): * test/openssl/test_engine.rb: remove side effect of generic engine
emboss 2011-11-26 23:04:52 +0900 (Sat, 26 Nov 2011) New Revision: 33850 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=33850 Log: * test/openssl/test_engine.rb: remove side effect of generic engine load by explicitly loading software-based "openssl" engine for all tests. Modified files: trunk/ChangeLog trunk/test/openssl/test_engine.rb Index: ChangeLog =================================================================== --- ChangeLog (revision 33849) +++ ChangeLog (revision 33850) @@ -1,3 +1,9 @@ +Sat Nov 26 23:01:38 2011 Martin Bosslet <Martin.Bosslet@g...> + + * test/openssl/test_engine.rb: remove side effect of generic engine + load by explicitly loading software-based "openssl" engine for + all tests. + Sat Nov 26 20:41:48 2011 NARUSE, Yui <naruse@r...> * lib/net/http.rb (Net::HTTP.get_response): enable use_ssl Index: test/openssl/test_engine.rb =================================================================== --- test/openssl/test_engine.rb (revision 33849) +++ test/openssl/test_engine.rb (revision 33850) @@ -2,46 +2,46 @@ class OpenSSL::TestEngine < Test::Unit::TestCase + def teardown + OpenSSL::Engine.cleanup # [ruby-core:40669] + assert_equal(0, OpenSSL::Engine.engines.size) + end + def test_engines_free # [ruby-dev:44173] - OpenSSL::Engine.load + OpenSSL::Engine.load("openssl") OpenSSL::Engine.engines OpenSSL::Engine.engines - OpenSSL::Engine.cleanup # [ruby-core:40669] end def test_openssl_engine_builtin engine = OpenSSL::Engine.load("openssl") assert_equal(true, engine) assert_equal(1, OpenSSL::Engine.engines.size) - cleanup end def test_openssl_engine_by_id_string - engine = OpenSSL::Engine.by_id("openssl") + engine = get_engine assert_not_nil(engine) assert_equal(1, OpenSSL::Engine.engines.size) - cleanup end def test_openssl_engine_id_name_inspect - engine = OpenSSL::Engine.by_id("openssl") + engine = get_engine assert_equal("openssl", engine.id) assert_not_nil(engine.name) assert_not_nil(engine.inspect) - cleanup end def test_openssl_engine_digest_sha1 - engine = OpenSSL::Engine.by_id("openssl") + engine = get_engine digest = engine.digest("SHA1") assert_not_nil(digest) data = "test" assert_equal(OpenSSL::Digest::SHA1.digest(data), digest.digest(data)) - cleanup end def test_openssl_engine_cipher_rc4 - engine = OpenSSL::Engine.by_id("openssl") + engine = get_engine algo = "RC4" #AES is not supported by openssl Engine (<=1.0.0e) data = "a" * 1000 key = OpenSSL::Random.random_bytes(16) @@ -51,7 +51,6 @@ encrypted = crypt_data(data, key, :encrypt) { engine.cipher(algo) } decrypted = crypt_data(encrypted, key, :decrypt) { OpenSSL::Cipher.new(algo) } assert_equal(data, decrypted) - cleanup ensure if err_back $stderr.reopen(err_back) @@ -61,6 +60,10 @@ private + def get_engine + OpenSSL::Engine.by_id("openssl") + end + def crypt_data(data, key, mode) cipher = yield cipher.send mode @@ -68,10 +71,5 @@ cipher.update(data) + cipher.final end - def cleanup - OpenSSL::Engine.cleanup - assert_equal(0, OpenSSL::Engine.engines.size) - end - end if defined?(OpenSSL) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/