601 Commits

Author	SHA1	Message	Date
terrafrost	be168e262f	Crypt/Base: stream ciphers cannot be run in continuous mode with OpenSSL	2014-12-31 14:10:53 -06:00
terrafrost	5a91539148	SSH2: rm unsupported algorithms if OpenSSL is being used	2014-12-29 22:10:26 -06:00
montdidier	aca4ba3286	SSH agent forwarding implementation	2014-12-30 10:44:31 +08:00
terrafrost	472e006b6c	SSH2: update conditions under which _disconnect's code is executed	2014-12-29 08:37:44 -06:00
Andreas Fischer	f2134aa4b2	Merge branch 'master' into php5 ... * master: "@access static" isn't a thing	2014-12-27 20:25:04 +01:00
Graham Campbell	bd0537fec5	"@access static" isn't a thing	2014-12-27 15:38:14 +00:00
David Anderson	1cd286642e	Change dochint as requested	2014-12-27 14:10:44 +00:00
David Anderson	fba6894474	Add docblock	2014-12-27 14:02:29 +00:00
David Anderson	e9b698fd65	Add callback to SFTP.php ... Currently, Net_SCP::put() has a callback parameter, allowing the consumer to monitor/log/report progress (or whatever they please). This patch adds the same feature, working in the same way, to Net_SFTP::put()	2014-12-27 13:55:00 +00:00
Andreas Fischer	6205531907	Merge branch 'master' into php5 ... * master: Fix undefined $raw error	2014-12-26 10:48:16 +01:00
Clint Nelissen	01d7c96a11	Fix undefined $raw error	2014-12-26 10:37:46 +01:00
Clint Nelissen	f3565346fa	Replaced get_class() calls with instanceof operators	2014-12-24 13:07:14 -08:00
Clint Nelissen	fe742e18d7	Namespaced Crypt Package	2014-12-16 16:16:54 -08:00
Clint Nelissen	dfb8d52806	Temporary constant fix	2014-12-15 14:29:34 -08:00
Clint Nelissen	628949fb73	Namespaced classes	2014-12-15 14:29:20 -08:00
Clint Nelissen	fddf20f89c	Namespaced classes	2014-12-15 09:25:46 -08:00
terrafrost	c5f74eb3a3	Merge branch 'master' of https://github.com/phpseclib/phpseclib into openssl-support	2014-12-13 14:15:34 -06:00
Andreas Fischer	c4b103468c	Merge pull request #549 from bantu/fix-547 ... Change copyright years from roman numeral to decimal numbers. * bantu/fix-547: Change copyright years from roman numeral to decimal numbers. Conflicts: phpseclib/System/SSH_Agent.php	2014-12-10 00:06:08 +01:00
Andreas Fischer	0efae5a91e	Change copyright years from roman numeral to decimal numbers.	2014-12-10 00:04:08 +01:00
Clint Nelissen	0305a4827c	Moved globally defined constants to class constants	2014-12-09 10:46:30 -08:00
Clint Nelissen	ecb9c32f02	Merge branch 'php5' of https://github.com/phpseclib/phpseclib into NetPackageConstantsFix ... Conflicts: phpseclib/Net/SSH2.php	2014-12-08 10:40:57 -08:00
Andreas Fischer	e52a3aff5a	Merge branch 'master' into php5 ... * master: SSH2: simplify _send_channel_packet	2014-12-06 12:25:16 +01:00
terrafrost	96eb1f3797	SSH2: simplify _send_channel_packet ... the last _send_channel_packet was unnecessarily complex. this lead to a number of problems. for example, the window size was checked for adjustments in two places. in the second place it receives a window adjustment packet and just assumes that the window adjustment packet was big enough for the rest of the data. (thanks, pixall!)	2014-12-05 22:01:39 -06:00
Clint Nelissen	99b9cc477d	Moved global constants to class constants	2014-12-04 13:45:13 -08:00
Andreas Fischer	a3f52dcf61	Merge branch 'master' into php5 ... * master: Quote shell argument with escapeshellarg()	2014-12-04 20:00:45 +01:00
Andreas Fischer	262da528a0	Merge pull request #527 from DavidAnderson684/patch-2 ... Quote shell argument with escapeshellarg() * DavidAnderson684/patch-2: Quote shell argument with escapeshellarg()	2014-12-04 20:00:41 +01:00
Andreas Fischer	243ad0c54a	Merge branch 'master' into php5 ... * master: SCP: Add missing space after case statement.	2014-12-04 19:56:34 +01:00
Andreas Fischer	f40bb9190f	SCP: Add missing space after case statement.	2014-12-04 18:42:47 +01:00
David Anderson	14dc468b70	Quote shell argument with escapeshellarg() ... Currently, the call to "scp -t" or "scp -f" just uses naive quoting - i.e. a couple of quote marks are thrown in. But, this can easily be escaped from - if the filename has a quote mark of its own in it, for example. e.g. if the filename is as follows, then bad things will happen: ";rm -rf / Instead, escapeshellarg should be used, to make sure it gets escaped properly.	2014-12-04 16:50:23 +00:00
Andreas Fischer	b771ca36cf	Merge pull request #519 from bantu/remove-license-text ... Remove LICENSE text from source code files. * bantu/remove-license-text: Remove LICENSE text from source code files.	2014-12-03 23:13:00 +01:00
Andreas Fischer	632c47e55f	Merge branch 'master' into php5 ... * master: Avoid calling fclose(false)	2014-12-03 23:08:56 +01:00
David Anderson	647a1e9a5e	Avoid calling fclose(false) ... The previous code would always call fclose(false) if the file was not successfully opened - resulting in a PHP notice.	2014-12-03 19:29:46 +00:00
Andreas Fischer	638e62d60a	Remove LICENSE text from source code files.	2014-12-03 18:49:33 +01:00
Clint Nelissen	d6029bdb6a	Removed includes for Random.php and fixed up user_error message	2014-12-02 09:34:15 -08:00
Clint Nelissen	f5ed86e385	Renamed Random::crypt_random_string to Random::string	2014-12-02 09:20:40 -08:00
Clint Nelissen	c70702afbb	Namespaced Crypt\Random	2014-12-02 08:41:30 -08:00
Clint Nelissen	9c0c3faeb7	Initial commit	2014-12-01 18:54:44 -08:00
terrafrost	8fc4f4b70c	Merge branch 'master' of https://github.com/phpseclib/phpseclib into openssl-support	2014-11-29 07:46:06 -06:00
Andreas Fischer	43d2e9ef68	Merge branch 'master' into php5 ... * master: SSH2: clarify exec() docblock comment	2014-11-20 10:58:33 +01:00
terrafrost	b1e6643032	SSH2: clarify exec() docblock comment	2014-11-19 22:38:19 -06:00
Andreas Fischer	10e5653324	Merge branch 'master' into php5 ... * master: SSH2: fix issues with RSA key verification Conflicts: phpseclib/Net/SSH2.php	2014-11-07 13:13:38 +01:00
terrafrost	3eac2582d6	SSH2: fix issues with RSA key verification ... Sometimes SSH servers will null pad their RSA keys. this null padding broke Net/SSH2.php's RSA implementation (Crypt/RSA.php's implementation works just fine). Also, the -3 was counting the initial "\0" of $h twice so adjust it to -2.	2014-11-06 11:58:03 -06:00
Andreas Fischer	8af52e2954	Merge branch 'master' into php5 ... * master: SFTP: Use hexdec() and bin2hex() for filesize calculation.	2014-10-19 21:32:23 +02:00
Andreas Fischer	5c3058cc4b	SFTP: Use hexdec() and bin2hex() for filesize calculation.	2014-10-19 21:07:12 +02:00
Andreas Fischer	45ce4b24ef	Merge branch 'master' into php5 ... * master: SFTP: Replace incorrect comment about filesize. There is no 4 GiB limit. Conflicts: phpseclib/Net/SFTP.php	2014-10-19 20:54:50 +02:00
Andreas Fischer	5b932495cc	SFTP: Replace incorrect comment about filesize. There is no 4 GiB limit.	2014-10-15 17:27:48 +02:00
terrafrost	361b59fff9	SSH2: make setCryptoEngine() less cumbersome	2014-10-11 23:40:56 -05:00
terrafrost	959c0cefae	SSH2: add setCryptoEngine() function	2014-10-11 23:26:46 -05:00
terrafrost	ff4d563f4f	SSH2: CS adjustments	2014-10-11 23:20:44 -05:00
Andreas Fischer	e682e20df4	Merge branch 'master' into php5 ... * master: Correct constant: NET_SFTP_BLOCK_DEVICE -> NET_SFTP_TYPE_BLOCK_DEVICE	2014-10-09 23:51:33 +02:00
Andreas Fischer	ce3cf60b10	Correct constant: NET_SFTP_BLOCK_DEVICE -> NET_SFTP_TYPE_BLOCK_DEVICE	2014-10-09 23:24:30 +02:00
Andreas Fischer	645c16d0f5	Merge branch 'master' into php5 ... * master: Fix Net_SFTP::filetype() block device recognition.	2014-10-09 23:19:23 +02:00
Vladimir Volodko	6715c41e1f	Fix Net_SFTP::filetype() block device recognition.	2014-10-09 12:46:58 +07:00
Andreas Fischer	92c3127448	Merge branch 'master' into php5 ... * master: SSH2: removed redundant rtrim	2014-09-28 12:43:54 +02:00
Cezary Kluczyński	0692a1ea7d	SSH2: removed redundant rtrim	2014-09-28 12:39:54 +02:00
Andreas Fischer	e85321959e	SSH1: Math_BigInteger is supposed to be BigInteger.	2014-09-07 22:26:22 +02:00
Andreas Fischer	cf921a347a	Merge branch 'master' into php5 ... * master: SSH2: rm unused constant	2014-09-07 12:43:27 +02:00
terrafrost	67279d7811	SSH2: rm unused constant ... it doesn't need to be defined since the strlen($this->last_interactive_response) check in _login_helper serves the same purpose that NET_SSH_MASK_LOGIN_INTERACTIVE was intended to serve	2014-09-06 20:30:01 -05:00
Andreas Fischer	42e05a6714	Merge branch 'master' into php5 ... * master: SSH2: don't count data length against window size	2014-09-03 20:44:53 +02:00
terrafrost	9e71e0bce8	SSH2: don't count data length against window size ... it is my hope that the issues 8c9e7a890e and ccb1c3e2bd sought to resolve were fixed 9f8d8a7bf6 and 7a2c7a414c.	2014-08-30 15:26:23 -05:00
Andreas Fischer	a15079676c	Merge branch 'master' into php5 ... * master: SFTP: cs adjustment SFTP: optimize conditional calls to fclose in get() method SFTP: grammar SFTP: fix issue with uploading via a resource SFTP: make it so files can be downloaded into resources or upload from resources	2014-08-19 22:25:07 +02:00
terrafrost	74feca9cf2	SFTP: cs adjustment	2014-08-19 14:20:20 -05:00
terrafrost	cb66c561c2	SFTP: optimize conditional calls to fclose in get() method	2014-08-19 14:05:24 -05:00
terrafrost	29e0143308	SFTP: grammar	2014-08-16 15:49:38 -05:00
terrafrost	7ed53f2428	SFTP: fix issue with uploading via a resource	2014-08-16 13:56:34 -05:00
terrafrost	e48ee12940	SFTP: make it so files can be downloaded into resources or upload ... from resources	2014-08-16 12:49:55 -05:00
Andreas Fischer	9dc92a82a4	Merge branch 'master' into php5 ... * master: SSH2: white space adjustment SSH: update getServerPublicHostKey() to use new _connect() method SSH2: fix if statement for conditional _connect() call simplify calls to $this->_connect() SSH2: make it so negotiated algorithms can be seen before login	2014-08-10 12:10:11 +02:00
Andreas Fischer	1de939fb4a	Merge pull request #427 from terrafrost/ssh2-show-methods-before-login ... SSH2: make it so negotiated algorithms can be seen before login * terrafrost/ssh2-show-methods-before-login: SSH2: white space adjustment SSH: update getServerPublicHostKey() to use new _connect() method SSH2: fix if statement for conditional _connect() call simplify calls to $this->_connect() SSH2: make it so negotiated algorithms can be seen before login	2014-08-10 12:10:04 +02:00
terrafrost	04e263bb8c	SSH2: white space adjustment	2014-08-10 02:09:28 -05:00
terrafrost	085fb0ebb8	SSH: update getServerPublicHostKey() to use new _connect() method	2014-08-06 14:42:08 -05:00
terrafrost	5b019b22d9	SSH2: fix if statement for conditional _connect() call	2014-08-05 19:30:14 -05:00
terrafrost	dffef50838	simplify calls to $this->_connect()	2014-08-04 20:11:34 -05:00
Andreas Fischer	e4516fb453	Merge branch 'master' into php5 ... * master: Add some test cases for SHA512. Use toBits() as there is no bits property. SSH2: Disallow the none MAC.	2014-07-26 17:20:09 +02:00
Andreas Fischer	2ccb301c4c	Merge pull request #425 from bantu/ssh-remove-none-mac ... SSH2: Disallow the none MAC. * bantu/ssh-remove-none-mac: SSH2: Disallow the none MAC.	2014-07-26 13:14:39 +02:00
Andreas Fischer	fed60fe8ac	Merge branch 'master' into php5 ... * master: ssh-hmac-sha2-256: Remove whitespace at end of line. Added RFC6668 Add hmac-sha2-256 MAC support	2014-07-26 13:11:29 +02:00
Andreas Fischer	4be4533a6e	ssh-hmac-sha2-256: Remove whitespace at end of line.	2014-07-26 13:02:52 +02:00
terrafrost	49079fa1b4	SSH2: make it so negotiated algorithms can be seen before login	2014-07-25 10:03:31 -05:00
Dag Wieers	1a330b68e2	Added RFC6668 ... Added the requested changed.	2014-07-25 14:10:01 +02:00
Dag Wieers	86d17c6989	Add hmac-sha2-256 MAC support ... This small patch adds hmac-sha2-256 support separately as requested in #423. Some security standards now recommend to disable MD5 and SHA1, and use SHA2 instead. This change was tested using SHA2 against RHEL6's OpenSSH v5.3p1 and Solaris 11. And was also tested with RHEL5's OpenSSH 4.3p2 which doesn't include SHA2.	2014-07-25 12:28:08 +02:00
Andreas Fischer	1aecc5e3d8	SSH2: Disallow the none MAC.	2014-07-25 12:18:11 +02:00
Andreas Fischer	bb1c36893f	Merge branch 'master' into php5 ... * master: Do not check filename over and over again, remove '.' and '..' from the map instead.	2014-07-24 17:32:38 +02:00
Andreas Fischer	880bc9d9e6	Merge pull request #420 from bantu/sftp-skip-current-dir-by-removal ... SFTP: Do not check filename over and over again, remove '.' and '..' from the map instead. * bantu/sftp-skip-current-dir-by-removal: Do not check filename over and over again, remove '.' and '..' from the map instead.	2014-07-24 17:32:38 +02:00
Andreas Fischer	8862b3c97a	Merge branch 'master' into php5 ... * master: Only fclose($fp) when $mode & NET_SFTP_LOCAL_FILE.	2014-07-24 17:04:25 +02:00
Andreas Fischer	48a2613cde	Merge pull request #421 from bantu/issue/418 ... SFTP: Only fclose($fp) when $mode & NET_SFTP_LOCAL_FILE. * bantu/issue/418: Only fclose($fp) when $mode & NET_SFTP_LOCAL_FILE.	2014-07-24 17:04:24 +02:00
Andreas Fischer	47695777f8	Merge branch 'master' into php5 ... * master: Net_SFTP::_list() only takes two parameters.	2014-07-24 17:02:47 +02:00
Andreas Fischer	952d2166bf	Net_SFTP::_list() only takes two parameters.	2014-07-24 11:09:37 +02:00
Andreas Fischer	695d1e9038	Only fclose($fp) when $mode & NET_SFTP_LOCAL_FILE.	2014-07-24 11:06:24 +02:00
Andreas Fischer	84a9a300d4	Do not check filename over and over again, remove '.' and '..' from the map instead.	2014-07-24 11:00:55 +02:00
Andreas Fischer	f0d0158c2b	Merge branch 'master' into php5 ... * master: Comment out (potentially) insecure ciphers arcfour and none.	2014-07-22 16:09:16 +02:00
Andreas Fischer	a0a23cbaf1	Merge pull request #406 from bantu/remove-ssh-arcfour ... Remove the arcfour and none ciphers from SSH2. * bantu/remove-ssh-arcfour: Comment out (potentially) insecure ciphers arcfour and none.	2014-07-22 16:09:14 +02:00
Andreas Fischer	ae913d64c3	Merge branch 'master' into php5 ... * master: SSH2: don't remove old $this->bitmap values	2014-07-21 23:53:34 +02:00
terrafrost	9dd3db4a49	SSH2: don't remove old $this->bitmap values	2014-07-21 16:41:39 -05:00
Andreas Fischer	84ac305704	Comment out (potentially) insecure ciphers arcfour and none.	2014-07-21 12:16:49 +02:00
Andreas Fischer	025a637053	Merge branch 'master' into php5 ... * master: Make Net_SSH2::isConnected() return a boolean instead of int.	2014-07-20 23:31:30 +02:00
Andreas Fischer	678d0cc792	Make Net_SSH2::isConnected() return a boolean instead of int.	2014-07-20 23:03:06 +02:00
Andreas Fischer	c2f2f4a764	Merge branch 'master' into php5 ... * master: SSH2: make isConnected return true if even if we're not logged in	2014-07-20 23:00:32 +02:00
Andreas Fischer	cc64ef9d3f	Merge pull request #412 from terrafrost/ssh2-connected ... SSH2: make isConnected return true if even if we're not logged in * terrafrost/ssh2-connected: SSH2: make isConnected return true if even if we're not logged in	2014-07-20 23:00:30 +02:00
Andreas Fischer	d29ad3afa9	Merge branch 'master' into php5 ... * master: SFTP: stat cache fixes SFTP: return $sftp object in new unit test method SFTP: add unit test for stat cache fix	2014-07-20 21:41:51 +02:00
terrafrost	ac2fc96263	SSH2: make isConnected return true if even if we're not logged in	2014-07-20 11:24:16 -05:00
terrafrost	a84861bb52	SFTP: stat cache fixes	2014-07-19 21:31:58 -05:00