3761 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
terrafrost	25c930cc40	SSH2: add ping() method	2018-10-06 01:19:14 -05:00
terrafrost	422533c978	Merge branch '2.0'	2018-10-05 23:01:03 -05:00
terrafrost	c88abcb777	Merge branch '1.0' into 2.0	2018-10-05 22:49:24 -05:00
terrafrost	0c26415f93	SSH2: reset $this->bitmap when the connection fails	2018-10-05 21:27:59 -05:00
terrafrost	44c2003d4b	Merge pull request #1295 from grongor/fix-wrong-method-name ... Fix invalid method name + usages in comments	2018-09-17 00:45:19 -05:00
terrafrost	4bc53f1251	Merge branch '2.0'	2018-09-17 00:29:24 -05:00
terrafrost	32ce6a0d3e	Tests/ASN1: update unit test to work on 2.0	2018-09-17 00:27:42 -05:00
terrafrost	48aa55b7f6	Merge branch '1.0' into 2.0	2018-09-17 00:27:25 -05:00
Michiel Brandenburg	b4e66d343e	Fixes #1296 parsing invalid certificate	2018-09-17 00:25:55 -05:00
Jakub Chábek	bee5fd70d8	Fix invalid method name + usages in comments	2018-09-10 17:20:48 +02:00
terrafrost	640fb24ab3	Merge branch '2.0'	2018-09-08 14:42:26 -05:00
terrafrost	f381b1feb1	Merge branch '1.0' into 2.0	2018-09-08 14:42:17 -05:00
terrafrost	f48d85ced9	SSH2: setEngine -> setPreferredEngine	2018-09-08 14:41:28 -05:00
terrafrost	086afadf1b	Merge branch '2.0'	2018-08-20 21:42:00 -05:00
terrafrost	6189452f1b	Merge branch '1.0' into 2.0	2018-08-20 21:41:18 -05:00
terrafrost	bee6183bd7	SSH2: remove utf8_decode calls	2018-08-20 20:50:07 -05:00
terrafrost	6021e74a79	Merge branch '2.0-dsas'	2018-08-18 15:04:51 -05:00