octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-06-16 07:12:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Un-qualifying global functions

Browse Source 
Un-qualifying global functions
This commit is contained in:
Jack Worman 2022-01-29 19:56:43 -06:00 committed by terrafrost
parent e3b71763ae
commit 0a9fc99dc8
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpseclib/Crypt/Random.php
View File

@ -51,7 +51,7 @@ abstract class Random
} }
try { try {
return \random_bytes($length); return random_bytes($length);
} catch (\Exception $e) { } catch (\Exception $e) {
// random_compat will throw an Exception, which in PHP 5 does not implement Throwable // random_compat will throw an Exception, which in PHP 5 does not implement Throwable
} catch (\Throwable $e) { } catch (\Throwable $e) {

12
phpseclib/Net/SSH2.php
View File

@ -1204,7 +1204,7 @@ class SSH2
* Typehint is required due to a bug in Psalm: https://github.com/vimeo/psalm/issues/7508 * Typehint is required due to a bug in Psalm: https://github.com/vimeo/psalm/issues/7508
* @var \WeakReference<SSH2>|SSH2 * @var \WeakReference<SSH2>|SSH2
*/ */
self::$connections[$this->getResourceId()] = \class_exists('WeakReference') self::$connections[$this->getResourceId()] = class_exists('WeakReference')
? \WeakReference::create($this) ? \WeakReference::create($this)
: $this; : $this;
@ -1417,7 +1417,7 @@ class SSH2
if (!$this->send_kex_first) { if (!$this->send_kex_first) {
$response = $this->get_binary_packet(); $response = $this->get_binary_packet();
if (\is_bool($response) || !strlen($response) || ord($response[0]) != NET_SSH2_MSG_KEXINIT) { if (is_bool($response) || !strlen($response) || ord($response[0]) != NET_SSH2_MSG_KEXINIT) {
$this->bitmap = 0; $this->bitmap = 0;
throw new \UnexpectedValueException('Expected SSH_MSG_KEXINIT'); throw new \UnexpectedValueException('Expected SSH_MSG_KEXINIT');
} }
@ -1553,7 +1553,7 @@ class SSH2
$kexinit_payload_server = $this->get_binary_packet(); $kexinit_payload_server = $this->get_binary_packet();
if ( if (
\is_bool($kexinit_payload_server) is_bool($kexinit_payload_server)
|| !strlen($kexinit_payload_server) || !strlen($kexinit_payload_server)
|| ord($kexinit_payload_server[0]) != NET_SSH2_MSG_KEXINIT || ord($kexinit_payload_server[0]) != NET_SSH2_MSG_KEXINIT
) { ) {
@ -3306,7 +3306,7 @@ class SSH2
private function get_binary_packet($skip_channel_filter = false) private function get_binary_packet($skip_channel_filter = false)
{ {
if ($skip_channel_filter) { if ($skip_channel_filter) {
if (!\is_resource($this->fsock)) { if (!is_resource($this->fsock)) {
throw new \InvalidArgumentException('fsock is not a resource.'); throw new \InvalidArgumentException('fsock is not a resource.');
} }
$read = [$this->fsock]; $read = [$this->fsock];
@ -3634,7 +3634,7 @@ class SSH2
} }
// see http://tools.ietf.org/html/rfc4252#section-5.4; only called when the encryption has been activated and when we haven't already logged in // see http://tools.ietf.org/html/rfc4252#section-5.4; only called when the encryption has been activated and when we haven't already logged in
if (($this->bitmap & self::MASK_CONNECTED) && !$this->isAuthenticated() && !\is_bool($payload) && ord($payload[0]) == NET_SSH2_MSG_USERAUTH_BANNER) { if (($this->bitmap & self::MASK_CONNECTED) && !$this->isAuthenticated() && !is_bool($payload) && ord($payload[0]) == NET_SSH2_MSG_USERAUTH_BANNER) {
Strings::shift($payload, 1); Strings::shift($payload, 1);
list($this->banner_message) = Strings::unpackSSH2('s', $payload); list($this->banner_message) = Strings::unpackSSH2('s', $payload);
$payload = $this->get_binary_packet(); $payload = $this->get_binary_packet();
@ -3642,7 +3642,7 @@ class SSH2
// only called when we've already logged in // only called when we've already logged in
if (($this->bitmap & self::MASK_CONNECTED) && $this->isAuthenticated()) { if (($this->bitmap & self::MASK_CONNECTED) && $this->isAuthenticated()) {
if (\is_bool($payload)) { if (is_bool($payload)) {
return $payload; return $payload;
} }