Merge branch '1.0' into 2.0

This commit is contained in:
terrafrost 2017-06-12 22:36:58 -05:00
commit 9d0c924cbd

View File

@ -1287,8 +1287,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,
array('hmac-sha1-96', 'hmac-md5-96')