12 Commits

Author	SHA1	Message	Date
terrafrost	8fb4c3363d	undo merging of master to 2.0 branch	2016-04-28 15:34:10 -05:00
terrafrost	b4cf10fc94	Revert "Merge branch '2.0'" ... This reverts commit be5f4ef6b19c82f6c898708cc8e1828b05e3d4e8, reversing changes made to 638fe6971c.	2016-04-10 11:30:59 -05:00
terrafrost	4b69dcb1ca	Revert "Merge remote-tracking branch 'bantu/bootstrap'" ... This reverts commit ef04c870e9, reversing changes made to cd57bf31ae.	2016-04-10 11:25:31 -05:00
terrafrost	ec3fe7277b	RSA: move key format handling to plugins	2015-10-01 15:41:11 -05:00
Andreas Fischer	4387b64426	Merge branch '1.0' into 2.0 ... * 1.0: Fixed another case Minor tweaks Fixed error More fixes PHPDoc fixes Conflicts: phpseclib/Crypt/Random.php phpseclib/Math/BigInteger.php phpseclib/Net/SSH2.php tests/Functional/Net/SFTPUserStoryTest.php	2015-09-14 01:27:04 +02:00
Graham Campbell	eec8c9cb5d	More fixes	2015-09-06 12:39:14 +01:00
Clint Nelissen	fe742e18d7	Namespaced Crypt Package	2014-12-16 16:16:54 -08:00
Andreas Fischer	3f912eed59	Merge pull request #554 from cnelissen/NamespaceFilePackage ... Namespace file package * cnelissen/NamespaceFilePackage: Namespaced classes	2014-12-12 17:55:44 +01:00
Clint Nelissen	cea5e317b6	Namespaced classes	2014-12-09 16:53:05 -08:00
Andreas Fischer	0efae5a91e	Change copyright years from roman numeral to decimal numbers.	2014-12-10 00:04:08 +01:00
terrafrost	231566c1fb	X509: Unit test CS changes	2014-06-05 09:23:22 -05:00
terrafrost	4a98679519	X509: move location of SPKAC unit test	2014-06-05 09:03:17 -05:00