Commit Graph

4717 Commits

Author SHA1 Message Date
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
7795ad0969 Merge branch '3.0' 2022-07-16 23:49:51 -05:00
terrafrost
2d11f6e820 Merge branch '2.0' into 3.0 2022-07-16 23:49:46 -05:00
terrafrost
e30765fdc8 Merge branch '1.0' into 2.0 2022-07-16 23:49:40 -05:00
terrafrost
22e66a4e3c BACKERS: add Tharyrok - thank you!! 2022-07-16 23:49:15 -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
167fa7d382 Merge branch '3.0' 2022-07-15 09:56:00 -05:00
terrafrost
89944c813c Composer: phpseclib 3 uses DOM vs XML 2022-07-15 09:55:12 -05:00
terrafrost
243ec71f6f Merge branch '2.0' into 3.0 2022-07-15 09:54:58 -05:00
terrafrost
dd92c40037 Merge branch '1.0' into 2.0 2022-07-15 09:54:12 -05:00
terrafrost
ad8fd7c135 Composer: add additional suggests 2022-07-15 09:40:50 -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
1692298efd Merge branch '2.0' into 3.0 2022-07-14 23:05:42 -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
0b5bca65c7
Merge pull request #1800 from jack-worman/Upgrade_to_Php_7.0
Upgrade to PHP 7.0
2022-07-03 09:22:34 -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
d124f95ea3 Merge branch '3.0' 2022-06-26 17:21:55 -05:00
terrafrost
9e77203746 Tests/BigInteger: make unit test do == vs === 2022-06-26 17:16:17 -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
7a87270b0c Merge branch '3.0' 2022-06-22 08:32:50 -05:00
terrafrost
22ee5597d3 Merge branch '2.0' into 3.0 2022-06-22 08:19:35 -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
8c65ab41d1 Merge branch '3.0' 2022-06-22 08:02:23 -05:00
terrafrost
8e2461dbaa Merge branch '2.0' into 3.0 2022-06-22 08:02:16 -05:00
terrafrost
4bceb6ca2d Merge branch '1.0' into 2.0 2022-06-22 08:01:36 -05:00