Merge branch '2.0' into 3.0

IT18013856 · Mar 8, 2020 · b1a1fb5 · b1a1fb5
2 parents ddd5a08 + 21c5aa3
commit b1a1fb5
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/phpseclib/Net/SSH2.php b/phpseclib/Net/SSH2.php
@@ -2046,6 +2046,15 @@ private static function bad_algorithm_candidate($algorithm)
     public function login($username, ...$args)
     {
         $this->auth[] = array_merge([$username], $args);
+
+        // try logging with 'none' as an authentication method first since that's what
+        // PuTTY does
+        if ($this->sublogin($username)) {
+            return true;
+        }
+        if (!count($args)) {
+            return false;
+        }
         return $this->sublogin($username, ...$args);
     }