danog/tgseclib
1
0
Fork 0
mirror of https://github.com/danog/tgseclib.git synced 2024-12-12 09:09:50 +01:00
Code Issues Projects Releases Wiki Activity
3,466 Commits 1 Branch 21 Tags 11 MiB
6f8ba6c614
Commit Graph

1019 Commits

Author SHA1 Message Date
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
03ca09a104 Merge branch '2.0' 2017-06-12 21:26:20 -05:00
terrafrost
53acccdb08 Merge branch '1.0' into 2.0 2017-06-12 21:19:18 -05:00
David Hedberg
bbf467babd SFTP: Add enablePathCanonicalization()/disablePathCanonicalization() 2017-06-12 21:17:55 -05:00
terrafrost
0bb6c9b974 SFTP: rm NO_REALPATH changes 2017-06-05 01:30:30 -05:00
terrafrost
1564a27f6e SFTP: make NO_REALPATH apply to get() as well 2017-06-05 00:44:29 -05:00
David Hedberg
5979ed571f SFTP: Add a NO_REALPATH option to put() 2017-06-05 00:12:57 -05:00
terrafrost
a312a1d4f0 SSH2: update a few function calls to work with renamed methods 2017-05-28 09:44:38 -05:00
terrafrost
5c51c2570c Merge branch '2.0' 2017-05-11 07:33:55 -05:00
Remi Collet
9706f37644 fix permission 2017-05-08 17:23:20 +02:00
terrafrost
84d40ad8e0 Merge branch '2.0' 2017-05-07 13:26:39 -05:00
terrafrost
64dd2e064b Merge branch '1.0' into 2.0 2017-05-07 13:26:27 -05:00
terrafrost
35a1102c0b SFTP: fix put() with php://input as source 2017-05-07 13:25:43 -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
865904f636 Merge branch '2.0' 2016-11-20 18:13:48 -06:00
terrafrost
de3bb2e300 Merge branch '1.0' into 2.0 2016-11-20 18:13:41 -06:00
terrafrost
6fb34887c5 SFTP: change queue size to 32 (max packet size is 32kb so 32*32=1M) 2016-11-20 18:13:01 -06:00
terrafrost
ad03dcad1c Merge branch '2.0' 2016-11-20 18:05:02 -06:00
terrafrost
27a6b6362a Merge branch '1.0' into 2.0 2016-11-20 18:04:55 -06:00
terrafrost
a2d9622bf9 SFTP: update directory deletion check (#1059) 2016-11-20 18:03:01 -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
b8e1a15291 Merge branch '2.0' 2016-11-19 20:40:04 -06:00
terrafrost
f981310266 Merge branch '1.0' into 2.0 2016-11-19 20:39:58 -06:00
terrafrost
b70cb87641 SFTP: don't delete directory if $path is empty 2016-11-19 20:39:05 -06:00
terrafrost
d1fa327ef9 Merge branch '2.0' 2016-11-18 20:48:18 -06:00
terrafrost
51bafdebe2 SFTP: CS adjustment 2016-11-18 20:48:01 -06:00
terrafrost
d6bf2b4f73 Merge branch '2.0' 2016-11-18 20:37:26 -06:00
terrafrost
8b4208ee60 SFTP: logging didn't work correctly in 2.0 branch 2016-11-18 20:37:08 -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
Łukasz Bajsarowicz
e837cc2054 Incorrect namespace hint 2016-11-04 02:25:56 -05: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
c1d407d7cf Merge branch '1.0' into 2.0 2016-09-11 21:22:53 -07:00
terrafrost
ff7bc85a8f SFTP: backport "parallel" upload code from master branch 2016-09-11 21:11:52 -07:00
terrafrost
03937a7933 Merge branch '2.0' 2016-09-10 11:16:52 -07:00
terrafrost
222ad56285 Merge branch '1.0' into 2.0 2016-09-10 11:04:52 -07:00
terrafrost
845135f887 add PHP5-style constructors along side PHP4-style ones 2016-09-10 10:41:05 -07:00
terrafrost
6f22a957c2 Merge branch '2.0' 2016-08-28 23:17:11 -05:00
terrafrost
f30f8045fd Merge branch '1.0' into 2.0 2016-08-28 23:17:06 -05:00
Michel Bardelmeijer
1eda62913a Handle empty fread return correctly which resolves zero-byte file issues 2016-08-28 23:16:53 -05: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
f7585d99d1 Merge branch '2.0' 2016-07-10 13:22:09 -05:00
terrafrost
a21f3e5132 Merge branch '1.0' into 2.0 2016-07-10 13:22:03 -05:00
terrafrost
cb4a6df10c SFTP: make symlink support relative target's 2016-07-10 13:11:24 -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
15f0c3e5e6 Merge branch '2.0' 2016-06-19 19:45:08 -05:00
terrafrost
eeb65b2341 Merge branch '1.0' into 2.0 2016-06-19 19:45:00 -05:00
Mathieu Pipet
6c8affcf11 fixed sending stream resulting in a zero byte file 2016-06-19 19:44:06 -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
e2a0b701c7 remove a few calls to paragonie/constant_time_encoding 
- Hex::decode('aabb') can be replaced with "\xaa\xbb"
- Hex::decode(sha1('...')) can be replaced with sha1('...', true)
 2016-06-04 22:31:23 -05:00
terrafrost
2550301678 SSH2: use stream_get_* instead of fread() / fgets() 2016-05-23 00:46:41 -05:00
Paragon Initiative Enterprises
adcbecae78 Use paragonie/constant_time_encoding 2016-05-21 12:57:53 -05:00
terrafrost
c784d9e1e5 reapply PR #931 2016-05-08 01:34:37 -05:00
terrafrost
43d68c6619 Merge branch '2.0' 2016-05-06 12:23:35 -05:00
terrafrost
700338beed Merge branch '1.0' into 2.0 2016-05-06 11:58:07 -05:00
terrafrost
27d9bde6d2 Merge branch 'sftp_readable_writable-1.0' into 1.0 2016-05-06 11:55:50 -05: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
e762b0dc29 SFTP: add is_writable, is_writeable and is_readable 2016-05-05 16:41:15 -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
076c69fa1b Merge branch '1.0' into 2.0 2016-04-11 15:18:50 -05:00
terrafrost
d22bcd63cc SFTP: nlist() on a non-existent directory resulted in error 2016-04-11 15:18:06 -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
6d5ec59f10 SFTP: a few tweaks to the queue'd get() changes raxbg did 2016-03-14 09:57:54 -05:00
terrafrost
815f227897 Merge remote-tracking branch 'raxbg/parallel_download' 2016-03-13 11:57:07 -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
Ivailo Hristov
75d4c3b09c Even more memory optimizations 2016-02-25 13:55:49 +02:00
Ivailo Hristov
1af19fbf1b Fix a memory leak when transferring lots of small files 2016-02-24 17:01:40 +02:00
Ivailo Hristov
56af770943 Changes based on comment 187537999 2016-02-23 19:21:23 +02: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
Ivailo Hristov
83b8d0ec0a Bug fix for SFTP::get() 2016-02-17 14:57:32 +02: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
Ivailo Hristov
11a539bcbd Implement parallel download 2016-02-11 16:38:31 +02: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
cd700ce8b3 Merge branch '2.0' 2016-01-25 16:58:48 -06:00
Joey3000
bdc28b9453 Cherry-picking cleanup of use operator usage 
Picked c9a80ff748 to the 2.0 branch and resolved conflicts.
 2016-01-21 19:41:41 +01: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
001ad99d73 Merge branch '1.0' into 2.0 2015-12-23 23:32:20 -06:00
terrafrost
1be0ac9f7f SFTP/Stream: fix issue with filenames with hash in them 2015-12-23 13:13:06 -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
efe36d67ce Merge branch 'master' into rsa-plugins 
Conflicts:
	phpseclib/Crypt/RSA.php
 2015-10-22 10:16:52 -05:00
Andreas Fischer
a88047f242 Merge branch '2.0' 
* 2.0:
  Add test case for GitHub Issue 850: Realpath in SFTP chmod().
  Fixed a bug in SFTP::chmod not using realpath on the filepath
 2015-10-19 00:19:08 +02:00
Andreas Fischer
1cf70d27e8 Merge branch '1.0' into 2.0 
* 1.0:
  Add test case for GitHub Issue 850: Realpath in SFTP chmod().
  Fixed a bug in SFTP::chmod not using realpath on the filepath
 2015-10-19 00:19:07 +02:00
Bob4ever
b67c690498 Fixed a bug in SFTP::chmod not using realpath on the filepath 2015-10-19 00:05:02 +02: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
0ba1a04c05 Merge branch '2.0' 
* 2.0:
  SFTP: don't start in local file middle when uploading to middle of the remote file
  Tests/SFTP: updates to newly added unit test
  SFTP: backport DavidAnderson684's changes to 1.0 branch
  add unit test demo'ing issue # 830
 2015-09-30 17:28:03 +02:00
terrafrost
0f49fb86bf Merge branch 'sftp-endless-loop' into sftp-endless-loop-v2 
Conflicts:
	phpseclib/Net/SFTP.php
	tests/Functional/Net/SFTPUserStoryTest.php
 2015-09-29 21:51:20 -05:00
terrafrost
6688f650f1 SFTP: don't start in local file middle when uploading to middle of 
the remote file
 2015-09-29 21:39:35 -05:00
terrafrost
26ddf02fee Merge branch 'sftp-endless-loop' into sftp-endless-loop-v2 
Conflicts:
	phpseclib/Net/SFTP.php
 2015-09-28 09:20:38 -05:00
terrafrost
e2a2ad8c91 SFTP: backport DavidAnderson684's changes to 1.0 branch 2015-09-27 10:56:05 -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
terrafrost
fab5a66fe5 RSA: make createKey static and make it return RSA objects 2015-09-24 09:43:19 -05:00
Andreas Fischer
ccd18552e5 Merge branch '2.0' 
* 2.0:
  Fixed phpdoc

Conflicts:
	phpseclib/Crypt/Hash.php
 2015-09-16 13:36:04 +02:00
Graham Campbell
7f1bbfe216 Fixed phpdoc 2015-09-14 16:30:31 +01:00
Andreas Fischer
3342eb6d09 Merge branch '2.0' 
* 2.0:
  Fixed another case
  Minor tweaks
  Fixed error
  More fixes
  PHPDoc fixes
 2015-09-14 01:27:11 +02: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
dd031a1702 PHPDoc fixes 2015-09-06 12:28:08 +01:00
metaclassing
029228b3fe I misinterpreted the meaning of === true and messed up quotes on one throw 2015-09-04 14:20:51 -05:00
metaclassing
2b5c2eb9ab Tried to replicate SSHv2 exception support into SSHv1 2015-09-04 14:13:16 -05:00
Andreas Fischer
ed6f754137 Merge pull request #803 from GrahamForks/phpdoc 
[3.0] PHPDoc Fixes

* GrahamForks/phpdoc:
  Fixed lots of phpdoc typos
  Fixed invalid param phpdoc
 2015-09-02 20:49:05 +02:00
Andreas Fischer
6433a10fa5 Merge pull request #787 from torinaki/remove-global-and-earn-25$ 
Connection reuse refactoring to rid of globals

* torinaki/remove-global-and-earn-25$:
  Connection reuse refactoring to rid of globals
 2015-09-02 15:04:52 +02:00
Graham Campbell
7cd45e5e1b Fixed lots of phpdoc typos 2015-09-02 00:44:55 +01:00
Graham Campbell
2be0506514 Fixed invalid param phpdoc 2015-09-02 00:44:39 +01:00
Graham Campbell
634c1c2a18 Fixed lots of phpdoc typos 2015-09-02 00:42:15 +01:00
Graham Campbell
c08c099c56 Fixed invalid param phpdoc 2015-09-02 00:41:38 +01:00
Graham Campbell
cd0e10cf9d Fixed lots of phpdoc typos 2015-09-02 00:37:54 +01:00
Graham Campbell
5890f3da98 Fixed invalid param phpdoc 2015-09-02 00:22:30 +01:00
Dmitry Balabka
70dd67c4d9 Connection reuse refactoring to rid of globals 2015-09-01 21:50:30 +03:00
terrafrost
2a8da097ae Merge branch 'master' into exceptions-v1 
Conflicts:
	phpseclib/Net/SSH2.php
 2015-08-31 23:47:12 -05:00
terrafrost
724ba7ccc9 SSH2: missed a few user_error's 2015-08-31 23:34:33 -05:00
terrafrost
a6fd9ea8b6 SCP: replace user_error's with exceptions 2015-08-31 23:28:20 -05:00
terrafrost
2e46aec03a SFTP: replace user_error's with exceptions 2015-08-31 23:12:33 -05:00
Andreas Fischer
f29805e394 Merge pull request #759 from bantu/ssh2-function-key_exchange-no-static 
[2.0] SSH2: Remove all static variables as loadable classes may change at runtime.

* bantu/ssh2-function-key_exchange-no-static:
  SSH2: Remove all static variables as loadable classes may change at runtime.
 2015-08-13 14:25:21 -04:00
terrafrost
f300e825b0 SSH2: replace user_error's with exceptions 2015-08-01 08:01:43 -05:00
Andreas Fischer
fe5671fef7 SSH2: Remove all static variables as loadable classes may change at runtime. 2015-07-28 12:05:19 +02:00
Andreas Fischer
4244576104 [2.0] Add _encryption_algorithm_to_crypt_instance method. 2015-07-28 11:44:39 +02:00
Andreas Fischer
58f8affcad SSH2: Add support for curve25519-sha256@libssh.org.txt via libsodium-php. 2015-07-27 22:58:59 +02:00
Andreas Fischer
27be192189 Merge branch '1.0' into 2.0 
* 1.0:
  Add encryption_algorithm_to_key_size method.
 2015-07-27 22:08:06 +02:00
Andreas Fischer
65010d08e6 Add encryption_algorithm_to_key_size method. 2015-07-24 12:31:50 +02:00
Andreas Fischer
650a4ce266 Merge pull request #748 from terrafrost/ssh-custom-socket-2.0 
SSH2: make it so you can connect using open sockets / 2.0 branch

* terrafrost/ssh-custom-socket-2.0:
  SSH2: move where $host is defined
  SSH2: make it so you can connect using open sockets
 2015-07-21 12:53:32 +02:00
Andreas Fischer
06ec04e3fe Merge pull request #746 from terrafrost/ssh-custom-socket-1.0 
SSH2: make it so you can connect using open sockets / 1.0 branch

* terrafrost/ssh-custom-socket-1.0:
  SSH2: move where $host is defined
  SSH2: make it so you can connect using open sockets
 2015-07-21 12:53:24 +02:00
Andreas Fischer
713a9c7ccf Merge branch '1.0' into 2.0 
* 1.0:
  SSH2: Introduce _array_intersect_first function.

Conflicts:
	phpseclib/Net/SSH2.php
 2015-07-18 01:06:09 +02:00
Andreas Fischer
1473da35e6 SSH2: Introduce _array_intersect_first function. 
+ No more empty for-loop bodies
+ No more counting variables $i leaked into outer context
+ No more unintuitive $i == count(...) comparisons
+ No more array / hash table access of the form $kex_algorithms[$i]
- Function call overhead; not in the performance critical path, though.
 2015-07-17 22:28:32 +02:00
terrafrost
690704d36e Merge branch 'ssh-custom-socket-1.0' into ssh-custom-socket-2.0 
Conflicts:
	phpseclib/Net/SSH2.php
 2015-07-17 13:11:57 -05:00
terrafrost
a19e2a0d21 SSH2: move where $host is defined 2015-07-17 13:08:24 -05:00
terrafrost
4d086bee86 Merge branch 'ssh-custom-socket-1.0' into ssh-custom-socket-2.0 
Conflicts:
	phpseclib/Net/SSH2.php
 2015-07-17 12:43:50 -05:00
terrafrost
33a97391bc SSH2: make it so you can connect using open sockets 2015-07-17 12:30:44 -05:00
Andreas Fischer
d9e9504fba Merge branch 'PSR2-1.0' into PSR2-2.0 
* PSR2-1.0:
  Fix indentation phpcbf did not fix.
  Remove PSR2.Methods.FunctionCallSignature.SpaceAfterOpenBracket exception.
  Use phpcbf to fix PHP code to ruleset.
  Ignore coding guidelines in ANSI switch block.
  Base code sniffer ruleset on PSR2 rather than PEAR.
  Update PHP Code Sniffer to 2.3.3

Conflicts:
	build/code-sniffer-ruleset-tests.xml
	build/code-sniffer-ruleset.xml
	composer.lock
	phpseclib/Crypt/DES.php
	phpseclib/Crypt/Hash.php
	phpseclib/Crypt/RSA.php
	phpseclib/File/X509.php
	phpseclib/Math/BigInteger.php
	phpseclib/Net/SFTP.php
	phpseclib/Net/SSH1.php
	phpseclib/Net/SSH2.php
	tests/Functional/Net/SFTPUserStoryTest.php
	tests/Unit/Crypt/TwofishTest.php
 2015-07-17 13:41:59 +02:00
Andreas Fischer
2013a31ecd Use phpcbf to fix PHP code to ruleset. 2015-07-17 12:57:41 +02:00
Andreas Fischer
4b5cc0c286 Merge branch '1.0' into 2.0 
* 1.0:
  SFTP: stat cache updates
 2015-07-17 12:45:42 +02:00
terrafrost
862b63e9e5 SFTP: stat cache updates 2015-07-17 12:34:56 +02:00
Andreas Fischer
6cbe537ba6 Merge branch '1.0' into 2.0 
* 1.0:
  SSH2: limit the size of data that expect() looks at

Conflicts:
	phpseclib/Net/SSH2.php
 2015-07-17 11:17:32 +02:00
terrafrost
4dc79b96ed SSH2: limit the size of data that expect() looks at 2015-07-14 19:05:52 -05:00
Andreas Fischer
f2773847a2 Merge branch '1.0' into 2.0 
* 1.0:
  Add support for RFC 4419: diffie-hellman-group-exchange-sha{1,256}

Conflicts:
	phpseclib/Net/SSH2.php
 2015-07-08 15:45:53 +02:00
Andreas Fischer
cdda621903 Merge pull request #714 from bantu/diffie-hellman-group-exchange-sha256 
Add support for RFC 4419: diffie-hellman-group-exchange-sha{1,256}

* bantu/diffie-hellman-group-exchange-sha256:
  Add support for RFC 4419: diffie-hellman-group-exchange-sha{1,256}
 2015-07-08 15:43:46 +02:00
Andreas Fischer
abeda5237f Add support for RFC 4419: diffie-hellman-group-exchange-sha{1,256} 2015-07-08 00:00:40 +02:00
Andreas Fischer
f782005a3f Merge branch '1.0' into 2.0 
* 1.0:
  SFTP: don't update stat cache when it's been disabled
 2015-07-06 23:48:28 +02:00
Andreas Fischer
7f1dfba50d Merge pull request #730 from terrafrost/disable-stat-cache-1.0 
SFTP: don't update stat cache when it's been disabled

* terrafrost/disable-stat-cache-1.0:
  SFTP: don't update stat cache when it's been disabled
 2015-07-06 23:48:28 +02:00
Andreas Fischer
83cac3385b Merge branch '1.0' into 2.0 
* 1.0:
  SFTP: update how recursive delete's update stat cache
  Tests/SFTP: add unit test
 2015-07-06 23:38:10 +02:00
Andreas Fischer
643103449c Merge pull request #731 from terrafrost/sftp-recur-delete-stat-cache-1.0 
SFTP: delete stat cache for recursive deletes / 1.0 branch

* terrafrost/sftp-recur-delete-stat-cache-1.0:
  SFTP: update how recursive delete's update stat cache
  Tests/SFTP: add unit test
 2015-07-06 23:37:55 +02:00
terrafrost
c460e511a0 SFTP: update how recursive delete's update stat cache 2015-07-04 13:09:26 -05:00
terrafrost
109ae38e48 SFTP: don't update stat cache when it's been disabled 2015-07-04 12:19:35 -05:00
Andreas Fischer
727677d4e1 Merge pull request #713 from bantu/SFTPStreamTest 
[1.0] Various fixes to fopen mode handling in SFTP Stream

* bantu/SFTPStreamTest:
  Explicitly set size to 0 when creating or truncating.
  mode[0] of 'c' is not supposed to truncate.
  Need to create the file when it does not exist and mode[0] is not 'r'.
  Add SFTPStreamTest::testFopenFcloseCreatesFile()
 2015-07-04 14:28:06 +02:00
Andreas Fischer
ba46db1758 Merge pull request #713 from bantu/SFTPStreamTest 
Various fixes to fopen mode handling in SFTP Stream

* bantu/SFTPStreamTest:
  Explicitly set size to 0 when creating or truncating.
  mode[0] of 'c' is not supposed to truncate.
  Need to create the file when it does not exist and mode[0] is not 'r'.
  Add SFTPStreamTest::testFopenFcloseCreatesFile()

Conflicts:
	tests/Functional/Net/SFTPLargeFileTest.php
 2015-07-04 01:18:19 +02:00
Andreas Fischer
e1dd7e9d69 Merge branch '1.0' into 2.0 
* 1.0:
  Tests/SFTP: $lstat->$stat
  Tests/SFTP: just check to see that stat / lstat return an array
  SFTP: update conditions under which cache for lstat / . is used
  Tests/SFTP: add test for stat's on .
 2015-06-27 21:59:45 +02:00
Andreas Fischer
1ad66ad1ea Merge pull request #719 from terrafrost/lstat-fix-1.0 
SFTP: update conditions under which cache for lstat / . is used for 1.0 branch

* terrafrost/lstat-fix-1.0:
  Tests/SFTP: $lstat->$stat
  Tests/SFTP: just check to see that stat / lstat return an array
  SFTP: update conditions under which cache for lstat / . is used
  Tests/SFTP: add test for stat's on .
 2015-06-27 21:59:45 +02:00
Andreas Fischer
89cf423c58 Merge branch '1.0' into 2.0 
* 1.0:
  SSH2: fix for window sizes > 2,147,483,648
 2015-06-27 21:58:45 +02:00
terrafrost
d1d415618a SFTP: update conditions under which cache for lstat / . is used 2015-06-26 23:34:14 -05:00
Andreas Fischer
d71da6b02b Explicitly set size to 0 when creating or truncating. 2015-06-25 14:26:35 +02:00
Andreas Fischer
9e07fb704b mode[0] of 'c' is not supposed to truncate. 2015-06-25 14:24:58 +02:00
Andreas Fischer
f0957021a1 Need to create the file when it does not exist and mode[0] is not 'r'. 2015-06-25 14:24:18 +02:00
terrafrost
c0555581e7 SSH2: fix for window sizes > 2,147,483,648 2015-06-24 23:45:14 -05:00
terrafrost
4d82df3fc7 Merge branch 'stat-cache-fix-1.0' into stat-cache-fix-2.0 
Conflicts:
	tests/Functional/Net/SFTPUserStoryTest.php
 2015-06-20 19:59:48 -05:00
terrafrost
6bc3513914 SFTP: stat cache updates 2015-06-20 19:33:19 -05:00
terrafrost
ab98a7c30c Merge branch 'booleans-1.0' into booleans-2.0 
Conflicts:
	README.md
 2015-05-07 00:29:33 -05:00
terrafrost
2fee2d4f98 backport e3betht's PR to 1.0 2015-05-07 00:26:39 -05:00
Andreas Fischer
8e2f694129 Merge branch '1.0' into 2.0 
* 1.0:
  SSH2: string shift by 4 instead of by 1
  SSH2: fix E_NOTICE involving global requests
 2015-05-05 16:14:12 +02:00
Andreas Fischer
5bd7a73a71 Merge pull request #674 from terrafrost/ssh2-global-request 
fix E_NOTICE with SSH2 global requests

* terrafrost/ssh2-global-request:
  SSH2: string shift by 4 instead of by 1
  SSH2: fix E_NOTICE involving global requests
 2015-05-05 16:14:12 +02:00
terrafrost
684d6eed0e SSH2: string shift by 4 instead of by 1 2015-05-04 08:22:27 -05:00
Andreas Fischer
661f3ce3b9 Merge branch '1.0' into 2.0 
* 1.0:
  Replace ; with : in case statement.

Conflicts:
	phpseclib/Net/SFTP.php
	phpseclib/Net/SSH2.php
 2015-05-03 14:13:56 +02:00
Andreas Fischer
5d2590feb0 Replace ; with : in case statement. 2015-05-03 13:18:23 +02:00
Andreas Fischer
daaa931dc2 Merge branch '1.0' into 2.0 
* 1.0:
  callbacks - two PRs conflict sorted out. First one: e9b698fd65, fba6894474, 1cd286642e Second one: 16430d4d2e, 0cc6125f87
  documentation fix

Conflicts:
	phpseclib/Net/SFTP.php
 2015-05-03 01:10:53 +02:00
andrey012
e7719f765c callbacks - two PRs conflict sorted out. 
First one: e9b698fd65, fba6894474, 1cd286642e
Second one: 16430d4d2e, 0cc6125f87
 2015-05-02 15:27:57 +03:00
andrey012
f4a93c790f Merge branch '1.0' into sftp-put-callback-for-1.0 2015-05-02 15:24:31 +03:00
andrey012
0cc6125f87 documentation fix 2015-05-02 14:28:19 +03:00
terrafrost
b59d821bbe SSH2: fix E_NOTICE involving global requests 2015-04-30 21:34:07 -05:00
terrafrost
36ef1c4084 Merge remote-tracking branch 'audrey/sftp-put-callback' into 2.0 2015-04-16 07:45:39 -05:00
terrafrost
1d772c3a6f Merge remote-tracking branch 'audrey/sftp-put-callback-for-1.0' into 1.0 2015-04-16 07:45:24 -05:00
terrafrost
d00e20a140 Merge remote-tracking branch 'graham/1.0-phpdoc' into 2.0-phpdoc 
Conflicts:
	phpseclib/Crypt/Base.php
	phpseclib/Net/SCP.php
	tests/Unit/File/ASN1Test.php
 2015-04-16 00:42:53 -05:00
terrafrost
9f626c67b6 Merge remote-tracking branch 'graham/1.0-phpdoc' into 1.0-phpdoc 2015-04-16 00:31:54 -05:00
terrafrost
ca0b56f05c Merge branch '1.0' into 2.0 
Conflicts:
	phpseclib/Crypt/Base.php
	phpseclib/Crypt/Blowfish.php
	phpseclib/Crypt/DES.php
	phpseclib/Net/SFTP.php
 2015-04-15 23:56:09 -05:00
terrafrost
b47813cf47 Merge remote-tracking branch 'DavidAnderson84/patch-4' into 1.0 2015-04-15 23:52:00 -05:00
andrey012
26086789ef replace throw with user_error() 2015-04-15 03:35:08 +03:00
andrey012
16430d4d2e support for callback function for SFTP::put function - in order to pipe data directly to remote server without putting it into file or keeping in memory. This can be useful particularly for dumping big databases directly to remote server. 2015-04-15 03:29:01 +03:00
Andrey Grinenko
b5e80bc176 cosmetics 2015-04-11 11:34:41 +03:00
terrafrost
047a75a636 Merge branch '2.0' of https://github.com/phpseclib/phpseclib into openssl-support-2.0 2015-04-10 23:08:08 -05:00
terrafrost
0b1d3aa7e9 SSH2: NET_SSH2_MASK_* -> self::MASK_* 2015-04-10 17:48:58 -05:00
Andrey Grinenko
e58427221d support for callback function for SFTP::put function - in order to pipe data directly to remote server without putting it into file or keeping in memory. This can be useful particularly for dumping big databases directly to remote server. 2015-04-09 02:59:00 +03:00
terrafrost
d75f703c0a rm PHP v4 compatability claim 2015-04-02 05:57:52 -05:00
terrafrost
e510dc878b Merge branch '1.0' of https://github.com/phpseclib/phpseclib into openssl-support 
Conflicts:
	phpseclib/Net/SSH2.php
 2015-04-02 05:40:14 -05:00
terrafrost
023fef8d8b Merge branch '2.0' of https://github.com/phpseclib/phpseclib into openssl-support-2.0 
Conflicts:
	phpseclib/Net/SSH2.php
 2015-04-02 05:37:04 -05:00
terrafrost
ebcb3130b7 Merge branch 'openssl-support' into 2.0 
Conflicts:
	phpseclib/Crypt/AES.php
	phpseclib/Crypt/Base.php
	phpseclib/Crypt/Blowfish.php
	phpseclib/Crypt/DES.php
	phpseclib/Crypt/RC2.php
	phpseclib/Crypt/RC4.php
	phpseclib/Crypt/Rijndael.php
	phpseclib/Crypt/TripleDES.php
	phpseclib/Crypt/Twofish.php
	phpseclib/Net/SSH2.php
	tests/Functional/Net/SFTPLargeFileTest.php
	tests/Unit/Crypt/AES/InternalTest.php
	tests/Unit/Crypt/AES/McryptTest.php
	tests/Unit/Crypt/AES/TestCase.php
 2015-04-02 05:32:31 -05:00