Merge branch '1.0' of https://github.com/phpseclib/phpseclib into 1.0

phpseclib · Jan 16, 2021 · 5bddb7b · 5bddb7b
2 parents e5a226f + 7f1b53f
commit 5bddb7b
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/phpseclib/Net/SSH2.php b/phpseclib/Net/SSH2.php
@@ -2649,6 +2649,13 @@ function _privatekey_login($username, $privatekey)
                 // we'll just take it on faith that the public key blob and the public key algorithm name are as
                 // they should be
                 $this->_updateLogHistory('UNKNOWN (60)', 'NET_SSH2_MSG_USERAUTH_PK_OK');
+                break;
+            case NET_SSH2_MSG_USERAUTH_SUCCESS:
+                $this->bitmap |= NET_SSH2_MASK_LOGIN;
+                return true;
+            default:
+                user_error('Unexpected response to publickey authentication pt 1');
+                return $this->_disconnect(NET_SSH2_DISCONNECT_BY_APPLICATION);
         }
 
         $packet = $part1 . chr(1) . $part2;
@@ -2683,7 +2690,8 @@ function _privatekey_login($username, $privatekey)
                 return true;
         }
 
-        return false;
+        user_error('Unexpected response to publickey authentication pt 2');
+        return $this->_disconnect(NET_SSH2_DISCONNECT_BY_APPLICATION);
     }
 
     /**