octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2025-01-15 03:03:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

SSH2: Twofish typos

Browse Source
This commit is contained in:
terrafrost 2013-05-04 13:55:51 -05:00
parent 2c43e9151c
commit 5dda3a088f
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
phpseclib/Net/SSH2.php
View File

@ -973,7 +973,6 @@ class Net_SSH2 {
); );
static $encryption_algorithms = array( static $encryption_algorithms = array(
/*
// from <http://tools.ietf.org/html/rfc4345#section-4>: // from <http://tools.ietf.org/html/rfc4345#section-4>:
'arcfour256', 'arcfour256',
'arcfour128', 'arcfour128',
@ -992,7 +991,6 @@ class Net_SSH2 {
'aes128-cbc', // RECOMMENDED AES with a 128-bit key 'aes128-cbc', // RECOMMENDED AES with a 128-bit key
'aes192-cbc', // OPTIONAL AES with a 192-bit key 'aes192-cbc', // OPTIONAL AES with a 192-bit key
'aes256-cbc', // OPTIONAL AES in CBC mode, with a 256-bit key 'aes256-cbc', // OPTIONAL AES in CBC mode, with a 256-bit key
*/
'twofish128-cbc', // OPTIONAL Twofish with a 128-bit key 'twofish128-cbc', // OPTIONAL Twofish with a 128-bit key
'twofish192-cbc', // OPTIONAL Twofish with a 192-bit key 'twofish192-cbc', // OPTIONAL Twofish with a 192-bit key
@ -1149,25 +1147,25 @@ class Net_SSH2 {
switch ($encrypt) { switch ($encrypt) {
case '3des-cbc': case '3des-cbc':
case '3des-ctr': case '3des-ctr':
case 'twofish-cbc':
case 'twofish256-cbc':
case 'twofish256-ctr':
$encryptKeyLength = 24; $encryptKeyLength = 24;
break; break;
case 'aes256-cbc': case 'aes256-cbc':
case 'aes256-ctr': case 'aes256-ctr':
case 'twofish192-cbc': case 'twofish-cbc':
case 'twofish192-ctr': case 'twofish256-cbc':
case 'twofish256-ctr':
$encryptKeyLength = 32; $encryptKeyLength = 32;
break; break;
case 'aes192-cbc': case 'aes192-cbc':
case 'aes192-ctr': case 'aes192-ctr':
case 'twofish128-cbc': case 'twofish192-cbc':
case 'twofish128-ctr': case 'twofish192-ctr':
$encryptKeyLength = 24; $encryptKeyLength = 24;
break; break;
case 'aes128-cbc': case 'aes128-cbc':
case 'aes128-ctr': case 'aes128-ctr':
case 'twofish128-cbc':
case 'twofish128-ctr':
$encryptKeyLength = 16; $encryptKeyLength = 16;
break; break;
case 'arcfour': case 'arcfour':
@ -1293,7 +1291,7 @@ class Net_SSH2 {
} }
if ($public_key_format != $server_host_key_algorithms[$i] || $this->signature_format != $server_host_key_algorithms[$i]) { if ($public_key_format != $server_host_key_algorithms[$i] || $this->signature_format != $server_host_key_algorithms[$i]) {
user_error('Sever Host Key Algorithm Mismatch'); user_error('Server Host Key Algorithm Mismatch');
return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED); return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
} }
@ -1345,7 +1343,7 @@ class Net_SSH2 {
case 'twofish256-cbc': case 'twofish256-cbc':
case 'twofish-cbc': case 'twofish-cbc':
$this->encrypt = new Crypt_Twofish(); $this->encrypt = new Crypt_Twofish();
$this->decrypt_block_size = 16; $this->encrypt_block_size = 16;
break; break;
case 'twofish128-ctr': case 'twofish128-ctr':
case 'twofish192-ctr': case 'twofish192-ctr':