terrafrost
06e1ee6cb3
Merge branch '3.0'
2020-05-10 23:52:37 -05:00
terrafrost
85d55164a6
Merge branch '2.0' into 3.0
2020-05-10 23:52:28 -05:00
terrafrost
ceaffa8fa9
Merge branch '1.0' into 2.0
2020-05-10 23:52:20 -05:00
terrafrost
ef9785d9c5
SFTP: if /path/to/file is a file then /path/to/file/whatever errors
2020-05-10 23:51:16 -05:00
terrafrost
21e0d29a7b
Merge branch '3.0'
2020-05-10 10:27:08 -05:00
terrafrost
3bce91c2cb
Merge branch '2.0' into 3.0
2020-05-10 10:27:00 -05:00
terrafrost
f79b34f75a
Merge branch '1.0' into 2.0
2020-05-10 10:26:53 -05:00
terrafrost
bcaa494af2
ANSI: fix "Number of elements can't be negative" error
2020-05-10 10:25:03 -05:00
terrafrost
b3688c244c
Merge branch '3.0'
2020-05-01 21:36:12 -05:00
terrafrost
4af7ca4c09
Merge branch '2.0' into 3.0
2020-05-01 21:36:02 -05:00
terrafrost
2a6fc5695c
Merge branch '1.0' into 2.0
2020-05-01 21:35:53 -05:00
terrafrost
a07f5bc6a2
SFTP: realpath('') produced an error
2020-05-01 21:34:44 -05:00
terrafrost
5035e2b7e2
Merge branch '3.0'
2020-04-28 22:08:15 -05:00
terrafrost
65de0f6225
Merge branch '2.0' into 3.0
2020-04-28 22:08:07 -05:00
terrafrost
3b99d23220
Merge branch '1.0' into 2.0
2020-04-28 22:07:45 -05:00
Simon Podlipsky
e29f5bda14
Fix return type hint of SSH2::read()
2020-04-28 22:07:39 -05:00
terrafrost
08fc9615e3
Merge branch '3.0'
2020-04-19 15:39:51 -05:00
terrafrost
0b231cc53b
RSA: rm ENCRYPTION_PKCS15_COMPAT mode
2020-04-19 15:10:38 -05:00
terrafrost
8724c077e4
Merge branch 'master' of https://github.com/phpseclib/phpseclib
2020-04-19 09:20:09 -05:00
terrafrost
b48181e4e3
Merge branch '3.0'
2020-04-19 09:19:47 -05:00
terrafrost
881fbd78ee
Hash: add __toString() method
2020-04-19 09:19:27 -05:00
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