Commit Graph

3986 Commits

Author SHA1 Message Date
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
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
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
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
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
Liam Dennehy
a7fc232c63 getaddrinfo error message seems to be unstable, add tolerance to test 2020-08-01 02:28:56 -05:00
terrafrost
92a67a03aa Merge branch '2.0' into 3.0 2020-07-31 21:27:38 -05:00
terrafrost
5369b86808 Merge branch '1.0' into 2.0 2020-07-31 08:06:58 -05:00
terrafrost
40b4f1d557 SSH2: when building algo list look at if crypto engine is set 2020-07-31 08:05:31 -05:00
terrafrost
5fbdb8b582 Merge branch '2.0' into 3.0 2020-07-31 04:11:26 -05:00
terrafrost
4eb477051c Merge branch '1.0' into 2.0 2020-07-31 02:50:00 -05:00
terrafrost
c7d7b36018 SSH2: don't try to login as none auth method for CoreFTP server 2020-07-31 02:49:21 -05:00
terrafrost
abe8f6aab8 Merge branch '2.0' into 3.0 2020-07-30 22:59:13 -05:00
terrafrost
82406869fb Merge branch '1.0' into 2.0 2020-07-30 22:58:56 -05:00
terrafrost
ea653e1b01 SFTP: add enableDatePreservation() / disableDatePreservation() 2020-07-30 09:12:23 -05:00
Vincent Langlet
05a564c136 Return false by default 2020-07-30 15:42:02 +02:00
terrafrost
478672607c PKCS8: fix E_NOTICE 2020-07-19 22:40:42 -05:00
terrafrost
8af870963a Merge branch '2.0' into 3.0 2020-07-17 07:55:11 -05:00
terrafrost
64708aed3b Merge branch '1.0' into 2.0 2020-07-17 07:54:02 -05:00
terrafrost
d077c7b296 X509: really looong base64 encoded strings broke extractBER() 2020-07-17 07:53:05 -05:00
terrafrost
e2fa9f3925 Revert "..."
This reverts commit 827607575a.
2020-07-08 08:48:48 -05:00
terrafrost
6e4f6dab1b Merge branch '2.0' into 3.0 2020-07-08 04:13:28 -05:00
terrafrost
d1ca58cf33 CHANGELOG: there already was a 2.0.27 release.. 2020-07-08 04:08:33 -05:00
terrafrost
f0fc371a2a 2.0.27 release 2020-07-08 04:05:48 -05:00
terrafrost
9e81c7e257 Merge branch '2.0' into 3.0 2020-07-07 23:47:47 -05:00
terrafrost
c89cd789f4 Merge branch '1.0' into 2.0 2020-07-07 23:47:41 -05:00
terrafrost
d8e39b0864 SFTP: change upload packet size from 4KB to 32KB 2020-07-07 23:47:17 -05:00
terrafrost
30eed17c2f Merge branch '2.0' into 3.0 2020-07-07 23:35:22 -05:00
terrafrost
6a13b52d80 Merge branch '1.0' into 2.0 2020-07-07 23:35:07 -05:00
terrafrost
6537e74746 1.0.19 release 2020-07-07 23:31:58 -05:00
terrafrost
827607575a ... 2020-07-03 13:31:37 -05:00
terrafrost
844d7ab539 X509: getPublicKey() didn't work for SPKAC 2020-06-02 08:51:04 -05:00
terrafrost
97ab584c63 Merge branch '2.0' into 3.0 2020-05-31 12:22:45 -05:00
terrafrost
51f2a9386b Merge branch 'timeout-alt-2.0' into 2.0 2020-05-31 12:22:35 -05:00
terrafrost
c2ab2a4884 X509: publicKey wasn't being loaded for CSRs / SPKACs 2020-05-31 02:11:44 -05:00
terrafrost
0bda2b4573 Merge branch '2.0' into 3.0 2020-05-29 08:36:26 -05:00
terrafrost
cc3ad79058 Crypt/Base: create_function isn't needed for PHP >= 5.3.0 2020-05-29 08:34:40 -05:00
terrafrost
ee278f3062 Merge branch 'timeout-alt-1.0' into timeout-alt-2.0 2020-05-29 08:10:36 -05:00
terrafrost
9651d075e3 SSH2: timeout after 5s for channel closures 2020-05-29 08:10:03 -05:00