* test/openssl/test_engine.rb: remove side effect of generic engine

load by explicitly loading software-based "openssl" engine for
  all tests.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33850 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
emboss 2011-11-26 14:04:52 +00:00
parent 708d76a3b1
commit 0f59228a0b
2 changed files with 22 additions and 18 deletions

View File

@ -1,3 +1,9 @@
Sat Nov 26 23:01:38 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
* 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@ruby-lang.org> Sat Nov 26 20:41:48 2011 NARUSE, Yui <naruse@ruby-lang.org>
* lib/net/http.rb (Net::HTTP.get_response): enable use_ssl * lib/net/http.rb (Net::HTTP.get_response): enable use_ssl

View File

@ -2,46 +2,46 @@ require_relative 'utils'
class OpenSSL::TestEngine < Test::Unit::TestCase class OpenSSL::TestEngine < Test::Unit::TestCase
def test_engines_free # [ruby-dev:44173] def teardown
OpenSSL::Engine.load
OpenSSL::Engine.engines
OpenSSL::Engine.engines
OpenSSL::Engine.cleanup # [ruby-core:40669] 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")
OpenSSL::Engine.engines
OpenSSL::Engine.engines
end end
def test_openssl_engine_builtin def test_openssl_engine_builtin
engine = OpenSSL::Engine.load("openssl") engine = OpenSSL::Engine.load("openssl")
assert_equal(true, engine) assert_equal(true, engine)
assert_equal(1, OpenSSL::Engine.engines.size) assert_equal(1, OpenSSL::Engine.engines.size)
cleanup
end end
def test_openssl_engine_by_id_string def test_openssl_engine_by_id_string
engine = OpenSSL::Engine.by_id("openssl") engine = get_engine
assert_not_nil(engine) assert_not_nil(engine)
assert_equal(1, OpenSSL::Engine.engines.size) assert_equal(1, OpenSSL::Engine.engines.size)
cleanup
end end
def test_openssl_engine_id_name_inspect def test_openssl_engine_id_name_inspect
engine = OpenSSL::Engine.by_id("openssl") engine = get_engine
assert_equal("openssl", engine.id) assert_equal("openssl", engine.id)
assert_not_nil(engine.name) assert_not_nil(engine.name)
assert_not_nil(engine.inspect) assert_not_nil(engine.inspect)
cleanup
end end
def test_openssl_engine_digest_sha1 def test_openssl_engine_digest_sha1
engine = OpenSSL::Engine.by_id("openssl") engine = get_engine
digest = engine.digest("SHA1") digest = engine.digest("SHA1")
assert_not_nil(digest) assert_not_nil(digest)
data = "test" data = "test"
assert_equal(OpenSSL::Digest::SHA1.digest(data), digest.digest(data)) assert_equal(OpenSSL::Digest::SHA1.digest(data), digest.digest(data))
cleanup
end end
def test_openssl_engine_cipher_rc4 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) algo = "RC4" #AES is not supported by openssl Engine (<=1.0.0e)
data = "a" * 1000 data = "a" * 1000
key = OpenSSL::Random.random_bytes(16) key = OpenSSL::Random.random_bytes(16)
@ -51,7 +51,6 @@ class OpenSSL::TestEngine < Test::Unit::TestCase
encrypted = crypt_data(data, key, :encrypt) { engine.cipher(algo) } encrypted = crypt_data(data, key, :encrypt) { engine.cipher(algo) }
decrypted = crypt_data(encrypted, key, :decrypt) { OpenSSL::Cipher.new(algo) } decrypted = crypt_data(encrypted, key, :decrypt) { OpenSSL::Cipher.new(algo) }
assert_equal(data, decrypted) assert_equal(data, decrypted)
cleanup
ensure ensure
if err_back if err_back
$stderr.reopen(err_back) $stderr.reopen(err_back)
@ -61,6 +60,10 @@ class OpenSSL::TestEngine < Test::Unit::TestCase
private private
def get_engine
OpenSSL::Engine.by_id("openssl")
end
def crypt_data(data, key, mode) def crypt_data(data, key, mode)
cipher = yield cipher = yield
cipher.send mode cipher.send mode
@ -68,10 +71,5 @@ class OpenSSL::TestEngine < Test::Unit::TestCase
cipher.update(data) + cipher.final cipher.update(data) + cipher.final
end end
def cleanup
OpenSSL::Engine.cleanup
assert_equal(0, OpenSSL::Engine.engines.size)
end
end if defined?(OpenSSL) end if defined?(OpenSSL)