Commit Graph

4697 Commits

Author SHA1 Message Date
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
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
terrafrost
f61a9b42d5 don't use dynamic properties, which are deprecated in PHP 8.2 2022-06-22 08:00:59 -05:00
terrafrost
5f137d60ec Tests/ASN1Test: update tests to work with decodeBER returning null 2022-06-22 07:57:03 -05:00
terrafrost
9141c92236 RSA/PublicKey: rm bad type hint 2022-06-22 07:18:36 -05:00
terrafrost
298c50cde3 Merge branch '3.0' 2022-06-21 08:18:20 -05:00
terrafrost
7de44b745d X509: backport fix for dnsName to 3.0 branch from master 2022-06-21 08:17:59 -05:00
Jack Worman
8245775679
Merge pull request #1806 from vadym-ovechkin/master
Prevent static call to non-static method error
2022-06-21 07:57:58 -05:00
Vadym Ovechkin
cee667126c
Prevent static call to non-static method error (#1805) 2022-06-20 21:27:10 +03:00
terrafrost
9a1d16fe97 ASN1: make it so that null is returned if the BER can't be decoded 2022-06-18 22:51:31 -05:00
terrafrost
e0adfa1712 backport select type hinting changes from master branch 2022-06-18 17:42:01 -05:00
terrafrost
545b43cd70 Merge branch '3.0' 2022-06-16 17:57:28 -05:00
terrafrost
f24691dc55 Merge branch '2.0' into 3.0 2022-06-16 09:37:40 -05:00
terrafrost
a0c76f01d2 Merge branch '1.0' into 2.0 2022-06-16 08:32:59 -05:00
terrafrost
f189b9aae2 SFTP: try without path canonicalization if initial realpath() fails
also make it so chdir works even without path canonicalization
2022-06-16 08:31:39 -05:00
terrafrost
c4f6f602e5 SFTP: update for the master branch 2022-06-14 05:47:51 -05:00
terrafrost
a84f5ddc49 Merge branch '3.0' 2022-06-14 05:47:13 -05:00
terrafrost
623bb39f1c SFTP: update for 3.0 branch
in 1.0 / 2.0 _get_channel_packet could return false even when the
channel status was NET_SSH2_MSG_CHANNEL_DATA. in 3.0 it can't.
where 1.0 / 2.0 returned false 3.0 now throws exceptions
2022-06-14 05:43:31 -05:00
terrafrost
d85417c6ec Merge branch '2.0' into 3.0 2022-06-14 05:42:25 -05:00
terrafrost
413dcb6082 SFTP: update for 2.0 code 2022-06-14 05:32:38 -05:00
terrafrost
1d1d3a4403 Merge branch '1.0' into 2.0 2022-06-14 05:31:09 -05:00
terrafrost
85205bf6d5 SSH2: set channel closure flag elsewhere as well 2022-06-14 05:30:24 -05:00