Merge branch '1.0' into 2.0

phpseclib · Jun 13, 2017 · 9d0c924 · 9d0c924
2 parents 53acccd + 4d36e67
commit 9d0c924
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/phpseclib/Net/SSH2.php b/phpseclib/Net/SSH2.php
@@ -1287,8 +1287,9 @@ function _key_exchange($kexinit_payload_server)
         );
 
         // 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')