3534 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
terrafrost	63b6df29a8	Merge branch '2.0'	2018-02-07 21:24:51 -06:00
terrafrost	473c980d0c	Merge branch '1.0' into 2.0	2018-02-07 21:23:21 -06:00
terrafrost	1468ef1a23	SFTP: fix issue with extended attribute on 64-bit PHP installs	2018-02-07 21:22:54 -06:00
terrafrost	7ed7ff2277	README: rm merge conflict code	2018-01-30 00:45:27 -06:00
terrafrost	489627f803	Merge branch '2.0'	2018-01-30 00:40:20 -06:00
terrafrost	2165445f39	Merge branch '1.0' into 2.0	2018-01-30 00:39:52 -06:00
terrafrost	6e9e61c7ca	README: rm patron link	2018-01-30 00:39:13 -06:00
terrafrost	44ac8f3996	Merge branch '2.0'	2018-01-22 07:26:57 -06:00
terrafrost	364e05babf	Merge branch '1.0' into 2.0	2018-01-22 07:22:29 -06:00
terrafrost	3030f08148	rm PHP 5.4 from Travis	2018-01-22 06:56:26 -06:00
terrafrost	92623daba8	BigInteger: fix issues with bitwise_xor	2018-01-22 00:38:42 -06:00
terrafrost	8879fa0018	Tests/BigInteger: add bitwise_xor test	2018-01-22 00:18:55 -06:00
terrafrost	739d826a16	Tests/X509: update for master branch	2018-01-21 13:01:24 -06:00
terrafrost	fe71957c37	Merge branch '2.0'	2018-01-21 13:01:06 -06:00
terrafrost	bb3798c731	Tests/X509: update tests for 2.0 branch	2018-01-21 12:39:38 -06:00
terrafrost	c419f1121f	Merge branch '1.0' into 2.0	2018-01-21 12:38:35 -06:00
terrafrost	8aecafc92f	X509: fix 7.2 error when extensions were removed and new ones added	2018-01-21 12:36:49 -06:00
terrafrost	c8829e7865	Tests/X509: add unit test for #1243	2018-01-21 12:14:08 -06:00
Andrey Bolonin	838e8f69c5	add php nightly tests	2018-01-17 14:04:35 +02:00
terrafrost	59faa1d253	Merge branch '2.0'	2018-01-01 13:09:18 -06:00
terrafrost	d0155508e9	Merge branch '1.0' into 2.0	2018-01-01 13:09:05 -06:00
terrafrost	49957b966d	Merge branch '2.0-channel-request-updates' into 2.0	2018-01-01 13:09:03 -06:00
terrafrost	30a11a3951	SFTP: update state cache accordingly when file becomes directory	2018-01-01 13:07:45 -06:00
terrafrost	3c96ca9fd1	Merge branch '2.0-channel-request-updates' into master-channel-request-updates	2017-12-25 19:12:57 -06:00
terrafrost	2a09816088	Merge branch '1.0-channel-request-updates' into 2.0-channel-request-updates	2017-12-25 19:11:13 -06:00
terrafrost	46b5bd413a	SSH2: more channel handling updates	2017-12-25 19:09:20 -06:00
terrafrost	56a644faa8	replace user_error with exceptions in a few more places	2017-12-23 14:32:22 -06:00
terrafrost	0571ab0e0c	Merge branch 'master' of https://github.com/phpseclib/phpseclib	2017-12-23 14:21:47 -06:00
terrafrost	239a32ff06	Merge pull request #1222 from rrran/extract_func_phpdoc ... Add PhpDoc @var for extract() functions	2017-12-23 14:18:28 -06:00
Sokolovskyy Roman	b8d826f04f	Trying to fix unit tests	2017-12-21 10:17:30 +01:00
Sokolovskyy Roman	62ee1a5747	Multiline phpdoc for extract to one liner	2017-12-21 10:14:53 +01:00
terrafrost	020fc97a1e	Merge branch '2.0'	2017-12-19 07:46:16 -06:00
terrafrost	e935c131e3	Merge branch '1.0' into 2.0	2017-12-19 07:27:55 -06:00
terrafrost	c340d62548	Crypt: some of the minimum key lengths were off	2017-12-19 07:04:36 -06:00
terrafrost	c8dae32334	Merge branch '2.0'	2017-12-18 06:52:04 -06:00
terrafrost	4bc1d7d682	Merge branch '1.0' into 2.0	2017-12-18 00:08:00 -06:00
terrafrost	354666c36d	Merge branch 'jude' into 1.0	2017-12-18 00:06:51 -06:00
terrafrost	19a46748a2	Merge branch '2.0'	2017-12-17 16:25:30 -06:00
terrafrost	37922e5b4c	Merge branch '1.0' into 2.0	2017-12-17 15:05:15 -06:00
terrafrost	6930560ae6	more adjustments for ARM CPU's	2017-12-17 14:52:43 -06:00
terrafrost	ce8ad063c7	Merge branch '2.0'	2017-12-14 23:52:18 -06:00
terrafrost	b02d78e92a	Merge branch '1.0' into 2.0	2017-12-14 23:49:10 -06:00
Remi Collet	8dc8642473	allow PHPUnit 4, 5 and 6	2017-12-14 23:25:30 -06:00
terrafrost	eefcf9c941	Merge branch 'master' of https://github.com/phpseclib/phpseclib	2017-12-14 22:49:47 -06:00
terrafrost	a5ed1acbae	Merge branch '2.0'	2017-12-14 06:34:43 -06:00
terrafrost	45d6d0aa70	Merge branch 'validation-1.0' into 2.0	2017-12-14 06:34:32 -06:00
terrafrost	36e9992508	X509: serial numbers are biginteger's	2017-12-14 06:22:55 -06:00
terrafrost	446652099a	Merge branch 'validation-1.0' into 2.0	2017-12-13 19:50:37 -06:00
terrafrost	247e969366	X509: simplify revised validation logic and add to CRL validation	2017-12-13 19:36:55 -06:00
terrafrost	340deffc98	Tests/X509: update tests to work with #1213 in 1.0	2017-12-13 19:23:12 -06:00