Commit Graph

3355 Commits

Author SHA1 Message Date
terrafrost d88db1afea Merge branch '3.0' 2023-11-22 08:21:55 -06:00
terrafrost 7b893c5cb4 Merge branch '2.0' into 3.0 2023-11-22 08:18:49 -06:00
terrafrost 70c7ffe42c Merge branch '1.0' into 2.0 2023-11-22 08:14:20 -06:00
terrafrost 49c9439878 SSH2: use phpseclib's preferred order for auth algorithms 2023-11-22 08:13:46 -06:00
terrafrost 77b00c3169 CS adjustment 2023-11-22 05:12:24 -06:00
terrafrost cf1be6a3d3 Merge branch '3.0' 2023-11-22 04:51:42 -06:00
terrafrost 7cc1814f9d Merge branch '2.0' into 3.0 2023-11-22 04:44:23 -06:00
terrafrost 848992230f Merge branch '1.0' into 2.0 2023-11-21 23:03:12 -06:00
terrafrost 356ab5f76a SSH2: add support for RFC8308 2023-11-21 23:02:42 -06:00
terrafrost f6801388a8 Merge branch '3.0' 2023-11-21 19:11:59 -06:00
terrafrost 964d78101a Math/BinaryField: fix for excessively large degrees 2023-11-21 19:10:46 -06:00
terrafrost 7336c9c49f Merge branch '3.0' 2023-11-19 09:56:08 -06:00
terrafrost 9bfd136259 PKCS8: PBES2 / DES encrypted keys didn't work 2023-11-19 09:51:15 -06:00
terrafrost 194b5af961 Merge branch '3.0' 2023-11-12 09:09:13 -06:00
terrafrost c21db263b0 PKCS8: RC2 encrypted keys didn't work 2023-11-12 09:02:35 -06:00
terrafrost 6f4559f2f3 Merge branch '3.0' 2023-11-04 16:15:50 -05:00
terrafrost 3ecde6bf6a SSH2: don't use AES GCM for TurboFTP Server 2023-11-04 16:13:09 -05:00
terrafrost ec6338ecd2 another CS adjustment after merger 2023-11-01 20:51:12 -05:00
terrafrost afeffdea3c Merge branch '3.0' 2023-11-01 20:50:22 -05:00
terrafrost b19dd5ec7b CS adjustments 2023-11-01 20:44:31 -05:00
terrafrost 5b27f8f26e CS adjustments 2023-11-01 20:30:35 -05:00
terrafrost 70a6271d21 Merge branch '3.0' 2023-11-01 19:48:46 -05:00
terrafrost 90e3b38a29 Merge branch 'ieee' into 3.0 2023-11-01 19:48:32 -05:00
terrafrost 0086be8af1 EC/Signature/Format: add new IEEE format 2023-11-01 19:19:07 -05:00
terrafrost 93417928cc Merge branch '3.0' 2023-10-31 09:51:13 -05:00
terrafrost ce753669bc PrimeField: fix error with squareRoot method 2023-10-31 08:47:58 -05:00
MarkLittlewood eb04913463 access $disconnect_reasons using self instead of static 2023-10-18 15:25:41 +01:00
terrafrost 967210fb46 CS adjustment 2023-10-07 18:25:46 -05:00
terrafrost 1bfc9a3e44 Merge branch '2.0' into 3.0 2023-10-07 17:40:39 -05:00
terrafrost 414aeaa066 Merge branch '1.0' into 2.0 2023-10-07 17:38:54 -05:00
terrafrost 173bb38e67 Crypt/Base: improve ARM detection code 2023-10-07 17:36:50 -05:00
terrafrost fa53d11807 more CS adjustments 2023-09-25 11:22:02 -05:00
terrafrost cb3aff1332 Merge branch '3.0' 2023-09-25 10:57:01 -05:00
terrafrost c5b4d08669 Merge branch '2.0' into 3.0 2023-09-25 10:56:47 -05:00
terrafrost abf482f73b Merge branch '1.0' into 2.0 2023-09-25 10:46:02 -05:00
terrafrost 6cd6e8ceab X509: fix for weird characters in subjaltname 2023-09-25 10:45:13 -05:00
terrafrost 839fd018d8 Merge branch '3.0' 2023-09-25 07:04:36 -05:00
terrafrost 4777b59ce9
Merge pull request #1942 from danog/move_jit_check
Move JIT check to BigInteger
2023-09-25 06:44:51 -05:00
Daniil Gentili 7b9ab171ce
Refactor 2023-09-22 10:07:03 +02:00
terrafrost 10e57d6a5e Merge branch '3.0' 2023-09-21 15:10:50 -05:00
terrafrost d25f03be9a Merge branch '2.0' into 3.0 2023-09-21 15:10:42 -05:00
terrafrost 76e94055f4 Merge branch '1.0' into 2.0 2023-09-21 15:08:28 -05:00
terrafrost b1bd715445 Rijndael: fix for PHP 8.3+ compatability 2023-09-21 15:07:38 -05:00
terrafrost b85ce73d17 AES: rm redundant setKey() method and fix setKeyLength() 2023-09-21 15:07:09 -05:00
Daniil Gentili e113bb35e7
Move JIT check to BigInteger 2023-09-20 14:36:32 +02:00
terrafrost 4f8fcedd94 Merge branch '3.0' 2023-09-18 12:20:11 -05:00
pafernandez-oesia 105edcad00
Fix Undefined index jit notice
If "jit" is not defined in $status array, it generates an "Undefined index: jit" notice.
2023-09-18 16:44:41 +02:00
terrafrost 2cc785fc54 Rijndael: fix E_DEPRECATED
bfba3db1a7 removed setKey() from the 1.0 branch, however, 5321b9b610 reintroduced it. that merge commit had conflicts and the conflicts were (apparently) inappropriately resolved
2023-09-06 09:09:11 -05:00
terrafrost 0893147281 Merge branch '3.0' 2023-08-31 09:30:23 -05:00
terrafrost 615d6cfc7c BigInteger: fix more PHP32-bit errors 2023-08-31 09:28:16 -05:00
terrafrost c160a020db Merge branch '3.0' 2023-08-28 08:51:17 -05:00
terrafrost aeac69b846 Merge branch '2.0' into 3.0 2023-08-28 08:51:10 -05:00
terrafrost bc62673fdd Merge branch '1.0' into 2.0 2023-08-28 08:51:02 -05:00
terrafrost 320c43a4a0 SFTP: fix issue with get() downloading to files / streams
the code that's being removed has its origins in 65193d9a25. in that commit the packet length is set outside of the while loop. this would continue to be the case until https://github.com/phpseclib/phpseclib/pull/945.
2023-08-28 08:47:30 -05:00
terrafrost 36441a68e9 Merge branch '3.0' 2023-08-27 23:12:02 -05:00
terrafrost fac92403d0 Bootstrap: fix for when opcache ext is enabled but opcache.enable=0 2023-08-27 23:11:25 -05:00
terrafrost 3f7e74e41e Merge branch '3.0' 2023-08-24 20:22:42 -05:00
terrafrost f7e80e44c9 Merge branch '2.0' into 3.0 2023-08-24 20:22:16 -05:00
terrafrost 278f8e5f5a Merge branch '1.0' into 2.0 2023-08-24 20:21:13 -05:00
terrafrost 0f23be3188 SFTP: fix SFTPv2 errors when logging errors 2023-08-24 20:20:47 -05:00
terrafrost 585e0e44f4 ASN1: fix string conversion code for 32-bit PHP installs 2023-08-24 20:20:11 -05:00
terrafrost fc746cddfe Merge branch '3.0' 2023-08-10 22:33:44 -05:00
terrafrost c5e9d51e51 CS adjustment 2023-08-10 22:33:35 -05:00
terrafrost 34c05b9dbf Merge branch '3.0' 2023-08-10 22:23:16 -05:00
terrafrost 0f9d6577ad Bootstrap: JIT on Windows breaks certain phpseclib operations 2023-08-10 22:15:59 -05:00
terrafrost 5babbd028c Merge branch '3.0' 2023-07-26 22:00:22 -05:00
terrafrost 25a06f0071 Math/PrimeField: fix for when garbage collection has wiped data 2023-07-26 21:34:39 -05:00
terrafrost a7cfd2440a Merge branch '3.0' 2023-07-25 20:37:18 -05:00
terrafrost f01892a9db BigInteger: use GMP if it's available 2023-07-25 20:32:42 -05:00
terrafrost 90dc3cf6cb Merge branch '3.0' 2023-07-19 19:33:44 -05:00
terrafrost 718503af33 Merge branch 'phpstan' into 3.0 2023-07-19 19:28:21 -05:00
terrafrost 749cacea58 Merge branch '3.0' 2023-07-09 09:53:26 -05:00
terrafrost 0740d58136 BigInteger: do PHP64 w/ OpenSSL before BCMath w/ OpenSSL 2023-07-09 08:51:55 -05:00
terrafrost 249d17f921 BigInteger: BCMath w/o OpenSSL should never be reached 2023-07-09 00:37:53 -05:00
terrafrost e7af70d1dd Merge branch '3.0' 2023-07-08 13:28:41 -05:00
terrafrost 37c6f5255c BigInteger: update engine preferences 2023-07-08 13:27:16 -05:00
terrafrost 6ee1f8c45b Merge branch '3.0' 2023-07-05 07:30:46 -05:00
terrafrost 4013d260e0 Merge branch '2.0' into 3.0 2023-07-05 07:30:39 -05:00
terrafrost d8eec980b7 Merge branch '1.0' into 2.0 2023-07-05 07:30:33 -05:00
Kevin Reniers 38a2a84da1 Add EOF test to SSH2::isConnected
This adds an additional test to SSH2::isConnected to make it more intuitive. Aside from testing against the internal state, it will also assert that there is an internal socket and that that socket has not reached EOF.
2023-07-05 07:29:54 -05:00
terrafrost fc4d9dd480 AsymmetricKey: phpstan tweak 2023-07-02 17:43:35 -05:00
terrafrost 5a02ce27ac CS adjustment 2023-07-02 12:45:16 -05:00
terrafrost a31fd00e5a Merge branch '3.0' 2023-07-02 12:33:20 -05:00
terrafrost 5a7569cd13 SSH2: attempt at fixing stream_select(): unable to select [4] 2023-07-02 12:32:01 -05:00
terrafrost 2d33d7b0dc Merge branch '3.0' 2023-07-02 11:56:58 -05:00
terrafrost 3334a3243c Merge branch '2.0' into 3.0 2023-07-02 11:55:51 -05:00
terrafrost 09f19cb92a Merge branch '1.0' into 2.0 2023-07-02 11:55:40 -05:00
terrafrost de09e8e817 SFTP: RESUME_START didn't work as described 2023-07-02 11:48:07 -05:00
terrafrost 65693db644 Merge branch '3.0' 2023-07-02 11:29:03 -05:00
terrafrost 9197b3ad3e ASN1: CS adjustment 2023-07-02 11:22:02 -05:00
terrafrost 9341e090c5 Merge branch '2.0' into 3.0 2023-07-02 11:18:17 -05:00
terrafrost 6aa6a5241f SFTP: CS adjustments 2023-07-02 10:46:34 -05:00
terrafrost 411d09cb7a Merge branch '1.0' into 2.0 2023-07-02 10:45:46 -05:00
terrafrost df3dab7d3f SFTP: make it so SFTP::RESUME also sets offset of local file 2023-07-02 10:45:25 -05:00
terrafrost 656a46ae12 Merge branch '3.0' 2023-06-25 10:03:23 -05:00
terrafrost bc8e0ed636 BigInteger: speed up powMod() method 2023-06-25 10:03:16 -05:00
terrafrost cbbadea6d1 Merge branch '1.0' into 2.0 2023-06-13 03:02:45 -05:00
terrafrost 16c67f4399 SSH2: fix more E_DEPRECATE_NOTICEs 2023-06-13 03:01:43 -05:00
terrafrost 68d8f5b4fe Merge branch '1.0' into 2.0 2023-06-12 17:15:30 -05:00
terrafrost b6c01f9318 SSH2: backport some E_DEPRECATED fixes from 3.0 2023-06-12 17:14:58 -05:00
terrafrost 6833fc79a6 Merge branch '3.0' 2023-06-04 16:39:59 -05:00
terrafrost 4f113bc96c SFTP: CS adjustment 2023-06-04 16:39:44 -05:00
terrafrost dff24146af CS adjustment 2023-06-04 16:33:58 -05:00
terrafrost 9f919e8f24 Merge branch '1.0' into 2.0 2023-06-04 16:16:25 -05:00
terrafrost eb8cbd7317 X509: backport EV subjects 2023-06-04 16:16:07 -05:00
terrafrost 9d2e353a04 Merge branch '3.0' 2023-06-04 16:08:09 -05:00
Tobias 3c349e122b feat(ADMINISTRATION-1): added ev subjects 2023-06-04 16:00:15 -05:00
terrafrost ff26e22563 CS adjustments 2023-06-04 11:26:34 -05:00
terrafrost 501c96c48c Merge branch '3.0' 2023-06-04 10:51:36 -05:00
terrafrost b8f8f0b7db SFTP: add optional $recursive parameter to filesize() 2023-06-04 10:50:26 -05:00
terrafrost e6dd9f6492 Merge branch '3.0' 2023-06-02 10:25:13 -05:00
terrafrost f418be845b RSA: setting sig padding broke enc padding and vice versa 2023-06-02 10:14:58 -05:00
terrafrost d856416026 Merge branch '3.0' 2023-05-27 19:30:15 -05:00
Léon Melis 841267aafa X509::getChain() should always return array of X509 objects
Due to an early exit optimization, X509::getChain() could return currentCert as an array, instead of X509
2023-05-27 19:15:15 -05:00
terrafrost 1b1c073d1e Merge branch '3.0' 2023-05-18 08:24:02 -05:00
thomascorthals c71c217fd5 SFTP typehint fixes 2023-05-15 11:15:49 +02:00
terrafrost 8d0c1a10c7
Merge pull request #1905 from terrafrost/master-openchannel
(master branch) SSH/SFTP: create new openChannel() method to eliminate dupe code
2023-05-10 04:39:06 -05:00
terrafrost b25206e92b
Merge pull request #1904 from terrafrost/3.0-openchannel
(3.0 branch) SSH/SFTP: create new openChannel() method to eliminate dupe code
2023-05-10 04:38:51 -05:00
terrafrost e6f86e1770 Merge branch '3.0-openchannel' into master-openchannel 2023-05-07 11:35:24 -05:00
terrafrost 3dd7779939 SSH2: rm redundant isAuthenticated() call 2023-05-07 11:24:33 -05:00
terrafrost 89d8e6ecbb SFTP: rm redundant code 2023-05-07 11:07:38 -05:00
terrafrost f664ccb521 SSH2: make exceptions more useful for read() / write() 2023-05-07 11:07:07 -05:00
terrafrost 128d5496b5 Merge branch '3.0' 2023-05-05 07:38:24 -05:00
terrafrost 961034f4c2 SymmetricKey: fix typehint 2023-05-05 07:36:29 -05:00
terrafrost 928b5870b2 Merge branch '3.0' 2023-04-21 15:39:47 -05:00
terrafrost 79b6f96870 SSH2: CS adjustment 2023-04-21 15:39:01 -05:00
Andrew Brown d4263e854d update exception message
`fputs()` can return `int|false`.  if it fails and `$sent` is `false`, then our exception message looks a little confusing:

