Rev 1439 | Rev 1448 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 1439 | Rev 1441 | ||
|---|---|---|---|
| Line 1534... | Line 1534... | ||
| 1534 | SSH2::getSupportedCompressionAlgorithms(); |
1534 | SSH2::getSupportedCompressionAlgorithms(); |
| 1535 | $c2s_compression_algorithms = isset($preferred['client_to_server']['comp']) ? |
1535 | $c2s_compression_algorithms = isset($preferred['client_to_server']['comp']) ? |
| 1536 | $preferred['client_to_server']['comp'] : |
1536 | $preferred['client_to_server']['comp'] : |
| 1537 | SSH2::getSupportedCompressionAlgorithms(); |
1537 | SSH2::getSupportedCompressionAlgorithms(); |
| 1538 | 1538 | ||
| 1539 | $kex_algorithms = array_merge($kex_algorithms, array('ext-info-c')); |
1539 | $kex_algorithms = array_merge($kex_algorithms, ['ext-info-c']); |
| 1540 | 1540 | ||
| 1541 | // some SSH servers have buggy implementations of some of the above algorithms |
1541 | // some SSH servers have buggy implementations of some of the above algorithms |
| 1542 | switch (true) { |
1542 | switch (true) { |
| 1543 | case $this->server_identifier == 'SSH-2.0-SSHD': |
1543 | case $this->server_identifier == 'SSH-2.0-SSHD': |
| 1544 | case substr($this->server_identifier, 0, 13) == 'SSH-2.0-DLINK': |
1544 | case substr($this->server_identifier, 0, 13) == 'SSH-2.0-DLINK': |
| Line 2191... | Line 2191... | ||
| 2191 | * @return bool |
2191 | * @return bool |
| 2192 | * @see self::_login() |
2192 | * @see self::_login() |
| 2193 | */ |
2193 | */ |
| 2194 | public function login($username, ...$args) |
2194 | public function login($username, ...$args) |
| 2195 | { |
2195 | { |
| - | 2196 | if (!$this->retry_connect) { |
|
| 2196 | $this->auth[] = func_get_args(); |
2197 | $this->auth[] = func_get_args(); |
| - | 2198 | } |
|
| 2197 | 2199 | ||
| 2198 | // try logging with 'none' as an authentication method first since that's what |
2200 | // try logging with 'none' as an authentication method first since that's what |
| 2199 | // PuTTY does |
2201 | // PuTTY does |
| 2200 | if (substr($this->server_identifier, 0, 15) != 'SSH-2.0-CoreFTP' && $this->auth_methods_to_continue === null) { |
2202 | if (substr($this->server_identifier, 0, 15) != 'SSH-2.0-CoreFTP' && $this->auth_methods_to_continue === null) { |
| 2201 | if ($this->sublogin($username)) { |
2203 | if ($this->sublogin($username)) { |