731 Commits

Author	SHA1	Message	Date
terrafrost	16abd15089	SSH2: micro-optimization for AES-GCM	2019-03-23 21:41:52 -05:00
terrafrost	70f5eb4bf7	SSH2: Rijndael -> AES (for consistency)	2019-03-23 20:53:20 -05:00
terrafrost	539fc1a9b0	SSH2: CS adjustments	2019-03-23 19:20:06 -05:00
terrafrost	7d41903846	Merge branch '2.0'	2019-03-23 19:18:31 -05:00
terrafrost	b9f7f0c021	Merge branch '1.0' into 2.0	2019-03-23 18:43:04 -05:00
terrafrost	f111bf94b6	SSH2: fix issue with reconnecting via ping()	2019-03-23 18:42:40 -05:00
terrafrost	494d20efc8	add Salsa20 / ChaCha20 stream ciphers	2019-03-22 15:45:36 -05:00
terrafrost	0f87a0e026	SSH2: CS adjustment	2019-01-20 09:39:12 -06:00
terrafrost	c03753e3c7	Merge branch '2.0'	2019-01-20 09:17:57 -06:00
terrafrost	004a71ce19	Merge branch '1.0' into 2.0	2019-01-20 09:15:53 -06:00
terrafrost	e5ff894d4b	SSH2: add missing constant	2019-01-20 09:12:43 -06:00
terrafrost	ea3c8dbd9a	Merge branch '2.0'	2019-01-16 21:17:18 -06:00
terrafrost	f8ff1aa27f	Merge branch '1.0' into 2.0	2019-01-16 21:16:17 -06:00
terrafrost	b0d63fbfb5	SSH2: ssh-rsa is sometimes incorrectly used instead of rsa-sha2-256	2019-01-16 21:15:11 -06:00
terrafrost	3f6eb2012a	Merge branch '2.0'	2019-01-15 23:50:33 -06:00
terrafrost	31fbdb96e0	Merge branch '1.0' into 2.0	2019-01-15 23:48:54 -06:00
terrafrost	055d6097af	SSH2: more strictly adhere to RFC8332 for rsa-sha2-256/512	2019-01-15 23:41:49 -06:00
terrafrost	835b1207fa	SSH2: replace "$this->object !== false" with "$this->object"	2018-12-31 14:14:43 -06:00
terrafrost	17e6938fba	updates to Exceptions	2018-12-31 09:55:32 -06:00
terrafrost	97d41fd3aa	SSH2: make bad_algorithm_candidate method static	2018-12-29 20:54:18 -06:00
terrafrost	01c92a59f8	add support for Galois/Counter Mode (GCM)	2018-12-27 08:31:35 -06:00
terrafrost	b76a67dfb4	Merge branch '2.0'	2018-12-16 11:45:37 -06:00
terrafrost	42603ce3f4	Merge branch '1.0' into 2.0	2018-12-16 11:45:25 -06:00
terrafrost	a9c0e2d430	SSH2: setTimeout(0) didn't work as intended	2018-12-16 11:44:58 -06:00
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
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	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
Jakub Chábek	bee5fd70d8	Fix invalid method name + usages in comments	2018-09-10 17:20:48 +02: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
Simon Podlipsky	d598204874	Fix return type for Read()	2018-07-22 14:17:15 +03:00
terrafrost	ffb21d7622	SSH/Agent: fix bad merge	2018-05-27 11:27:19 -05:00
terrafrost	03f9a4dc7e	Merge branch '2.0'	2018-05-27 10:54:36 -05:00
terrafrost	04f62f9e9c	SSH2: adjustments for 2.0 branch	2018-05-27 10:48:03 -05:00
terrafrost	0b2eb54a29	Merge branch '2.0'	2018-05-27 09:55:45 -05:00
terrafrost	2113ffb72c	Merge branch '1.0' into 2.0	2018-05-27 09:52:52 -05:00
terrafrost	b57976ec5f	SSH2: add support for rsa-sha2-256 / rsa-sha2-512 (RFC8332)	2018-05-27 09:48:44 -05:00
terrafrost	8da15ab19b	Merge branch '2.0'	2018-05-19 07:48:42 -05:00
terrafrost	bf71150433	Merge branch '1.0' into 2.0	2018-05-19 07:48:33 -05:00
terrafrost	9b49d3c590	SSH2: fixes relating to delayed global requests	2018-05-19 07:45:44 -05:00
luz.paz	380517ef00	Misc. trivial typos ... Found via `codespell -q 3`	2018-03-03 07:07:14 -05: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	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	62ee1a5747	Multiline phpdoc for extract to one liner	2017-12-21 10:14:53 +01:00
Sokolovskyy Roman	c705e7d9c6	Add PhpDoc @var for extract() functions	2017-12-04 11:11:43 +01:00
Sokolovskyy Roman	966ee7f170	Long array() to short [] syntax	2017-11-27 09:30:14 +01:00
terrafrost	2314b638c7	Merge pull request #1212 from rrran/func_get_args_to_tripple_dots ... Get rid of func_get_args()	2017-11-23 10:02:59 -06:00
terrafrost	e2e719ee29	Merge branch '2.0'	2017-11-23 09:37:26 -06:00
terrafrost	6e9ece958b	Merge branch '1.0' into 2.0	2017-11-23 09:33:35 -06:00
terrafrost	309fa0af44	SSH/SFTP: more adustments to channel handling	2017-11-23 09:31:34 -06:00
Sokolovskyy Roman	ee8f5e9769	Get rid of func_get_args()	2017-11-21 09:36:28 +01:00
terrafrost	3065d24b0d	$this->_string_shift -> Strings::shift	2017-11-13 09:27:11 -06:00
terrafrost	e91da39098	Merge branch '2.0'	2017-11-11 23:16:23 -06:00
terrafrost	6a65ea28ec	Merge branch '1.0' into 2.0	2017-11-11 23:15:00 -06:00
terrafrost	b50dde76f5	SSH2: update channel handling in a few more places	2017-11-11 23:08:08 -06:00
terrafrost	c66b31e698	Merge branch '2.0'	2017-11-11 16:13:48 -06:00
terrafrost	1f7e03b43d	Merge branch '1.0-multi-channel-adjustment' into 2.0	2017-11-11 16:00:05 -06:00
terrafrost	0afde6ea43	SSH2: updates to dealing with extraneous channel packets	2017-11-11 15:14:04 -06:00
terrafrost	ec579bd9ed	revisions to rrran's PHPDoc changes	2017-11-05 14:35:27 -06:00
Sokolovskyy Roman	f40ea062c2	Lots of PHPDoc fixes	2017-10-25 11:44:14 +02:00
terrafrost	4f2ece4d7d	Merge remote-tracking branch 'rrran/Bugfixes2'	2017-09-30 22:50:06 +01:00
terrafrost	fc6a97083c	Merge branch '2.0'	2017-09-29 21:34:51 +01:00
Martijn Smit	b3add4491d	Replace extension_loaded with forward compatible function exists check	2017-09-29 21:33:57 +01:00
Sokolovskyy Roman	4f399d5c33	Merge remote-tracking branch 'origin/master' into Bugfixes2	2017-09-11 11:13:03 +02:00
terrafrost	1fafe157d6	SSH2: fix bad merge	2017-09-06 00:44:38 -05:00
terrafrost	e50d8ea51c	Merge branch '1.0' into ssh2-fix-multi-channel-1.0	2017-09-06 00:30:11 -05:00
terrafrost	ac19043c8b	Merge branch 'ssh2-fix-multi-channel-2.0' into ssh2-fix-multi-channel-master	2017-09-05 23:42:05 -05:00
terrafrost	eeaef39827	Merge branch 'ssh2-fix-multi-channel-1.0' into 2.0	2017-09-05 23:22:09 -05:00
terrafrost	ee3fd38682	SSH2: fix typo in comment found by Iewa	2017-08-29 07:42:51 -05:00
terrafrost	a3325d102e	SSH2: don't choke when getting response from diff channel in exec()	2017-08-29 00:17:48 -05:00
terrafrost	ae210871e3	Merge branch '2.0'	2017-08-28 22:45:18 -05:00
terrafrost	e669624ef5	Merge branch '1.0' into 2.0	2017-08-28 22:45:09 -05:00
terrafrost	c7e67721a2	SSH2: CS adjustment	2017-08-28 22:44:58 -05:00
terrafrost	ee5172ece5	Merge branch 'arcfour256-fix-2.0'	2017-08-27 12:33:19 -05:00
terrafrost	c4be683936	Merge branch 'arcfour256-fix-1.0' into 2.0	2017-08-27 02:43:31 -05:00
terrafrost	e5b4eef91f	SSH2: workaround for bad arcfour256 implementations	2017-08-26 20:17:59 -05:00
terrafrost	b27655a262	Merge branch '2.0'	2017-08-24 23:56:08 -05:00
terrafrost	4202f653ef	Merge branch '1.0' into 2.0	2017-08-24 23:55:27 -05:00
terrafrost	9cbfd23cb6	SSH2: assume any SSH server >= 1.99 supports SSH2	2017-08-24 23:52:27 -05:00
Sokolovskyy Roman	25c1ae6e00	Merge remote-tracking branch 'origin/master' into Bugfixes2	2017-08-09 12:28:02 +02:00
terrafrost	3fcce89f78	Merge remote-tracking branch 'rrran/Bugfixes'	2017-08-07 21:47:06 -05:00
terrafrost	93a3139475	Merge branch 'pre-1157-changes'	2017-08-07 21:46:28 -05:00
terrafrost	520c56a797	Merge branch 'send-kex-and-id-first-or-last-2.0'	2017-08-07 20:09:26 -05:00
terrafrost	dfb6770891	Merge branch 'send-kex-and-id-first-or-last-1.0' into 2.0	2017-08-07 18:37:11 -05:00
terrafrost	7ccb0d0b02	SSH2: send KEXINIT packet and identification string first or last	2017-08-07 00:34:58 -05:00
terrafrost	9f540a82e6	minor fixes to X509 and SSH2	2017-08-06 17:29:30 -05:00
Sokolovskyy Roman	55cacdf7cd	More PHPDOC fixes	2017-08-04 12:06:25 +02:00
Sokolovskyy Roman	0fd58aeb7e	Set of PHPDOC fixes ... Fixed methods visibility	2017-08-03 09:19:11 +02:00
terrafrost	4171262b9e	SymmetricKey: use strings for constructor and setPreferredEngine	2017-06-28 06:54:10 -05:00
terrafrost	0bbac3ebed	Merge branch '2.0'	2017-06-19 22:37:21 -05:00
terrafrost	3cbb9516ef	Merge branch '1.0' into 2.0	2017-06-19 22:35:22 -05:00
terrafrost	b6eb7b2009	Merge branch '2.0'	2017-06-19 22:34:28 -05:00
terrafrost	9814140055	Merge branch '1.0' into 2.0	2017-06-19 22:34:20 -05:00
Moritz Kornher	7606f81279	Add new mode READ_NEXT to only ready the next packet from the channel.	2017-06-19 22:33:08 -05:00
terrafrost	8ea3edf0d2	Merge branch '2.0'	2017-06-12 22:37:06 -05:00
terrafrost	9d0c924cbd	Merge branch '1.0' into 2.0	2017-06-12 22:36:58 -05:00
Sidney Souza	4d36e67bee	Fix Invalid HMAC for D-link DES-3028 ... When I tried connect to a dlink switch the Net_SSH2 does not choose the correct algorithms for hmac causing an Invalid HMAC error. However, after I commented the line 1280 everything work magnificently	2017-06-12 22:36:30 -05:00
terrafrost	a312a1d4f0	SSH2: update a few function calls to work with renamed methods	2017-05-28 09:44:38 -05:00
terrafrost	9cbf357ac5	Merge branch '2.0'	2017-03-01 22:27:31 -06:00
terrafrost	ecb92ad25c	Merge branch '1.0' into 2.0	2017-03-01 22:27:00 -06:00
terrafrost	8abc0ee60c	SSH2: include <pre> tags in getLog result when SAPI isn't CLI	2017-03-01 22:26:29 -06:00
terrafrost	9f4f288005	Merge branch '1.0' into 2.0	2017-03-01 22:24:59 -06:00
terrafrost	b8ceb96bd4	SSH2: include <pre> tags in getLog result when SAPI isn't CLI	2017-03-01 22:18:38 -06:00
terrafrost	a25c841108	Merge remote-tracking branch 'upstream/master' into php5-updates	2017-01-17 22:40:24 -06:00
terrafrost	b9b4f67a0f	Net: add public / private / protected	2017-01-17 10:23:28 -06:00
terrafrost	c8c61055d1	Merge branch '2.0'	2016-12-24 21:34:30 -06:00
terrafrost	95335f9560	SSH2: update PTY changes for 2.0 branch	2016-12-24 21:20:13 -06:00
terrafrost	6aa31b2cd1	Merge branch '1.0' into 2.0	2016-12-24 21:10:50 -06:00
terrafrost	785b477605	Merge branch 'pty-enhancement' into 1.0	2016-12-24 20:28:19 -06:00
terrafrost	2a7c99ef1b	...	2016-12-17 17:22:11 -06:00
terrafrost	a72a168400	Merge branch '1.0' into 2.0	2016-12-17 17:03:08 -06:00
vladimirghetau	d80794b1d9	exec authentication, code reuse	2016-12-17 16:37:04 -06:00
terrafrost	b26f14e5fe	SSH2: make it so disabling PTY closes exec() channel if it's open	2016-12-17 16:09:48 -06:00
terrafrost	2a1177b256	SymmetricCiphers: add public / private / protected as appropriate	2016-12-07 22:19:20 -06:00
terrafrost	c852bae3c8	use short array syntax for arrays	2016-11-30 21:29:38 -06:00
terrafrost	72a6aab872	Merge branch 'master' of https://github.com/phpseclib/phpseclib	2016-11-29 23:18:44 -06:00
terrafrost	e34e5f5135	Merge branch '2.0'	2016-11-29 23:00:03 -06:00
terrafrost	024ac81d04	Merge branch '1.0' into 2.0	2016-11-29 19:26:11 -06:00
terrafrost	d0cb855bbc	Merge branch '1.0-suppress-unpack-errors' into 1.0	2016-11-29 19:16:16 -06:00
terrafrost	81bae5ce8b	Merge pull request #1061 from terrafrost/pkcs18-rewrite ... RSA: refactor PKCS1/PKCS8 to facilitate re-use	2016-11-29 19:15:21 -06:00
terrafrost	6807791d42	Merge branch '2.0'	2016-11-20 11:14:48 -06:00
terrafrost	abf3899e1f	Merge branch '1.0' into 2.0	2016-11-20 11:14:35 -06:00
terrafrost	7cb66ea56e	SSH2: don't use timeout value of 0 for fsockopen	2016-11-20 11:08:53 -06:00
terrafrost	48cf16599b	suppress unpack() PHP warnings	2016-11-19 22:39:36 -06:00
terrafrost	272ae9c64c	Merge branch 'master' into pkcs18-rewrite	2016-11-17 08:10:55 -06:00
terrafrost	863ff6789b	RSA: refactor PKCS1/PKCS8 to facilitate re-use	2016-11-17 08:09:10 -06:00
terrafrost	2d2bf2990e	Merge branch '2.0'	2016-11-08 09:23:53 -06:00
terrafrost	a47eccf6f9	Merge branch '1.0' into 2.0	2016-11-08 09:22:05 -06:00
terrafrost	535104cb84	SSH2: send the identifier first, before reading it	2016-11-08 09:11:57 -06:00
terrafrost	8019baee62	BigInteger: add randomRange / randomPrimeRange ... ...and redo random / randomPrime such that they take the byte size as the parameter instead of the range.	2016-09-17 19:48:51 -07:00
terrafrost	c17a2604a0	Merge branch 'master-reorg'	2016-09-17 09:15:11 -07:00
terrafrost	845135f887	add PHP5-style constructors along side PHP4-style ones	2016-09-10 10:41:05 -07:00
terrafrost	da0c41ddac	Merge branch '2.0'	2016-08-11 23:10:43 -05:00
terrafrost	c20b661a44	SSH2: don't check for carriage return in version id string	2016-08-11 23:09:38 -05:00
klemens	dd23d91d41	spelling fixes	2016-08-04 00:47:52 -05:00
terrafrost	c547ee16c7	Merge branch '1.0' into 2.0	2016-08-04 00:31:15 -05:00
klemens	dca95ac662	spelling fixes	2016-08-04 00:19:27 -05:00
terrafrost	c509909004	Organizational Revamp ... - rename \phpseclib\Crypt\Base to \phpseclib\Crypt\Common\SymmetricKey - create BlockCipher and StreamCipher to extend SymmetricKey - replace _string_shift with \phpseclib\Common\Functions\Strings::shift	2016-07-30 22:18:06 -05:00
terrafrost	3c1985a619	Merge branch '2.0'	2016-07-10 12:56:12 -05:00
terrafrost	97f0b37bd5	Merge branch '1.0' into 2.0	2016-07-10 12:55:56 -05:00
terrafrost	7bc0e61c1d	SSH2: fix "Expected SSH_FXP_STATUS or ..." error	2016-06-29 00:30:28 -05:00
terrafrost	68a09b8af0	SSH2: i incorrectly thought i had saved when i did git commit -a	2016-06-11 19:38:23 -05:00
terrafrost	414b980b83	Merge branch '2.0'	2016-06-11 19:16:25 -05:00
terrafrost	8bb4592225	Merge branch 'stream-get-contents-1.0' into 2.0	2016-06-06 23:05:15 -05:00
terrafrost	2550301678	SSH2: use stream_get_* instead of fread() / fgets()	2016-05-23 00:46:41 -05:00
Paragon Initiative Enterprises	0e8fa93676	Use paragonie/constant_time_encoding	2016-05-12 16:28:40 -04:00
terrafrost	1b92fd84f9	Merge branch '2.0'	2016-05-06 11:50:26 -05:00
terrafrost	c76b18b869	Merge branch '1.0' into 2.0	2016-05-06 11:50:15 -05:00
artyhedgehog	0dd04d1e9b	Fixed confusing SSH2::getErrors return type	2016-05-06 11:49:24 -05:00
terrafrost	398a795e1f	Revert "undo merging of master to 2.0 branch" ... This reverts commit 8fb4c3363d.	2016-04-30 16:23:35 -05:00
terrafrost	8fb4c3363d	undo merging of master to 2.0 branch	2016-04-28 15:34:10 -05:00
terrafrost	b3171cc63f	SFTP: fix logging constants	2016-04-11 19:30:45 -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	574d36fb7d	Merge branch 'cipher-revamp'	2016-03-14 23:00:21 -05:00
terrafrost	ea7d647612	Merge branch 'cipher-revamp'	2016-03-14 22:42:51 -05:00
terrafrost	54deb16da8	Merge branch '2.0'	2016-03-08 16:58:15 -06:00
terrafrost	9e586e79f1	SSH2: update libsodium calls to use 1.0.0 convention	2016-03-08 16:57:16 -06:00
terrafrost	ae1e5c13f9	Merge branch 'master' into cipher-revamp	2016-02-20 21:44:00 -06:00
terrafrost	5c78bf4c06	Merge branch 'ssh-fix-publickey'	2016-02-20 14:19:31 -06:00
Scott	fc4599985a	Correct Sodium check ... PECL Libsodium 1.0.x uses `\Sodium\function_name` instead of `\Sodium::method_name`.	2016-02-16 09:29:25 -06:00
Scott	fee6431bad	Correct Sodium check ... PECL Libsodium 1.0.x uses `\Sodium\function_name` instead of `\Sodium::method_name`.	2016-02-11 15:54:27 -05:00
terrafrost	c2110f68a0	SSH: fix broken public key auth	2016-02-06 15:59:34 -06:00
terrafrost	e74841477f	Crypt: become a lot less tolerant of bad parameters	2016-02-03 08:56:25 -06:00
terrafrost	73a4221988	Crypt: become a lot less tolerant of bad parameters	2016-01-31 12:37:38 -06:00
terrafrost	ad4c3670d3	Merge branch 'biginteger-revamp'	2016-01-16 22:59:19 -06:00
terrafrost	a0d21b6321	BigInteger: make select methods static, add type hinting, etc	2015-12-27 10:24:17 -06:00
terrafrost	806249c7e9	RSA: changes to how encryption / signatures work	2015-12-25 11:28:24 -06:00
terrafrost	94fdbba2aa	Merge branch '2.0'	2015-12-23 23:42:23 -06:00
terrafrost	600f9c4e4b	SSH2: update isAuthenticated to work with 2.0 / master branches	2015-12-16 09:21:37 -06:00
terrafrost	d17aeffc04	Merge branch 'authenticated-1.0' into authenticated-2.0	2015-12-16 09:20:27 -06:00
terrafrost	57063f3604	SSH2: add isAuthenticated() method	2015-12-15 23:19:05 -06:00
terrafrost	ee0f45fea6	update identifier to current version	2015-12-05 10:33:28 -06:00
Andreas Fischer	18cc8eb1c3	Merge branch '2.0' ... * 2.0: Fix PHP invalid index warning	2015-11-24 09:28:00 +01:00
Andreas Fischer	d80651738f	Merge branch '1.0' into 2.0 ... * 1.0: Fix PHP invalid index warning	2015-11-24 09:28:00 +01:00
splitice	77d5f8da20	Fix PHP invalid index warning	2015-11-24 09:13:30 +01:00
terrafrost	43165d976c	RSA: changes to OpenSSH and PuTTY plugins	2015-10-24 15:54:34 -05:00
terrafrost	a9705fdba7	Merge branch 'master' into rsa-plugins ... Conflicts: phpseclib/Crypt/RSA.php	2015-10-16 10:01:18 -05:00
terrafrost	8686ced6d3	Merge branch 'phpdoc-2.0' into phpdoc-master ... Conflicts: phpseclib/Crypt/Hash.php phpseclib/Crypt/RSA.php	2015-10-12 21:37:44 -05:00
terrafrost	33ea01f1ac	Merge branch 'phpdoc-1.0' into phpdoc-2.0 ... Conflicts: phpseclib/Crypt/AES.php phpseclib/Crypt/Base.php phpseclib/Crypt/Blowfish.php phpseclib/Crypt/DES.php phpseclib/Crypt/Hash.php phpseclib/Crypt/RC2.php phpseclib/Crypt/RC4.php phpseclib/Crypt/RSA.php phpseclib/Crypt/Rijndael.php phpseclib/Crypt/TripleDES.php phpseclib/Crypt/Twofish.php phpseclib/File/ASN1.php phpseclib/File/X509.php phpseclib/Math/BigInteger.php phpseclib/Net/SCP.php phpseclib/Net/SFTP.php phpseclib/Net/SSH1.php phpseclib/Net/SSH2.php phpseclib/System/SSH/Agent.php	2015-10-12 14:10:26 -05:00
terrafrost	2048a49aac	use self:: in phpdoc comments to reduce merge conflicts	2015-10-11 12:22:07 -05:00
terrafrost	19229ed224	phpDoc changes	2015-10-05 13:22:51 -05:00
terrafrost	91887c957d	Merge remote-tracking branch 'upstream/master' into rsa-plugins ... Conflicts: phpseclib/Crypt/RSA.php phpseclib/Net/SSH2.php	2015-10-01 15:57:31 -05:00
terrafrost	ec3fe7277b	RSA: move key format handling to plugins	2015-10-01 15:41:11 -05:00
Andreas Fischer	70f55bd156	Merge pull request #825 from terrafrost/rsa-revamp ... RSA: make createKey static and make it return RSA objects * terrafrost/rsa-revamp: RSA: make createKey static and make it return RSA objects	2015-09-25 13:16:56 +02:00