1
0
mirror of https://github.com/danog/tgseclib.git synced 2024-12-12 00:59:45 +01:00
Commit Graph

486 Commits

Author SHA1 Message Date
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
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
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
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
845135f887 add PHP5-style constructors along side PHP4-style ones 2016-09-10 10:41:05 -07:00
terrafrost
c20b661a44 SSH2: don't check for carriage return in version id string 2016-08-11 23:09:38 -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
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
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
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
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
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
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
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
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
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
c0555581e7 SSH2: fix for window sizes > 2,147,483,648 2015-06-24 23:45:14 -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