> Only  of XXX bytes were sent

This change updates the message to be more descriptive if the `fputs()` fails.
2023-04-18 15:16:18 -05:00
terrafrost 52c85c9935 Merge branch '3.0-openchannel' into master-openchannel 2023-04-15 08:31:37 -05:00
terrafrost 184a984e97 SSH2: updates to openchannel refactoring 2023-04-14 18:01:20 -05:00
terrafrost 34feefef3d Merge branch '3.0' 2023-04-12 20:58:10 -05:00
terrafrost 8b67d0ac32 Merge branch '2.0' into 3.0 2023-04-12 20:56:23 -05:00
terrafrost d5d0fca7cf Merge branch '1.0' into 2.0 2023-04-12 20:49:21 -05:00
terrafrost 53f967c36e SFTP: fix NET_SFTP_ATTR_EXTENDED 2023-04-12 20:49:07 -05:00
terrafrost 7d4fa71e9c Merge branch '3.0' 2023-04-10 01:28:25 -05:00
terrafrost 55578577c5 Merge branch '3.0-openchannel' into master-openchannel 2023-03-30 20:52:26 -05:00
terrafrost 5fb084b04c SSH2: if the server doesn't support multiple channels error out 2023-03-29 04:05:41 -05:00
Vincent Langlet 39bc067417 Fix phpdoc 2023-03-28 09:54:46 +02:00
terrafrost cecabb1fea SSH/SFTP: create new openChannel() method to eliminate dupe code 2023-03-27 17:46:46 -05:00
terrafrost b799abd1a0 SSH/SFTP: make message numbers / packet types static as well 2023-03-23 13:04:07 -05:00
terrafrost 9705cbbc26 SSH/SFTP: make define_array static 2023-03-23 12:23:43 -05:00
Robert 53fe071bd2 Merge branch '3.0' 2023-03-16 11:01:21 -05:00
Robert 7ec36fb5d5 Exposed publically open shell method as well as methods to query interactive channel open statuses.
Removed in_request_pty_exec and in_subsystem flags, and removed uses of MASK_SHELL in bitmap, replacing with open channel status queries.
Adding channel argument to read, write, and reset allowing callers to select among multiple open interactive channels.
Adding interactive channel identifier interface as sanctioned path for users to obtain channels ids instead of using channel constants.
Deprecating get_interactive_channel helper and documenting its "legacy" behavior in read, write, and reset doc blocks.
Removing disconnect on timeout in channel close for lack of clarity around timeout origin.
Check for open channel prior to closing in stopSubsystem and reset.
2023-03-16 10:18:03 -05:00
terrafrost 5761a0ba46 Merge branch '3.0' 2023-03-14 21:44:41 -05:00
Steven Hetland abbc1ab7c7 ASN1: 3.0 decodeBER() was optimized to remove duplicate work.
decodeBER() now runs twice as fast.
2023-03-14 21:43:29 -05:00
terrafrost e9596cef8c Merge branch '3.0' 2023-03-05 10:11:53 -06:00
terrafrost 0f6e1c2218 PKCS8: fix public private checks for human readable keys 2023-03-05 10:01:22 -06:00
terrafrost 7ce104b12c Merge branch '1.0' into 2.0 2023-03-05 04:18:37 -06:00
terrafrost 34d00869e5 SSH2: backport getTimeout() 2023-03-05 04:07:26 -06:00
terrafrost 79dead6a5e CS adjustments 2023-03-05 00:09:02 -06:00
terrafrost 60358cefb1 Merge branch '3.0' 2023-03-04 23:31:30 -06:00