diff --git a/phpseclib/Crypt/RSA.php b/phpseclib/Crypt/RSA.php index a62fec9f..71955082 100644 --- a/phpseclib/Crypt/RSA.php +++ b/phpseclib/Crypt/RSA.php @@ -217,9 +217,9 @@ define('CRYPT_RSA_PRIVATE_FORMAT_XML', 2); */ 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); /** diff --git a/phpseclib/Net/SSH2.php b/phpseclib/Net/SSH2.php index 7ceddb47..dcf2ee56 100644 --- a/phpseclib/Net/SSH2.php +++ b/phpseclib/Net/SSH2.php @@ -801,6 +801,7 @@ class Net_SSH2 { stream_set_blocking($this->fsock, false); // on windows this returns a "Warning: Invalid CRT parameters detected" error + // the !count() is done as a workaround for if (!@stream_select($read, $write, $except, $timeout - $elapsed) && !count($read)) { user_error(rtrim("Cannot connect to $host. Banner timeout"), E_USER_NOTICE); return;