diff options
| author | Ryosuke Yamazaki <ryosuke.yamazaki@mac.com> | 2011-12-15 17:44:38 +0900 |
|---|---|---|
| committer | Ryosuke Yamazaki <ryosuke.yamazaki@mac.com> | 2011-12-15 17:44:38 +0900 |
| commit | afbc2e42a09e51c9b7c52a4bc9fa744326143932 (patch) | |
| tree | b34ad020bde7b6350881af0e1131ceb091e24b94 /lib | |
| parent | b94c9f88f57a834d08f73268cbe805696caaf65c (diff) | |
| download | net-ssh-afbc2e42a09e51c9b7c52a4bc9fa744326143932.tar.gz | |
add tests (arcfour{128,256,512} and hmac-sha2-*)
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/net/ssh/transport/algorithms.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/net/ssh/transport/algorithms.rb b/lib/net/ssh/transport/algorithms.rb index 004a82b..13af77c 100644 --- a/lib/net/ssh/transport/algorithms.rb +++ b/lib/net/ssh/transport/algorithms.rb @@ -347,10 +347,9 @@ module Net; module SSH; module Transport mac_key_client = key["E"] mac_key_server = key["F"] - parameters = { :iv => iv_client, :key => key_client, :shared => secret, - :hash => hash, :digester => digester } + parameters = { :shared => secret, :hash => hash, :digester => digester } - cipher_client = CipherFactory.get(encryption_client, parameters.merge(:encrypt => true)) + cipher_client = CipherFactory.get(encryption_client, parameters.merge(:iv => iv_client, :key => key_client, :encrypt => true)) cipher_server = CipherFactory.get(encryption_server, parameters.merge(:iv => iv_server, :key => key_server, :decrypt => true)) mac_client = HMAC.get(hmac_client, mac_key_client, parameters) |