Commit Graph

3378 Commits

Author SHA1 Message Date
terrafrost
669ba5224f SSH2: rm debug code 2018-11-23 00:50:56 -06:00
terrafrost
e006f5b326 Merge branch '2.0' 2018-11-22 21:55:51 -06:00
terrafrost
f3ea7ae986 Merge branch '1.0' into 2.0 2018-11-22 21:19:33 -06:00
terrafrost
8f2a0e6f0d System/SSH/Agent: add support for rsa-sha2-256 / rsa-sha2-512 2018-11-22 20:47:15 -06:00
terrafrost
e1961c598d Merge branch '2.0' 2018-11-22 13:33:35 -06:00
terrafrost
476cb127b1 X509: fix errors with validateDate 2018-11-22 13:28:42 -06:00
terrafrost
ec7454dd78 Tests/X509: update test for 2.0 2018-11-22 13:23:02 -06:00
terrafrost
0cb026f5a2 Merge branch '1.0' into 2.0 2018-11-22 12:50:04 -06:00
terrafrost
431b3570fa Tests/X509: add validatedate unit test 2018-11-22 12:40:32 -06:00
terrafrost
3423c74f9a Merge branch 'master' of https://github.com/phpseclib/phpseclib 2018-11-20 08:29:11 -06:00
terrafrost
9ccfaff7ba expand on eval() explanation 2018-11-20 08:26:17 -06:00
terrafrost
92f0ee0464 Merge branch '2.0' 2018-11-20 07:52:04 -06:00
terrafrost
7538b9c403 Merge branch '1.0' into 2.0 2018-11-20 07:50:46 -06:00
terrafrost
a1c45a2292
Merge pull request #1316 from bantu/ticket/1310
README: Declare 2.0 branch as LTS. #1310
2018-11-20 07:50:25 -06:00
terrafrost
0398f7a815 add ECDSA / EdDSA support 2018-11-19 12:39:21 -06:00
Andreas Fischer
403f756c82 README: Declare 2.0 branch as LTS. #1310 2018-11-14 21:42:06 +01:00
Andreas Fischer
ba91fbcd1c Merge branch '2.0'
* 2.0:
  fix order of user_error() and bitmap reset
  fix order of user_error() and bitmap reset
2018-11-11 16:25:15 +01:00
Andreas Fischer
eb4ff2f6e1 Merge pull request #1313 from sebsel/fix/user_error
fix order of user_error() and bitmap reset

* sebsel/fix/user_error:
  fix order of user_error() and bitmap reset
2018-11-11 16:23:36 +01:00
Andreas Fischer
54fb42ee3b Merge branch '1.0' into 2.0
* 1.0:
  fix order of user_error() and bitmap reset
2018-11-11 16:23:26 +01:00
Andreas Fischer
3813b18236 Merge pull request #1314 from bantu/pr-1313-on-1.0
fix order of user_error() and bitmap reset

* bantu/pr-1313-on-1.0:
  fix order of user_error() and bitmap reset
2018-11-11 16:23:20 +01:00
Sebastiaan Andeweg
396b9f1a0a fix order of user_error() and bitmap reset 2018-11-11 16:04:30 +01:00
Sebastiaan Andeweg
ca695f5bdd fix order of user_error() and bitmap reset 2018-11-09 16:36:50 +01:00
terrafrost
451949a5f3 Merge branch '2.0' 2018-11-04 00:46:10 -05:00
terrafrost
8814dc7841 Merge branch '1.0' into 2.0 2018-11-04 00:45:48 -05:00
terrafrost
20c35d9c75 1.0.12 release 2018-11-04 00:38:52 -05:00
terrafrost
11e33eecc5 Merge branch '2.0' 2018-10-27 17:44:01 -05:00
terrafrost
59bd7acf89 Merge branch '1.0' into 2.0 2018-10-27 17:43:31 -05:00
Andrey Bolonin
73d8348b70 Update .travis.yml 2018-10-27 17:42:38 -05:00
terrafrost
faa073ff2a Merge branch '2.0' 2018-10-13 08:22:38 -05:00
terrafrost
99dcf43a7a Merge branch '1.0' into 2.0 2018-10-13 08:21:22 -05:00
terrafrost
048635669e Crypt/Base: create hmac object outside of while loop 2018-10-13 08:20:09 -05:00
terrafrost
405ed06e8a Merge branch '2.0' 2018-10-13 08:18:47 -05:00
terrafrost
3119bb98e3 Merge branch '1.0' into 2.0 2018-10-13 08:15:46 -05:00
terrafrost
f0f7350045 Crypt/Base: if derived key length is 0 or less use hash length 2018-10-13 08:10:34 -05:00
terrafrost
39d3ffbeb1 Hash: use hash method for sha3 when available 2018-10-13 07:48:47 -05:00
terrafrost
3df87e8632 Merge branch '2.0' 2018-10-13 00:50:48 -05:00
terrafrost
f938922cfc Merge branch '1.0' into 2.0 2018-10-12 23:05:42 -05:00
terrafrost
2d7aadc689 Hash: tweaks to hash pre-computation 2018-10-12 23:04:57 -05:00
terrafrost
a1513eb02f Merge branch '2.0' 2018-10-12 22:44:14 -05:00
terrafrost
f5a9c0806a Merge branch '1.0' into 2.0 2018-10-12 21:44:52 -05:00
terrafrost
685e0abcc6 Hash: save hashed keys for re-use 2018-10-12 21:18:23 -05:00
terrafrost
2fdeb47dc1
Merge pull request #1300 from Slamdunk/patch-1
Explain the kraken
2018-10-09 22:45:04 -05:00
Filippo Tessarotto
19f706003e
Explain the kraken 2018-10-09 08:35:56 +02:00
terrafrost
016b252bbb Merge branch '2.0' 2018-10-08 07:36:04 -05:00
terrafrost
3e41dc7c07 Merge branch '1.0' into 2.0 2018-10-08 07:35:56 -05:00
terrafrost
f2d92cd4b2 BigInteger: rm pear.php.net link 2018-10-08 07:35:36 -05:00
terrafrost
edc51aac63 Merge branch 'master' of https://github.com/phpseclib/phpseclib 2018-10-06 14:17:30 -05:00
terrafrost
8705f4b31e SSH2: update ping method to work with exceptions 2018-10-06 11:41:15 -05:00
terrafrost
c1493a8063 Merge branch '2.0' 2018-10-06 08:02:59 -05:00
terrafrost
0a379a5386 Merge branch '1.0' into 2.0 2018-10-06 01:19:33 -05:00