octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-12-27 03:42:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update a few comments

Browse Source
This commit is contained in:
terrafrost 2012-09-03 01:42:50 -05:00
parent a3781bd172
commit 26776b486e
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
phpseclib/Crypt/RSA.php
View File

@ -217,9 +217,9 @@ define('CRYPT_RSA_PRIVATE_FORMAT_XML', 2);
*/ */
define('CRYPT_RSA_PUBLIC_FORMAT_RAW', 3); define('CRYPT_RSA_PUBLIC_FORMAT_RAW', 3);
/** /**
* PKCS#1 formatted public key * PKCS#1 formatted public key (raw)
* *
* Used by X.509 certificates * Used by File/X509.php
*/ */
define('CRYPT_RSA_PUBLIC_FORMAT_PKCS1_RAW', 4); define('CRYPT_RSA_PUBLIC_FORMAT_PKCS1_RAW', 4);
/** /**

1
phpseclib/Net/SSH2.php
View File

@ -801,6 +801,7 @@ class Net_SSH2 {
stream_set_blocking($this->fsock, false); stream_set_blocking($this->fsock, false);
// on windows this returns a "Warning: Invalid CRT parameters detected" error // on windows this returns a "Warning: Invalid CRT parameters detected" error
// the !count() is done as a workaround for <https://bugs.php.net/42682>
if (!@stream_select($read, $write, $except, $timeout - $elapsed) && !count($read)) { if (!@stream_select($read, $write, $except, $timeout - $elapsed) && !count($read)) {
user_error(rtrim("Cannot connect to $host. Banner timeout"), E_USER_NOTICE); user_error(rtrim("Cannot connect to $host. Banner timeout"), E_USER_NOTICE);
return; return;