mirror of
https://github.com/phpseclib/phpseclib.git
synced 2024-11-16 02:07:09 +00:00
Merge branch 'master' into php5
* master: SSH2: make $mac_algorithms non-static
This commit is contained in:
commit
14ba37c539
@ -1137,7 +1137,7 @@ class Net_SSH2
|
|||||||
$encryption_algorithms = array_values($encryption_algorithms);
|
$encryption_algorithms = array_values($encryption_algorithms);
|
||||||
}
|
}
|
||||||
|
|
||||||
static $mac_algorithms = array(
|
$mac_algorithms = array(
|
||||||
'hmac-sha1-96', // RECOMMENDED first 96 bits of HMAC-SHA1 (digest length = 12, key length = 20)
|
'hmac-sha1-96', // RECOMMENDED first 96 bits of HMAC-SHA1 (digest length = 12, key length = 20)
|
||||||
'hmac-sha1', // REQUIRED HMAC-SHA1 (digest length = key length = 20)
|
'hmac-sha1', // REQUIRED HMAC-SHA1 (digest length = key length = 20)
|
||||||
'hmac-md5-96', // OPTIONAL first 96 bits of HMAC-MD5 (digest length = 12, key length = 16)
|
'hmac-md5-96', // OPTIONAL first 96 bits of HMAC-MD5 (digest length = 12, key length = 16)
|
||||||
|
Loading…
Reference in New Issue
Block a user