terrafrost
fdbf1179a2
Merge branch 'master' of https://github.com/phpseclib/phpseclib
2020-04-18 11:12:50 -05:00
terrafrost
e20b742eb0
Merge branch '3.0'
2020-04-18 10:45:51 -05:00
terrafrost
10ce0b9b21
PuTTY: comments weren't settable via toString() method
2020-04-18 10:44:15 -05:00
terrafrost
92d0cd837e
PKCS8: add extractEncryptionAlgorithm() method
2020-04-17 22:51:03 -05:00
terrafrost
0f8486cc87
allow strinable objects to be loaded instead of just strings
2020-04-13 07:58:00 -05:00
terrafrost
bc3374a2c1
Merge branch '3.0'
2020-04-08 06:16:10 -05:00
terrafrost
94d3403ed3
getLoadedFormat() threw exception for loadFormat()-loaded keys
2020-04-08 06:15:46 -05:00
terrafrost
e56f60ff3c
Merge branch '3.0'
2020-04-08 05:29:50 -05:00
terrafrost
327a13d133
$key->getLoadedFormat didn't work on EC / DSA keys
2020-04-08 05:07:47 -05:00
terrafrost
dbefc9aec6
Merge branch '3.0'
2020-04-05 15:05:03 -05:00
terrafrost
ceff4cfbbc
rm call_user_func() calls
2020-04-05 15:04:22 -05:00
terrafrost
d37dffdb81
SSH: use an anonymous function for logging callback
2020-04-05 10:29:57 -05:00
terrafrost
0d623aa83d
Merge branch '3.0'
2020-04-04 18:23:30 -05:00
terrafrost
b787c33f3f
Merge branch '2.0' into 3.0
2020-04-04 18:22:59 -05:00
terrafrost
34620af4df
CHANGELOG: add entries for 2.0.25 and 2.0.26 release notes
2020-04-04 18:17:33 -05:00
terrafrost
3be9465b72
Merge branch '3.0'
2020-04-04 13:09:36 -05:00
terrafrost
9c0ad2f1f4
SFTP: optimize call to parent login method for 2.0 branch
2020-04-04 12:49:56 -05:00
terrafrost
e02b93443c
Merge branch '1.0' into 2.0
2020-04-04 12:49:41 -05:00
terrafrost
c301ddf38f
SFTP: make it so extending SFTP class doesn't cause a segfault
2020-04-04 12:47:30 -05:00
terrafrost
3a6be79821
Merge branch '2.0' into 3.0
2020-04-04 12:25:35 -05:00
terrafrost
91e84a24c2
SFTP: optimize call to parent login method for 2.0 branch
2020-04-04 12:20:36 -05:00
terrafrost
3f01740787
Merge branch '1.0' into 2.0
2020-04-04 12:18:34 -05:00
terrafrost
5218532739
SFTP: make it so extending SFTP doesn't cause a segfault
2020-04-04 12:17:55 -05:00
terrafrost
0ad0cd1e2a
Merge branch '3.0'
2020-04-03 07:35:40 -05:00
terrafrost
76f80bb0c4
Merge branch '2.0' into 3.0
2020-04-03 07:35:32 -05:00
terrafrost
e72c88cf16
Merge branch '1.0' into 2.0
2020-04-03 07:34:08 -05:00
Tyson Andre
41eb0d8012
Fix logic error reading random bytes from /dev/urandom
...
Fixes a bug introduced in c2be7e648
Previously, this would return those bytes if the number of bytes read
was **less than** the number of bytes this was trying to read.
In practice, I believe this would mean bytes from /dev/urandom would never
get used. (Noticed when upgrading phpseclib)
2020-04-03 07:33:58 -05:00
terrafrost
5ea7be57da
Merge branch '3.0'
2020-03-30 07:50:05 -05:00
terrafrost
542bb6cca1
Merge branch '2.0' into 3.0
2020-03-30 07:36:43 -05:00
terrafrost
61398e0fbf
Merge branch '3.0'
2020-03-30 00:42:08 -05:00
terrafrost
fc87edce6e
PKCS8: throw an exception when no ASN1 maps can be used
2020-03-30 00:19:45 -05:00
terrafrost
5d5ed4a449
RSA: fix for RSA PKCS1 public keys masquerading as public keys
2020-03-29 23:31:13 -05:00
terrafrost
7b5356bf86
RSA: add unit test for public key masquerading as private key
2020-03-29 23:12:52 -05:00
terrafrost
7e67f882ee
Merge branch '1.0-mkdir-mode-adjustment' into 2.0-mkdir-mode-adjustment
2020-03-28 18:05:49 -05:00
terrafrost
5e2951f83a
SFTP: change the mode with a SETSTAT instead of MKDIR
2020-03-28 18:04:26 -05:00
terrafrost
688cc2ddf3
Merge branch '3.0'
2020-03-12 23:15:56 -05:00
terrafrost
fa4ab86913
Merge branch '2.0' into 3.0
2020-03-12 23:15:48 -05:00
terrafrost
09655fcc1f
Merge branch '1.0' into 2.0
2020-03-12 23:15:39 -05:00
terrafrost
645dc5c817
BACKERS: Jan Slabon -> Setasign
2020-03-12 23:15:34 -05:00
terrafrost
6cfa4a7ef2
Merge branch '3.0'
2020-03-12 08:27:48 -05:00
terrafrost
1004bf5ac1
Merge branch '2.0' into 3.0
2020-03-12 08:27:42 -05:00
terrafrost
7102751a8a
Merge branch '1.0' into 2.0
2020-03-12 08:27:34 -05:00
terrafrost
97d0e4164b
BACKERS: add Jan Slabon
2020-03-12 08:26:51 -05:00
terrafrost
90842f90fa
Merge branch '3.0'
2020-03-09 20:07:58 -05:00
terrafrost
ef04a176dd
Merge branch '2.0' into 3.0
2020-03-09 20:02:17 -05:00
terrafrost
63a76e88a1
Merge branch '1.0' into 2.0
2020-03-09 19:49:37 -05:00
terrafrost
229f6af1ca
SFTP: re-use SSH2 login method
2020-03-09 19:49:20 -05:00
terrafrost
4375d13574
Merge branch '3.0'
2020-03-07 22:22:07 -06:00
terrafrost
c47ffe187a
Merge branch 'master-speed-up-uploads'
2020-03-07 22:22:03 -06:00
terrafrost
2ba26e5490
Merge branch '2.0' into 3.0
2020-03-07 22:21:51 -06:00