mirror of
https://github.com/danog/phpseclib.git
synced 2024-12-14 18:15:39 +01:00
Merge branch '3.0'
This commit is contained in:
commit
45d07d336f
@ -70,6 +70,7 @@ use phpseclib3\Exception\ConnectionClosedException;
|
|||||||
use phpseclib3\Exception\UnableToConnectException;
|
use phpseclib3\Exception\UnableToConnectException;
|
||||||
use phpseclib3\Exception\InsufficientSetupException;
|
use phpseclib3\Exception\InsufficientSetupException;
|
||||||
use phpseclib3\Common\Functions\Strings;
|
use phpseclib3\Common\Functions\Strings;
|
||||||
|
use phpseclib3\Crypt\Common\AsymmetricKey;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Pure-PHP implementation of SSHv2.
|
* Pure-PHP implementation of SSHv2.
|
||||||
@ -2050,10 +2051,10 @@ class SSH2
|
|||||||
/**
|
/**
|
||||||
* Login
|
* Login
|
||||||
*
|
*
|
||||||
* The $password parameter can be a plaintext password, a \phpseclib3\Crypt\RSA object or an array
|
* The $password parameter can be a plaintext password, a \phpseclib3\Crypt\RSA|EC|DSA object, a \phpseclib3\System\SSH\Agent object or an array
|
||||||
*
|
*
|
||||||
* @param string $username
|
* @param string $username
|
||||||
* @param string[] ...$args
|
* @param string|AsymmetricKey|array[]|Agent|null ...$args
|
||||||
* @return bool
|
* @return bool
|
||||||
* @see self::_login()
|
* @see self::_login()
|
||||||
* @access public
|
* @access public
|
||||||
@ -2111,7 +2112,7 @@ class SSH2
|
|||||||
* by sending dummy SSH_MSG_IGNORE messages.}
|
* by sending dummy SSH_MSG_IGNORE messages.}
|
||||||
*
|
*
|
||||||
* @param string $username
|
* @param string $username
|
||||||
* @param string $password
|
* @param string|AsymmetricKey|array[]|Agent|null ...$args
|
||||||
* @return bool
|
* @return bool
|
||||||
* @throws \UnexpectedValueException on receipt of unexpected packets
|
* @throws \UnexpectedValueException on receipt of unexpected packets
|
||||||
* @throws \RuntimeException on other errors
|
* @throws \RuntimeException on other errors
|
||||||
@ -2592,7 +2593,7 @@ class SSH2
|
|||||||
* In all likelihood, this is not a feature you want to be taking advantage of.
|
* In all likelihood, this is not a feature you want to be taking advantage of.
|
||||||
*
|
*
|
||||||
* @param string $command
|
* @param string $command
|
||||||
* @param Callback $callback
|
* @param callback $callback
|
||||||
* @return string
|
* @return string
|
||||||
* @throws \RuntimeException on connection error
|
* @throws \RuntimeException on connection error
|
||||||
* @access public
|
* @access public
|
||||||
|
Loading…
Reference in New Issue
Block a user