Merge branch '2.0'

This commit is contained in:
terrafrost 2017-06-12 22:37:06 -05:00
commit 8ea3edf0d2

View File

@ -1301,8 +1301,9 @@ class SSH2
];
// some SSH servers have buggy implementations of some of the above algorithms
switch ($this->server_identifier) {
case 'SSH-2.0-SSHD':
switch (true) {
case $this->server_identifier == 'SSH-2.0-SSHD':
case substr($this->server_identifier, 0, 13) == 'SSH-2.0-DLINK':
$mac_algorithms = array_values(array_diff(
$mac_algorithms,
['hmac-sha1-96', 'hmac-md5-96']