octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-09-27 22:59:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into php5

Browse Source 
* master:
  SSH2: white space adjustment
  SSH: update getServerPublicHostKey() to use new _connect() method
  SSH2: fix if statement for conditional _connect() call
  simplify calls to $this->_connect()
  SSH2: make it so negotiated algorithms can be seen before login
This commit is contained in:
Andreas Fischer 2014-08-10 12:10:11 +02:00
commit 9dc92a82a4
1 changed files with 50 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
phpseclib/Net/SSH2.php
View File

@ -194,100 +194,100 @@ class Net_SSH2
* Server Identifier
*
* @see Net_SSH2::getServerIdentification()
* @var String
* @var mixed false or Array
* @access private
*/
var $server_identifier = '';
var $server_identifier = false;
/**
* Key Exchange Algorithms
*
* @see Net_SSH2::getKexAlgorithims()
* @var Array
* @var mixed false or Array
* @access private
*/
var $kex_algorithms;
var $kex_algorithms = false;
/**
* Server Host Key Algorithms
*
* @see Net_SSH2::getServerHostKeyAlgorithms()
* @var Array
* @var mixed false or Array
* @access private
*/
var $server_host_key_algorithms;
var $server_host_key_algorithms = false;
/**
* Encryption Algorithms: Client to Server
*
* @see Net_SSH2::getEncryptionAlgorithmsClient2Server()
* @var Array
* @var mixed false or Array
* @access private
*/
var $encryption_algorithms_client_to_server;
var $encryption_algorithms_client_to_server = false;
/**
* Encryption Algorithms: Server to Client
*
* @see Net_SSH2::getEncryptionAlgorithmsServer2Client()
* @var Array
* @var mixed false or Array
* @access private
*/
var $encryption_algorithms_server_to_client;
var $encryption_algorithms_server_to_client = false;
/**
* MAC Algorithms: Client to Server
*
* @see Net_SSH2::getMACAlgorithmsClient2Server()
* @var Array
* @var mixed false or Array
* @access private
*/
var $mac_algorithms_client_to_server;
var $mac_algorithms_client_to_server = false;
/**
* MAC Algorithms: Server to Client
*
* @see Net_SSH2::getMACAlgorithmsServer2Client()
* @var Array
* @var mixed false or Array
* @access private
*/
var $mac_algorithms_server_to_client;
var $mac_algorithms_server_to_client = false;
/**
* Compression Algorithms: Client to Server
*
* @see Net_SSH2::getCompressionAlgorithmsClient2Server()
* @var Array
* @var mixed false or Array
* @access private
*/
var $compression_algorithms_client_to_server;
var $compression_algorithms_client_to_server = false;
/**
* Compression Algorithms: Server to Client
*
* @see Net_SSH2::getCompressionAlgorithmsServer2Client()
* @var Array
* @var mixed false or Array
* @access private
*/
var $compression_algorithms_server_to_client;
var $compression_algorithms_server_to_client = false;
/**
* Languages: Server to Client
*
* @see Net_SSH2::getLanguagesServer2Client()
* @var Array
* @var mixed false or Array
* @access private
*/
var $languages_server_to_client;
var $languages_server_to_client = false;
/**
* Languages: Client to Server
*
* @see Net_SSH2::getLanguagesClient2Server()
* @var Array
* @var mixed false or Array
* @access private
*/
var $languages_client_to_server;
var $languages_client_to_server = false;
/**
* Block Size for Server to Client Encryption
@ -946,6 +946,12 @@ class Net_SSH2
*/
function _connect()
{
if ($this->bitmap & NET_SSH2_MASK_CONSTRUCTOR) {
return false;
}
$this->bitmap |= NET_SSH2_MASK_CONSTRUCTOR;
$timeout = $this->connectionTimeout;
$host = $this->host . ':' . $this->port;
@ -1808,7 +1814,6 @@ class Net_SSH2
function _login($username)
{
if (!($this->bitmap & NET_SSH2_MASK_CONSTRUCTOR)) {
$this->bitmap |= NET_SSH2_MASK_CONSTRUCTOR;
if (!$this->_connect()) {
return false;
}
@ -3519,6 +3524,8 @@ class Net_SSH2
*/
function getServerIdentification()
{
$this->_connect();
return $this->server_identifier;
}
@ -3530,6 +3537,8 @@ class Net_SSH2
*/
function getKexAlgorithms()
{
$this->_connect();
return $this->kex_algorithms;
}
@ -3541,6 +3550,8 @@ class Net_SSH2
*/
function getServerHostKeyAlgorithms()
{
$this->_connect();
return $this->server_host_key_algorithms;
}
@ -3552,6 +3563,8 @@ class Net_SSH2
*/
function getEncryptionAlgorithmsClient2Server()
{
$this->_connect();
return $this->encryption_algorithms_client_to_server;
}
@ -3563,6 +3576,8 @@ class Net_SSH2
*/
function getEncryptionAlgorithmsServer2Client()
{
$this->_connect();
return $this->encryption_algorithms_server_to_client;
}
@ -3574,6 +3589,8 @@ class Net_SSH2
*/
function getMACAlgorithmsClient2Server()
{
$this->_connect();
return $this->mac_algorithms_client_to_server;
}
@ -3585,6 +3602,8 @@ class Net_SSH2
*/
function getMACAlgorithmsServer2Client()
{
$this->_connect();
return $this->mac_algorithms_server_to_client;
}
@ -3596,6 +3615,8 @@ class Net_SSH2
*/
function getCompressionAlgorithmsClient2Server()
{
$this->_connect();
return $this->compression_algorithms_client_to_server;
}
@ -3607,6 +3628,8 @@ class Net_SSH2
*/
function getCompressionAlgorithmsServer2Client()
{
$this->_connect();
return $this->compression_algorithms_server_to_client;
}
@ -3618,6 +3641,8 @@ class Net_SSH2
*/
function getLanguagesServer2Client()
{
$this->_connect();
return $this->languages_server_to_client;
}
@ -3629,6 +3654,8 @@ class Net_SSH2
*/
function getLanguagesClient2Server()
{
$this->_connect();
return $this->languages_client_to_server;
}
@ -3658,7 +3685,6 @@ class Net_SSH2
function getServerPublicHostKey()
{
if (!($this->bitmap & NET_SSH2_MASK_CONSTRUCTOR)) {
$this->bitmap |= NET_SSH2_MASK_CONSTRUCTOR;
if (!$this->_connect()) {
return false;
}