terrafrost
|
a25c841108
|
Merge remote-tracking branch 'upstream/master' into php5-updates
|
2017-01-17 22:40:24 -06:00 |
|
terrafrost
|
b9b4f67a0f
|
Net: add public / private / protected
|
2017-01-17 10:23:28 -06:00 |
|
terrafrost
|
c8c61055d1
|
Merge branch '2.0'
|
2016-12-24 21:34:30 -06:00 |
|
terrafrost
|
95335f9560
|
SSH2: update PTY changes for 2.0 branch
|
2016-12-24 21:20:13 -06:00 |
|
terrafrost
|
6aa31b2cd1
|
Merge branch '1.0' into 2.0
|
2016-12-24 21:10:50 -06:00 |
|
terrafrost
|
785b477605
|
Merge branch 'pty-enhancement' into 1.0
|
2016-12-24 20:28:19 -06:00 |
|
terrafrost
|
2a7c99ef1b
|
...
|
2016-12-17 17:22:11 -06:00 |
|
terrafrost
|
a72a168400
|
Merge branch '1.0' into 2.0
|
2016-12-17 17:03:08 -06:00 |
|
vladimirghetau
|
d80794b1d9
|
exec authentication, code reuse
|
2016-12-17 16:37:04 -06:00 |
|
terrafrost
|
b26f14e5fe
|
SSH2: make it so disabling PTY closes exec() channel if it's open
|
2016-12-17 16:09:48 -06:00 |
|
terrafrost
|
2a1177b256
|
SymmetricCiphers: add public / private / protected as appropriate
|
2016-12-07 22:19:20 -06:00 |
|
terrafrost
|
c852bae3c8
|
use short array syntax for arrays
|
2016-11-30 21:29:38 -06:00 |
|
terrafrost
|
72a6aab872
|
Merge branch 'master' of https://github.com/phpseclib/phpseclib
|
2016-11-29 23:18:44 -06:00 |
|
terrafrost
|
e34e5f5135
|
Merge branch '2.0'
|
2016-11-29 23:00:03 -06:00 |
|
terrafrost
|
024ac81d04
|
Merge branch '1.0' into 2.0
|
2016-11-29 19:26:11 -06:00 |
|
terrafrost
|
d0cb855bbc
|
Merge branch '1.0-suppress-unpack-errors' into 1.0
|
2016-11-29 19:16:16 -06:00 |
|
terrafrost
|
81bae5ce8b
|
Merge pull request #1061 from terrafrost/pkcs18-rewrite
RSA: refactor PKCS1/PKCS8 to facilitate re-use
|
2016-11-29 19:15:21 -06:00 |
|
terrafrost
|
865904f636
|
Merge branch '2.0'
|
2016-11-20 18:13:48 -06:00 |
|
terrafrost
|
de3bb2e300
|
Merge branch '1.0' into 2.0
|
2016-11-20 18:13:41 -06:00 |
|
terrafrost
|
6fb34887c5
|
SFTP: change queue size to 32 (max packet size is 32kb so 32*32=1M)
|
2016-11-20 18:13:01 -06:00 |
|
terrafrost
|
ad03dcad1c
|
Merge branch '2.0'
|
2016-11-20 18:05:02 -06:00 |
|
terrafrost
|
27a6b6362a
|
Merge branch '1.0' into 2.0
|
2016-11-20 18:04:55 -06:00 |
|
terrafrost
|
a2d9622bf9
|
SFTP: update directory deletion check (#1059)
|
2016-11-20 18:03:01 -06:00 |
|
terrafrost
|
6807791d42
|
Merge branch '2.0'
|
2016-11-20 11:14:48 -06:00 |
|
terrafrost
|
abf3899e1f
|
Merge branch '1.0' into 2.0
|
2016-11-20 11:14:35 -06:00 |
|
terrafrost
|
7cb66ea56e
|
SSH2: don't use timeout value of 0 for fsockopen
|
2016-11-20 11:08:53 -06:00 |
|
terrafrost
|
48cf16599b
|
suppress unpack() PHP warnings
|
2016-11-19 22:39:36 -06:00 |
|
terrafrost
|
b8e1a15291
|
Merge branch '2.0'
|
2016-11-19 20:40:04 -06:00 |
|
terrafrost
|
f981310266
|
Merge branch '1.0' into 2.0
|
2016-11-19 20:39:58 -06:00 |
|
terrafrost
|
b70cb87641
|
SFTP: don't delete directory if $path is empty
|
2016-11-19 20:39:05 -06:00 |
|
terrafrost
|
d1fa327ef9
|
Merge branch '2.0'
|
2016-11-18 20:48:18 -06:00 |
|
terrafrost
|
51bafdebe2
|
SFTP: CS adjustment
|
2016-11-18 20:48:01 -06:00 |
|
terrafrost
|
d6bf2b4f73
|
Merge branch '2.0'
|
2016-11-18 20:37:26 -06:00 |
|
terrafrost
|
8b4208ee60
|
SFTP: logging didn't work correctly in 2.0 branch
|
2016-11-18 20:37:08 -06:00 |
|
terrafrost
|
272ae9c64c
|
Merge branch 'master' into pkcs18-rewrite
|
2016-11-17 08:10:55 -06:00 |
|
terrafrost
|
863ff6789b
|
RSA: refactor PKCS1/PKCS8 to facilitate re-use
|
2016-11-17 08:09:10 -06:00 |
|
terrafrost
|
2d2bf2990e
|
Merge branch '2.0'
|
2016-11-08 09:23:53 -06:00 |
|
terrafrost
|
a47eccf6f9
|
Merge branch '1.0' into 2.0
|
2016-11-08 09:22:05 -06:00 |
|
terrafrost
|
535104cb84
|
SSH2: send the identifier first, before reading it
|
2016-11-08 09:11:57 -06:00 |
|
Łukasz Bajsarowicz
|
e837cc2054
|
Incorrect namespace hint
|
2016-11-04 02:25:56 -05:00 |
|
terrafrost
|
8019baee62
|
BigInteger: add randomRange / randomPrimeRange
...and redo random / randomPrime such that they take the byte size
as the parameter instead of the range.
|
2016-09-17 19:48:51 -07:00 |
|
terrafrost
|
c17a2604a0
|
Merge branch 'master-reorg'
|
2016-09-17 09:15:11 -07:00 |
|
terrafrost
|
c1d407d7cf
|
Merge branch '1.0' into 2.0
|
2016-09-11 21:22:53 -07:00 |
|
terrafrost
|
ff7bc85a8f
|
SFTP: backport "parallel" upload code from master branch
|
2016-09-11 21:11:52 -07:00 |
|
terrafrost
|
03937a7933
|
Merge branch '2.0'
|
2016-09-10 11:16:52 -07:00 |
|
terrafrost
|
222ad56285
|
Merge branch '1.0' into 2.0
|
2016-09-10 11:04:52 -07:00 |
|
terrafrost
|
845135f887
|
add PHP5-style constructors along side PHP4-style ones
|
2016-09-10 10:41:05 -07:00 |
|
terrafrost
|
6f22a957c2
|
Merge branch '2.0'
|
2016-08-28 23:17:11 -05:00 |
|
terrafrost
|
f30f8045fd
|
Merge branch '1.0' into 2.0
|
2016-08-28 23:17:06 -05:00 |
|
Michel Bardelmeijer
|
1eda62913a
|
Handle empty fread return correctly which resolves zero-byte file issues
|
2016-08-28 23:16:53 -05:00 |
|