Commit Graph

3531 Commits

Author SHA1 Message Date
terrafrost
50ea988570 Merge branch '2.0' 2019-06-23 10:42:06 -05:00
Remi Collet
25469cb98f fix compat with 5.3 2019-06-21 09:25:24 +02:00
terrafrost
84b852933e Merge branch '2.0' 2019-06-19 22:36:18 -05:00
terrafrost
d2085db7b7 Merge branch '1.0' into 2.0 2019-06-19 22:34:11 -05:00
terrafrost
5e9d05a9f4 BigInteger: fix issues with divide method 2019-06-19 22:29:31 -05:00
terrafrost
d0014cbb20 Tests/BigInteger: add two more divide tests 2019-06-19 22:21:24 -05:00
Graham Campbell
02cd9309f7
Test against PHP 7.4 2019-06-17 17:34:07 +01:00
terrafrost
305d1b94f3 Merge branch '2.0' 2019-06-16 15:31:53 -05:00
terrafrost
4903467ad5 Merge branch '1.0' into 2.0 2019-06-16 15:31:45 -05:00
terrafrost
e71f203742 Merge branch 'master-callback' 2019-06-16 15:31:39 -05:00
terrafrost
82454229f6 Merge branch '2.0-callback' into 2.0 2019-06-16 15:31:31 -05:00
terrafrost
f8d8ad24fd Merge branch '1.0-callback' into 1.0 2019-06-16 15:31:22 -05:00
terrafrost
aa8a30cd81 Merge branch '2.0' 2019-06-16 11:04:31 -05:00
terrafrost
0932fb3054 Merge branch '1.0' into 2.0 2019-06-16 11:03:37 -05:00
Rubens Matrono
a7d038830c fix array_merge(): Argument #1 is not an array 2019-06-16 11:03:27 -05:00
terrafrost
0e449e8b17 X509: add support for id-RSASSA-PSS 2019-06-15 10:46:34 -05:00
terrafrost
39eda40ed7 Merge branch '2.0' 2019-06-13 01:16:37 -05:00
terrafrost
60519001db Merge branch '1.0' into 2.0 2019-06-13 01:15:54 -05:00
terrafrost
d77bb6e42b 1.0.16 release 2019-06-13 01:15:36 -05:00
terrafrost
8e0651308c SSH2: _close_channel -> close_channel 2019-06-12 22:08:48 -05:00
terrafrost
988d37e479 Merge branch '2.0' 2019-06-12 22:07:49 -05:00
terrafrost
491758f1c0 Merge branch '1.0' into 2.0 2019-06-12 22:07:27 -05:00
terrafrost
732bda2860 SSH2: close channel when a timeout occurs 2019-06-12 22:06:48 -05:00
terrafrost
cee1151f9b Merge branch '2.0' 2019-06-10 00:10:54 -05:00
terrafrost
52b7e4610c fix bad merge 2019-06-10 00:09:17 -05:00
terrafrost
6cf05541cc Merge branch '1.0' into 2.0 2019-06-09 23:46:46 -05:00
terrafrost
cd7de5723c RSA: add support for OpenSSH private keys 2019-06-09 23:42:41 -05:00
terrafrost
c5a9a66d69 DSA: pass password parameter correctly to OpenSSH::load 2019-06-08 23:18:21 -05:00
terrafrost
327f555b7c add expanded support for OpenSSH private keys 2019-06-08 22:04:54 -05:00
terrafrost
88b6337a3f RSA: fix issue with PKCS1 encryption 2019-06-08 18:58:24 -05:00
terrafrost
a431a1959a ECDSA: make it so toString() can setspecified / named curve use 2019-06-03 20:33:01 -05:00
terrafrost
557676edd9 use array type hint 2019-06-02 10:26:26 -05:00
terrafrost
30320f5a91 Merge branch '2.0-callback' into master-callback 2019-06-02 08:22:26 -05:00
terrafrost
a0fa38db6d Merge branch '1.0-callback' into 2.0-callback 2019-06-02 08:20:07 -05:00
terrafrost
e988abcdb1 SFTP: add callback parameter to get() 2019-06-02 08:19:41 -05:00
terrafrost
8e03f5bfb2 RSA: make it so PSS keys can be saved 2019-06-01 19:35:17 -05:00
terrafrost
5b89ff4177 Merge branch 'rsa-pss' 2019-06-01 16:07:48 -05:00
terrafrost
b226c3d882 add second $options parameter to toString method for public keys 2019-06-01 15:53:35 -05:00
terrafrost
8017c74429 RSA: add preliminary support for RSA-PSS keys 2019-05-29 00:32:53 -05:00
terrafrost
79f925e43c SFTP: replace user_error() with Exceptions 2019-05-28 08:52:53 -05:00
terrafrost
72b4bf74d2 SFTP: use microtime(true) 2019-05-28 08:50:22 -05:00
terrafrost
93c0880ca8 SSH2: make $timeout protected 2019-05-28 08:50:03 -05:00
terrafrost
a773ae80bd Merge branch '2.0' 2019-05-28 08:47:59 -05:00
terrafrost
06ccf5d1f9 Merge branch '1.0' into 2.0 2019-05-28 08:47:51 -05:00
terrafrost
8df35cc368 SFTP: improve handling of malformed packets 2019-05-28 08:47:34 -05:00
terrafrost
89e41233e0 fix bad merge 2019-05-26 22:56:20 -05:00
terrafrost
337b41f865 Merge branch 'master' into immutable-keys 2019-05-26 22:51:40 -05:00
terrafrost
52248669cd Merge branch '2.0' 2019-05-26 15:40:13 -05:00
terrafrost
3ca5b88d58 Merge branch '1.0' into 2.0 2019-05-26 15:38:34 -05:00
terrafrost
677ae387b0 BigInteger: backport GMP fixes from master branch 2019-05-26 15:38:18 -05:00