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

77 Commits

Author SHA1 Message Date
terrafrost
6b6c869bb8 Merge branch '1.0' into 2.0 2018-12-01 23:14:10 -06:00
terrafrost
363ffc9cfd System/SSH/Agent: CS adjustment 2018-12-01 23:10:54 -06:00
terrafrost
1bb2826ab1 Merge branch '1.0' into 2.0 2018-12-01 22:46:13 -06:00
terrafrost
fbef6f009f System/SSH/Agent: add parameter to constructor 2018-12-01 22:41:45 -06:00
terrafrost
f3ea7ae986 Merge branch '1.0' into 2.0 2018-11-22 21:19:33 -06:00
terrafrost
8f2a0e6f0d System/SSH/Agent: add support for rsa-sha2-256 / rsa-sha2-512 2018-11-22 20:47:15 -06:00
terrafrost
6b275cdcd5 SSH/Agent: CS adjustment 2018-05-27 11:33:37 -05:00
terrafrost
b8bb23c9f1 Merge branch '1.0' into 2.0 2018-05-27 10:44:17 -05:00
terrafrost
39a0b652b3 SSH/Agent: add dummy setHash() method 2018-05-27 10:29:56 -05:00
terrafrost
845135f887 add PHP5-style constructors along side PHP4-style ones 2016-09-10 10:41:05 -07:00
terrafrost
1a25aefa59 cherry-picking last commit added new file 2016-08-04 00:55:21 -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
8fb4c3363d undo merging of master to 2.0 branch 2016-04-28 15:34:10 -05:00
terrafrost
ceb6dc0255 System/SSH/Agent: fix namespacing on BadConfigurationException 2016-04-10 11:48:08 -05:00
terrafrost
324a973ec1 Merge branch '2.0' 2016-04-10 11:39:55 -05:00
terrafrost
4e4397afc9 Merge branch '1.0' into 2.0 2016-04-10 11:38:03 -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
6a97ddfa72 SSH/Agent: if comment is empty don't include it 2016-04-10 10:58:49 -05:00
terrafrost
c2110f68a0 SSH: fix broken public key auth 2016-02-06 15:59:34 -06:00
Joey3000
c9a80ff748 Cleanup of use operator usage
This does the following:

1. Removes superfluous usage of the `use` operator. Specifically, that operator is not needed to use classes in the same `namespace` as the object (see https://secure.php.net/manual/en/language.namespaces.rules.php).

2. While at it, also sorted the `use` operators alphabetically, for a better overview.
2016-01-18 05:05:31 +01:00
terrafrost
999cc470b1 Merge branch 'master' of https://github.com/phpseclib/phpseclib 2016-01-16 22:59:38 -06:00
terrafrost
f8a92a7e40 Merge branch '2.0' 2016-01-13 16:51:48 -06:00
terrafrost
b6899d9e79 Merge branch '1.0' into 2.0 2016-01-13 16:51:33 -06:00
terrafrost
0905143fc1 SSH/Agent: fix possible PHP Warning 2016-01-13 16:51:12 -06:00
terrafrost
c85b356b18 RSA: more updates per Joey3000 2016-01-07 22:26:10 -06:00
terrafrost
d5a359b41e RSA: updates per Joey3000 2016-01-03 13:03:58 -06:00
terrafrost
806249c7e9 RSA: changes to how encryption / signatures work 2015-12-25 11:28:24 -06: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
fab5a66fe5 RSA: make createKey static and make it return RSA objects 2015-09-24 09:43:19 -05:00
Graham Campbell
7cd45e5e1b Fixed lots of phpdoc typos 2015-09-02 00:44:55 +01:00
Graham Campbell
634c1c2a18 Fixed lots of phpdoc typos 2015-09-02 00:42:15 +01:00
Graham Campbell
cd0e10cf9d Fixed lots of phpdoc typos 2015-09-02 00:37:54 +01:00
terrafrost
2a8da097ae Merge branch 'master' into exceptions-v1
Conflicts:
	phpseclib/Net/SSH2.php
2015-08-31 23:47:12 -05:00
terrafrost
e399a320dc SSH/Agent/Identity: replace user_error's with exceptions 2015-08-31 23:36:56 -05:00
terrafrost
2eb4ebf11c SSH/Agent: replace user_error's with exceptions 2015-08-31 23:23:40 -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
terrafrost
d75f703c0a rm PHP v4 compatability claim 2015-04-02 05:57:52 -05:00
terrafrost
a8e702b34f Merge branch 'agentforwarding-1.0' into agentforwarding-2.0
Conflicts:
	phpseclib/Net/SSH2.php
	phpseclib/System/SSH/Agent.php
2015-03-29 10:32:30 -05:00
montdidier
3ff4212b92 removed unwarrented user_error 2015-03-24 13:40:42 +08:00
montdidier
9723acc885 preference isset over array_key_exists, return false on failure, break after return channel opened 2015-03-24 13:38:56 +08:00
montdidier
1803bcac0b moved agent forwarding channel handling to filter method and reusing existing open channels to request forwarding 2015-02-06 11:28:23 +08:00
montdidier
25b328c440 removed stopSSHForwarding 2015-02-05 13:19:57 +08:00
montdidier
dd0b3e6bd5 addresses low hanging fruit comments from terrafrost and bantu 2015-01-12 17:13:33 +08:00
montdidier
aca4ba3286 SSH agent forwarding implementation 2014-12-30 10:44:31 +08:00
Clint Nelissen
fe742e18d7 Namespaced Crypt Package 2014-12-16 16:16:54 -08:00