Commit Graph

3355 Commits

Author SHA1 Message Date
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
terrafrost cf69b29427 Crypt/PKCS8: rm duplicate code and improve detection of public keys 2023-03-04 23:25:36 -06:00
terrafrost 9a356ba200 Merge branch 'rposky' 2023-03-04 21:00:14 -06:00
terrafrost 71b9b64203 CS adjustments 2023-03-04 20:47:49 -06:00
terrafrost ea0a2375d2 Merge branch '3.0' 2023-03-03 14:55:02 -06:00
Simon Podlipsky 530f8ab210 feat: add return types to few jsonSerialize() 2023-03-03 14:54:56 -06:00
terrafrost f8d2ff5ae4 CS adjustments 2023-03-03 14:42:42 -06:00
terrafrost a8e90331c1 Merge branch '3.0' 2023-03-03 14:23:11 -06:00
Simon Podlipsky c053b895c8 style: add newline at end of BigInteger.php file 2023-03-03 14:23:02 -06:00
terrafrost c918d60b20 SymmetricKey: rm safe_intval 2023-03-03 14:06:25 -06:00
terrafrost f519a54e7a Merge branch '3.0' 2023-03-03 12:54:14 -06:00
terrafrost fbe79b0855 Merge branch '2.0' into 3.0 2023-03-03 09:30:48 -06:00
terrafrost 0af70c5de6 Merge branch '1.0' into 2.0 2023-03-03 09:25:24 -06:00
terrafrost 9e758c180d Blowfish: 32-bit PHP tweaks 2023-03-03 09:24:42 -06:00
terrafrost 922cfd8dea Merge branch '3.0' 2023-03-02 04:52:55 -06:00
Simon Podlipsky b946c6eed9 style: run csfixer 2023-03-02 04:52:25 -06:00
terrafrost e77c881b54 Merge branch '3.0' 2023-03-02 03:49:40 -06:00
terrafrost 6298d1cd55 PrimeField: prevent infinite loop with composite primefields 2023-03-02 03:25:08 -06:00
Robert d012d6cd03 Adding getter for timeout to SSH2 2023-02-28 12:52:01 -06:00
terrafrost 1b1e729632 backport enhancements from the 2.0 branch 2023-02-11 22:20:03 -06:00
terrafrost 5d51328dd5 Merge branch '3.0' 2023-02-11 20:57:49 -06:00
terrafrost d3e72bd1fc Merge branch '2.0-github-actions' into 3.0 2023-02-11 20:40:52 -06:00
terrafrost e42185c672 BigInteger: fix for hex numbers with new lines in them 2023-02-11 19:08:08 -06:00
terrafrost e3b9a97200 Blowfish: fix issues on 32-bit PHP installs 2023-02-11 17:47:40 -06:00
terrafrost 50ab21b7cb Crypt: don't do OpenSSL version check unless OpenSSL is installed 2023-02-11 14:55:25 -06:00
terrafrost ad7a7d5c8f fix PHP <5.4 compatability 2023-02-10 12:34:11 -06:00
terrafrost ca2c9588ea Merge branch '3.0' 2023-02-05 23:47:08 -06:00
terrafrost 2487192558 AsymmetricKey: error out on unsupported operations 2023-02-05 17:44:51 -06:00
terrafrost 00f5057e1b Merge branch '3.0' 2023-01-06 14:57:48 -06:00
Kevin van Hulst 3ad3693d31 fix "Creating default object from empty value" error 2023-01-06 14:57:05 -06:00
terrafrost aa68ee7e69 Merge branch '1.0' into 2.0 2022-12-23 10:16:52 -06:00
Alexander Vlasov 797351cd63 Fix undefined properties deprecated in PHP 8.2 2022-12-23 10:08:51 -06:00
terrafrost 974a30d4d9 fix bad merge 2022-12-17 11:48:28 -06:00
terrafrost 5335dbde3e Merge branch '2.0' into 3.0 2022-12-17 11:25:26 -06:00
Simon Podlipsky 97ea650dba fix: drop use of "self" in callable as it's deprecated since php 8.2 2022-12-17 08:49:29 -06:00
terrafrost 649b4f1713 Merge branch '3.0' 2022-12-16 22:54:07 -06:00
terrafrost 90a1765106 Merge branch '2.0' into 3.0 2022-12-16 22:53:49 -06:00
terrafrost be361b6722 Merge branch '1.0' into 2.0 2022-12-16 22:30:32 -06:00
terrafrost c99e38b7c9 OpenSSL 3.0.1+ deprecated some algorithms 2022-12-16 22:16:49 -06:00
terrafrost d02d77ad56 Merge branch '3.0' 2022-12-11 09:01:36 -06:00
terrafrost 1a201dd131 Merge branch '2.0' into 3.0 2022-12-11 08:59:36 -06:00
terrafrost 6611c0b566 Merge branch '1.0' into 2.0 2022-12-11 07:30:01 -06:00
terrafrost 1c56e00cf8 SSH2: if logging in with rsa-sha2-256/512 fails, try ssh-rsa 2022-12-11 07:29:44 -06:00
terrafrost 762e786ec9 SymmetricKey: more CS updates 2022-12-07 08:39:01 -06:00
terrafrost e1541eb109 Merge branch '3.0' 2022-12-07 08:38:28 -06:00
terrafrost 8568af7f9b SymmetricKey: CS updates 2022-12-07 08:38:06 -06:00
terrafrost d186a9d20d Merge branch '2.0' into 3.0 2022-12-07 08:37:25 -06:00
terrafrost e8ff5142c8 Merge branch '1.0' into 2.0 2022-12-07 08:33:13 -06:00
terrafrost 16df002325 Crypt/Base: add a function to check continuous buffer status 2022-12-07 08:32:44 -06:00
terrafrost 0c728ff2bc SSH/Agent: add proper type hinting to constructor 2022-11-29 06:31:29 -06:00
terrafrost efd5bf281a SSH/Agent: use PHP8's new str_contains function 2022-11-29 06:24:32 -06:00
terrafrost 68aa48de66 X509: CS adjustment 2022-11-29 06:09:31 -06:00
terrafrost 637444d0ab Merge branch '3.0' 2022-11-29 05:48:31 -06:00
terrafrost 6ee646a480 Merge branch '2.0' into 3.0 2022-11-29 05:47:40 -06:00
terrafrost 218c7e5207 SSH/Agent: add support for named pipes on windows (for pageant) 2022-11-29 05:41:57 -06:00
terrafrost 8907a4bd5b Merge branch '1.0' into 2.0 2022-11-28 08:43:32 -06:00
terrafrost 68c3eef88f SCP: do $var === false vs !$var 2022-11-28 08:42:55 -06:00
terrafrost b216a4cf07 ASN1: 3.0 already has $location defined 2022-11-27 22:47:20 -06:00
terrafrost d979777a60 Merge branch '2.0' into 3.0 2022-11-27 22:45:55 -06:00
terrafrost 4c7cce54c3 Merge branch '1.0' into 2.0 2022-11-27 21:37:15 -06:00
Côme Chilliet 74ee25bf8a Fix PHP 8.2 dynamic property warning 2022-11-27 21:37:05 -06:00
terrafrost 5afc5f77b9 Merge branch '3.0' 2022-11-27 12:18:17 -06:00
terrafrost bf804e6feb DSA/PuTTY: ssh-dsa should be ssh-dss 2022-11-27 12:18:09 -06:00
terrafrost ad11cf3c6b Merge branch '3.0' 2022-10-27 23:07:45 -05:00
terrafrost 08c27ae48a Merge branch '2.0' into 3.0 2022-10-27 23:07:38 -05:00
terrafrost 104f776cff Merge branch '1.0' into 2.0 2022-10-27 23:07:06 -05:00
Lars Moelleken a482c925af typo: "cann't" vs "can't" 2022-10-27 23:06:53 -05:00
Jack Worman 7b557d46c5 Remove bootstrap.php 2022-10-20 17:57:21 -05:00
Jack Worman fe4bdc0410 Property_typehint_in_ssh2 2022-10-07 08:39:21 -05:00
terrafrost 0a50932285 SFTP: CS adjustments 2022-10-04 21:32:14 -05:00
terrafrost b2ca37b990 Merge branch '3.0' 2022-10-04 21:31:51 -05:00
terrafrost a10a3b8e5b Merge branch '2.0' into 3.0 2022-10-04 21:02:49 -05:00
terrafrost 2ed74533f4 Merge branch '1.0' into 2.0 2022-10-04 18:11:49 -05:00
Phil Davis 24845ccbcc delete of non-existent folder returns true when it used to ret 2022-10-04 17:56:23 -05:00
Jack Worman 985b3c4f7c Throw \phpseclib3\Exception\ExceptionInterface exceptions 2022-09-26 07:41:32 -05:00
terrafrost 2b937b413a Merge branch '2.0' 2022-09-23 23:17:54 -05:00
terrafrost 4f53331c98 SSH2: rm if condition that can't ever be true in 3.0+ 2022-09-23 23:03:11 -05:00
terrafrost c1f284d6b8 Merge branch '3.0' 2022-09-23 22:43:52 -05:00
terrafrost f0a146eaa1 X509: make it so PKCS1 X509 certs can create PSS sigs 2022-09-23 22:33:30 -05:00
terrafrost 8c53a80405 Merge branch '3.0' 2022-09-23 16:15:43 -05:00
terrafrost b54eeb8e35 X509: make it so CRLs, CSRs and SPKACs can support PSS keys 2022-09-23 15:03:37 -05:00
terrafrost c1377159a2 Random: don't do >= 8.1 check 2022-09-15 00:01:15 -05:00
terrafrost 5a6f433ee8 Merge branch '3.0' 2022-09-15 00:00:23 -05:00
terrafrost a1862b1817 fix bad merge 2022-09-15 00:00:14 -05:00
terrafrost 535fa6c777 Merge branch '3.0' 2022-09-14 23:47:17 -05:00
terrafrost ead5790c80 CS adjustment 2022-09-14 23:45:04 -05:00
terrafrost 65493ae3be Merge branch '2.0' into 3.0 2022-09-14 12:50:32 -05:00
terrafrost 73b149ea6d Merge branch '1.0' into 2.0 2022-09-13 23:59:59 -05:00
terrafrost c4ec1ea069 Random: fix fallback on PHP 8.1+ 2022-09-13 23:58:14 -05:00
terrafrost 51cafda4a3 make PHP 8.1 32-bit changes compatable with raspberry pi's 2022-09-13 23:56:13 -05:00
Jeremy Albert 2ab212300e Avoid implicit conversion from float to int 2022-09-13 12:53:20 -05:00
terrafrost 10fe792938 Merge branch '3.0' 2022-09-05 12:51:44 -05:00
terrafrost 59e34b1cd3 SSH2: fix type hinting for keyboard_interactive_helper 2022-09-05 12:50:38 -05:00
terrafrost 8dbb8667f1 fix bad merge 2022-08-28 11:03:15 -05:00
terrafrost 88fbf6ab97 Merge branch '1.0' into 2.0 2022-08-28 10:34:26 -05:00
terrafrost 1168ba4d27 backport 3.0's PHP 8.1 32-bit fixes 2022-08-28 09:54:08 -05:00
terrafrost 26b2b3f473 CS adjustment 2022-08-27 08:34:15 -05:00
terrafrost 41dbac7a9e Merge branch '3.0' 2022-08-27 08:33:39 -05:00
terrafrost 2026b0c0db Hash: fix PHP 8.2 error
see https://github.com/php/php-src/issues/8924
2022-08-27 08:33:17 -05:00
terrafrost e2a20a6ad9 fix bad merge 2022-08-27 07:33:21 -05:00
terrafrost 2f3555a9b4 Merge branch '3.0' 2022-08-27 06:16:19 -05:00
terrafrost c5a9ee5234 fix deprecated implicit float to int on 32-bit PHP 8.1 2022-08-27 05:53:55 -05:00
terrafrost 1762ad4d9e CS adjustments 2022-08-23 21:37:53 -05:00
terrafrost 62f7c8aa10 CS tweaks 2022-08-23 21:26:31 -05:00
terrafrost 0b9b0074c9 backport more dynamic property fixes 2022-08-23 20:01:11 -05:00
terrafrost b1aef24a86 EC: eliminate dynamic property from Ed25519/448 handling 2022-08-21 21:38:30 -05:00
terrafrost a4dba26ec5 CS adjustments 2022-08-21 13:30:27 -05:00
terrafrost 71fa541c9a Merge branch 'jworman' 2022-08-20 23:19:34 -05:00
terrafrost b64952680e Merge branch '3.0' 2022-08-20 17:38:19 -05:00
terrafrost 0b3c6e27fc add JSON Web Key (JWK) support 2022-08-20 17:38:12 -05:00
terrafrost a01c3915ce Merge branch '3.0' 2022-08-20 06:19:24 -05:00
terrafrost 13b241e3e9 use libsodium's hex (en|de)coding if available 2022-08-19 22:49:26 -05:00
terrafrost 3c73d61e7e Merge branch '3.0' 2022-08-19 09:22:57 -05:00
terrafrost e5396968c5 use libsodium's base64 decoding if available 2022-08-19 09:11:46 -05:00
Jack Worman 16ade5d634 Quality tool fixes 2022-08-18 08:25:29 -05:00
Jack Worman a8f30f516a Throw exception instead of triggering error, and added base exception interface 2022-08-18 08:10:12 -05:00
Jack Worman 3f3de53503 Use loop for encrypting $p 2022-08-18 08:10:12 -05:00
Jack Worman 6958ba1627 php-cs-fixer @PHP81Migration rule set 2022-08-18 08:10:12 -05:00
Jack Worman 80f2d7f521 php-cs-fixer - php 7.4 rules 2022-08-18 08:10:08 -05:00
terrafrost 0e4e513900 Merge branch '3.0' 2022-08-17 00:08:21 -05:00
terrafrost ea94a73380 Merge branch '2.0' into 3.0 2022-08-17 00:08:15 -05:00
terrafrost cf6ff7dad0 Merge branch '1.0' into 2.0 2022-08-17 00:08:08 -05:00
terrafrost 3d05201d40 X509: include the query part of the URL 2022-08-17 00:07:54 -05:00
terrafrost 9e7efc914d fix bad merge 2022-08-16 19:38:23 -05:00
terrafrost fd6e53719c Merge branch '3.0' 2022-08-16 19:32:51 -05:00
terrafrost e78edac015 Merge branch '3.0-logging-enhancements' into 3.0 2022-08-16 19:19:40 -05:00
terrafrost 32e85c2145 Merge branch 'master' of https://github.com/phpseclib/phpseclib 2022-08-13 16:52:58 -05:00
terrafrost 1d04f9b1d4 Merge branch 'callmejon' 2022-08-13 09:05:30 -05:00
terrafrost f928536632 EC: make secret field in savePrivateKey optional 2022-08-12 13:12:16 -05:00
walkonthemarz 871f37087d Revert back the commit 85205bf6d5 2022-08-12 16:42:11 +08:00
Jonny Fonsato 5c8966334e
removed initialization where not needed 2022-08-02 11:50:12 +02:00
Jonny Fonsato 05cdd09f52
add --ignore-platform-req=php for fix test error 2022-08-02 11:06:37 +02:00
terrafrost 259f44207a
Merge pull request #1824 from jack-worman/Php_7.3
Php 7.3 php-cs-fixer rule and composer.json scripts
2022-07-31 23:43:07 -05:00
terrafrost 652e84934d
Merge pull request #1823 from jack-worman/Re-add_old_x
Re-add_old_x
2022-07-31 23:27:51 -05:00
terrafrost 92984a318f Merge branch '3.0' 2022-07-31 19:35:05 -05:00
terrafrost 7fbd6d5fef Merge branch '2.0' into 3.0 2022-07-31 19:34:49 -05:00
terrafrost 3a087da5cc Merge branch '1.0' into 2.0 2022-07-31 19:34:42 -05:00
terrafrost a44b56d4b5 Crypt/Base: fix PHP 8.2 deprecation error 2022-07-31 19:29:31 -05:00
terrafrost 2e549e3aa1 Merge branch '3.0' 2022-07-31 17:28:30 -05:00
terrafrost 826d8d6670 make it so OpenSSH encrypted keys can be created 2022-07-31 17:14:20 -05:00
terrafrost e95febd5aa rm safe_intval 2022-07-31 16:03:41 -05:00
terrafrost e54624c085 CS adjustments 2022-07-31 09:31:41 -05:00
terrafrost af7a69a66f Merge branch 'bcrypt' into bcrypt2 2022-07-31 09:04:54 -05:00
terrafrost 2d6713cd54 Crypt: CRYPT_BASE_USE_SAFE_INTVAL -> CRYPT_BASE_USE_REG_INTVAL 2022-07-31 08:59:21 -05:00
terrafrost 3691aefd2b CS adjustments 2022-07-31 08:48:04 -05:00
terrafrost 69d3f8548a Merge branch 'bcrypt3' 2022-07-30 19:49:05 -05:00
terrafrost 1e10a6ab7a fix bad merge 2022-07-30 18:51:45 -05:00
terrafrost 450a961785 Merge branch 'bcrypt2' into bcrypt3 2022-07-30 18:07:26 -05:00
terrafrost abb6a62384 fix bad merge 2022-07-28 17:35:12 -05:00
terrafrost 11977eeb3c Merge branch 'bcrypt' into bcrypt2 2022-07-28 16:55:43 -05:00
terrafrost 34a277ff16 a few small tweaks 2022-07-28 16:44:29 -05:00
Jonny Fonsato dd86bd9fbd
change secret position after rebase 2022-07-28 16:56:00 +02:00
Jonny Fonsato 5411695c0b
changed as mentioned by Terrafrost 2022-07-28 16:38:51 +02:00
Jonny Fonsato a3ce8392fd
I have upgraded to php 8.2 with the tests running successfully 2022-07-28 16:30:54 +02:00
terrafrost cd716bcf36 updates to make phpseclib 1.0 work on older PHP versions 2022-07-28 08:42:14 -05:00
terrafrost 0c8994bbad Crypt/RSA: add support for loading OpenSSH encrypted keys 2022-07-28 08:11:42 -05:00
terrafrost 76a7b07bda Crypt/Blowfish: partial refactor for bcrypt 2022-07-24 17:37:31 -05:00
terrafrost 445077e733 Crypt/Base: rewrite how safe_intval check is done 2022-07-24 16:51:56 -05:00
terrafrost b0e034ff9d Merge branch '3.0' 2022-07-23 09:41:56 -05:00
terrafrost 33b8a299b5 SymmetricKey: CS update 2022-07-23 09:39:33 -05:00
terrafrost 0ab44df4ce Merge branch '3.0' 2022-07-23 09:35:02 -05:00
terrafrost cd5a38ef3b Merge branch '2.0' into 3.0 2022-07-23 09:32:44 -05:00
terrafrost d22110b057 Crypt/Base: rm php <= 5.3.0 code 2022-07-23 09:31:42 -05:00
terrafrost a7a39624b0 Merge branch '1.0' into 2.0 2022-07-23 09:28:21 -05:00
terrafrost ccbb116db3 Crypt/Base: limit conditions under which safe_intval is used 2022-07-23 09:22:00 -05:00
Jack Worman 510a93a50a Php 7.3
- Update php requirement to >=7.3
- Add php-cs-fixer rule: @PHP73Migration
2022-07-22 21:45:53 -05:00
Jack Worman 5f4c89b688 Re-add_old_x 2022-07-22 21:16:51 -05:00
terrafrost a699dadb03 tweak comments 2022-07-22 19:16:04 -05:00
terrafrost a95abeb4c4 Merge remote-tracking branch 'jworman/Php_7.1' 2022-07-22 18:29:53 -05:00
terrafrost 5e524c3f21 Merge branch '3.0' 2022-07-16 09:16:37 -05:00
terrafrost 114f8c8f77 backport more changes from master 2022-07-16 09:03:17 -05:00
terrafrost 57031bdf9a Merge branch '3.0' 2022-07-15 15:32:05 -05:00
Anthony Ryan dd9146e259 Fix return type comment on Crypt/RSA::createKey()
Function returns a Crypt/RSA/PrivateKey and updating
the PHPDoc for it will help with static analysis.
2022-07-15 15:30:47 -05:00
terrafrost 35be18b292 Merge branch '3.0' 2022-07-15 12:29:19 -05:00
terrafrost c73b9f0884 RSA/XML: rm redundant check 2022-07-15 12:28:56 -05:00
terrafrost a9c3f10de4 Merge branch '3.0' 2022-07-15 09:18:37 -05:00
terrafrost feced404bb EC/PKCS8: OpenSSL didn't like phpseclib formed Ed25519 public keys 2022-07-15 09:18:15 -05:00
terrafrost 7aa6c08a85 Merge branch 'master' of https://github.com/phpseclib/phpseclib 2022-07-14 23:16:14 -05:00
terrafrost 4914e91a33 Merge branch '3.0' 2022-07-14 23:05:51 -05:00
terrafrost 1359431224 Merge branch '1.0' into 2.0 2022-07-14 23:04:58 -05:00
terrafrost 22e2fdbca6 Merge branch '2.0' into 3.0 2022-07-13 09:14:05 -05:00
terrafrost 68323d8f11 Merge branch '1.0' into 2.0 2022-07-13 09:07:31 -05:00
terrafrost 9fae7ec89d RSA: loading keys could error out if xml extension wasn't installed 2022-07-13 09:06:33 -05:00
Jack Worman 7154fd98d2 Php 7.1 2022-07-08 21:42:28 -05:00
Jack Worman e210166f43 Php 7.1 Upgrade 2022-07-08 08:37:58 -05:00
terrafrost 477b98d43d SSH2 / SFTP: unify logging and add a new mode - LOG_SIMPLE_REALTIME 2022-07-06 21:22:03 -05:00
Jack Worman b2beedbf9a 3rd round of comments 2022-07-03 07:54:11 -05:00
Jack Worman 81ffdbc4ef Merge branch 'master' into Upgrade_to_Php_7.0
# Conflicts:
#	phpseclib/Crypt/EC/BaseCurves/Prime.php
#	phpseclib/Crypt/EC/Formats/Keys/XML.php
#	phpseclib/Crypt/RSA/PrivateKey.php
#	phpseclib/File/ANSI.php
#	phpseclib/File/ASN1.php
#	phpseclib/File/X509.php
#	phpseclib/Net/SFTP.php
#	phpseclib/Net/SFTP/Stream.php
#	phpseclib/Net/SSH2.php
#	phpseclib/System/SSH/Agent.php
#	phpseclib/System/SSH/Agent/Identity.php
#	tests/Unit/Math/BigInteger/TestCase.php
2022-07-03 07:48:16 -05:00
Jack Worman 8a2b94fb24 3rd round of comments 2022-07-03 07:33:45 -05:00
terrafrost 30e845ff1a Merge branch '3.0' 2022-07-02 21:50:18 -05:00
terrafrost 1fd995abdf Merge branch '3.0-type-hinting-backport' into 3.0 2022-07-02 21:49:55 -05:00
terrafrost 250f1a5b51 more backporting 2022-07-02 21:49:45 -05:00
Jack Worman 86ef8ef262 2nd round of comments 2022-07-02 16:47:49 -05:00
Jack Worman beafe2a8a1 1st round of comments 2022-07-02 16:26:17 -05:00
Jack Worman 97902d4bd3 Upgrade to PHP 7.0 2022-07-02 16:26:15 -05:00
terrafrost d22639841a Merge branch '3.0' 2022-06-26 17:08:07 -05:00
terrafrost 0b3cc98084 BigInteger: fix behavior on 32-bit PHP installs 2022-06-26 17:07:45 -05:00
terrafrost 2f9bfb7987 Merge branch '1.0' into 2.0 2022-06-22 08:17:22 -05:00
terrafrost 978b2adbfc RC2: fix deprecation error 2022-06-22 08:17:09 -05:00
terrafrost 4bceb6ca2d Merge branch '1.0' into 2.0 2022-06-22 08:01:36 -05:00
terrafrost f61a9b42d5 don't use dynamic properties, which are deprecated in PHP 8.2 2022-06-22 08:00:59 -05:00