1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* test/openssl/test_engine.rb: Suppress output from 'openssl'

Browse Source 
engine's RC4 cipher.
  [Bug #5633] [ruby-core:41026]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33825 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
emboss 2011-11-24 01:09:55 +00:00
parent 5c7e691e5d
commit 452b74c106
2 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Thu Nov 24 10:05:02 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
* test/openssl/test_engine.rb: Suppress output from 'openssl'
engine's RC4 cipher.
[Bug #5633] [ruby-core:41026]
Thu Nov 24 08:05:02 2011 Martin Bosslet <Martin.Bosslet@googlemail.com> Thu Nov 24 08:05:02 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
* ext/openssl/ossl_pkey_dsa.c: remove redundant colon from error * ext/openssl/ossl_pkey_dsa.c: remove redundant colon from error

28
test/openssl/test_engine.rb
View File

@ -45,27 +45,29 @@ class OpenSSL::TestEngine < Test::Unit::TestCase
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)
# suppress message from openssl Engine's RC4 cipher [ruby-core:41026]
encipher = engine.cipher(algo) err_back = $stderr.dup
encipher.encrypt $stderr.reopen(IO::NULL)
encipher.key = key encrypted = crypt_data(data, key, :encrypt) { engine.cipher(algo) }
decrypted = crypt_data(encrypted, key, :decrypt) { OpenSSL::Cipher.new(algo) }
decipher = OpenSSL::Cipher.new(algo)
decipher.decrypt
decipher.key = key
encrypted = encipher.update(data) + encipher.final
decrypted = decipher.update(encrypted) + decipher.final
assert_equal(data, decrypted) assert_equal(data, decrypted)
cleanup cleanup
ensure
$stderr = err_back if err_back
end end
private private
def crypt_data(data, key, mode)
cipher = yield
cipher.send mode
cipher.key = key
cipher.update(data) + cipher.final
end
def cleanup def cleanup
OpenSSL::Engine.cleanup OpenSSL::Engine.cleanup
assert_equal(0, OpenSSL::Engine::engines.size) assert_equal(0, OpenSSL::Engine.engines.size)
end end
end if defined?(OpenSSL) end if defined?(OpenSSL)