danog/phpseclib
1
0
Fork 0
mirror of https://github.com/danog/phpseclib.git synced 2024-12-14 10:07:32 +01:00
Code Issues Projects Releases Wiki Activity
3,836 Commits 6 Branches 31 Tags 19 MiB
5492361206
Commit Graph

3836 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
terrafrost
5492361206 Merge branch '3.0' 2020-11-01 09:31:28 -06:00
terrafrost
7e337c9bd7 Merge branch '2.0' into 3.0 2020-11-01 09:31:17 -06:00
terrafrost
e18880009b Merge branch '1.0' into 2.0 2020-10-31 15:15:06 -05:00
Thomas A. Hirsch
b2ae60f0a9 $progressCallback should be called after a specific amount of data has been received and not, if its just requested, as the requested packets might be more as the available and received data. 2020-10-31 15:05:05 -05:00
terrafrost
e220455d27 Merge branch '3.0' 2020-10-30 05:57:46 -05:00
terrafrost
336fe5c8f8 Merge branch '2.0' into 3.0 2020-10-29 21:46:30 -05:00
terrafrost
a72e0e7456 Tests/X509: update unit test for 2.0 branch 2020-10-29 21:35:59 -05:00
terrafrost
da96fbd212 Merge branch '1.0' into 2.0 2020-10-29 21:35:41 -05:00
terrafrost
00c9edc058 X509: don't attempt to parse multi-cert PEMs 2020-10-29 21:30:01 -05:00
terrafrost
92eb7b670f Merge branch '3.0' 2020-09-19 08:55:40 -05:00
terrafrost
5983df848c EC: add support for PKCS1 private keys with separate parameters 2020-09-19 08:36:09 -05:00
terrafrost
07ae7972e9 Merge branch '3.0' 2020-09-11 21:23:49 -05:00
William Desportes
480af6b980
Merge branch '2.0' into 3.0 2020-09-09 10:46:22 +02:00
William Desportes
05f6467b1d
Merge branch '1.0' into 2.0 2020-09-09 09:56:23 +02:00
William Desportes
2ae683479a
Fix phpdoc errors 2020-09-09 09:43:26 +02:00
terrafrost
272b6b2cfb Merge branch '3.0' 2020-09-07 23:24:55 -05:00
terrafrost
c6d51fc87e Merge branch '2.0' into 3.0 2020-09-07 23:24:49 -05:00
terrafrost
497856a8d9 add 2.0.29 release 2020-09-07 23:24:43 -05:00
terrafrost
e026c54e41 Merge branch 'master' of https://github.com/phpseclib/phpseclib 2020-08-31 05:17:47 -05:00
terrafrost
95ffb5caa0 Merge branch '3.0' of https://github.com/phpseclib/phpseclib into 3.0 2020-08-31 05:16:55 -05:00
terrafrost
734d728c75 Merge branch '2.0' of https://github.com/phpseclib/phpseclib into 2.0 2020-08-31 05:14:36 -05:00
terrafrost
2e9d5a99c7 Merge branch '1.0' of https://github.com/phpseclib/phpseclib into 1.0 2020-08-31 05:13:38 -05:00
terrafrost
14d546c002 Merge branch '3.0' 2020-08-30 08:22:26 -05:00
terrafrost
fc4a1b0083 Merge branch '2.0' into 3.0 2020-08-30 08:22:20 -05:00
terrafrost
604b94d011 Merge branch '1.0' into 2.0 2020-08-30 08:22:13 -05:00
terrafrost
f4e017f383 SFTP: "fix" rare resource not closed error 2020-08-30 08:21:50 -05:00
Andreas Fischer
4e90b2e82f Merge branch '3.0' 
* 3.0:
  Remove api from build target
 2020-08-21 19:35:49 +02:00
Andreas Fischer
fe00f1667e Merge branch '2.0' into 3.0 
* 2.0:
  Remove api from build target
 2020-08-21 19:35:49 +02:00
Andreas Fischer
a25d4980f1 Merge branch '1.0' into 2.0 
* 1.0:
  Remove api from build target
 2020-08-21 19:35:49 +02:00
Andreas Fischer
cee2ffc064 Merge pull request #1515 from code-lts/1.0-build 
Remove api from build target

* github.com:phpseclib/phpseclib:
  Remove api from build target
 2020-08-21 19:35:48 +02:00
William Desportes
3fe698e9ae
Remove api from build target 2020-08-21 18:46:51 +02:00
Andreas Fischer
51143184c1 Merge branch '3.0' 
* 3.0:
  Move Doctum config files to phpseclib/api-docs
 2020-08-21 18:20:59 +02:00
Andreas Fischer
2285601cf3 Merge branch '2.0' into 3.0 
* 2.0:
  Move Doctum config files to phpseclib/api-docs
 2020-08-21 18:20:24 +02:00
Andreas Fischer
901382d724 Merge branch '1.0' into 2.0 
* 1.0:
  Move Doctum config files to phpseclib/api-docs
 2020-08-21 18:19:41 +02:00
Andreas Fischer
de49d701b0 Merge pull request #1513 from code-lts/master 
Move Doctum config files to phpseclib/api-docs

* github.com:phpseclib/phpseclib:
  Move Doctum config files to phpseclib/api-docs
 2020-08-21 18:18:32 +02:00
William Desportes
ceab38e0b8
Move Doctum config files to phpseclib/api-docs 
Fixes: #1365
Closes: #416
Closes: #1506
 2020-08-21 18:06:03 +02:00
terrafrost
b83bbd6742 Merge branch '3.0' 2020-08-17 07:30:52 -05:00
terrafrost
dcc85b795d Merge branch '2.0' into 3.0 2020-08-17 07:30:46 -05:00
terrafrost
f0710fc77e Merge branch '1.0' into 2.0 2020-08-17 07:29:12 -05:00
terrafrost
ded9b3043f SSH2: suppress 'broken pipe' errors 2020-08-17 07:28:17 -05:00
terrafrost
c4a7e40ebe Merge branch '3.0' 2020-08-09 11:01:08 -05:00
terrafrost
8f62b798ef Merge branch '2.0' into 3.0 2020-08-09 11:00:57 -05:00
terrafrost
ed20bba5e7 Merge branch '1.0' into 2.0 2020-08-09 11:00:49 -05:00
terrafrost
239bc63618 SSH2: uploads on low speed networks could get in infinite loop 2020-08-09 11:00:12 -05:00
terrafrost
75632c19f0 Merge branch '3.0' 2020-08-01 04:08:14 -05:00
terrafrost
f6e85053e1 Merge branch '2.0' into 3.0 2020-08-01 04:08:06 -05:00
terrafrost
0747be3d27 Merge branch '1.0' into 2.0 2020-08-01 04:06:57 -05:00
terrafrost
a019cf3f33
Merge pull request #1503 from VincentLanglet/default 
_parseKey should return false by default
 2020-08-01 04:05:17 -05:00
terrafrost
1a76e62a41 Merge branch '3.0' 2020-08-01 02:31:42 -05:00
Liam Dennehy
a7fc232c63 getaddrinfo error message seems to be unstable, add tolerance to test 2020-08-01 02:28:56 -05:00