terrafrost
ae1e5c13f9
Merge branch 'master' into cipher-revamp
2016-02-20 21:44:00 -06: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
806249c7e9
RSA: changes to how encryption / signatures work
2015-12-25 11:28:24 -06:00
terrafrost
43165d976c
RSA: changes to OpenSSH and PuTTY plugins
2015-10-24 15:54:34 -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
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
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
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
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
fe742e18d7
Namespaced Crypt Package
2014-12-16 16:16:54 -08:00
Clint Nelissen
628949fb73
Namespaced classes
2014-12-15 14:29:20 -08: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
99b9cc477d
Moved global constants to class constants
2014-12-04 13:45:13 -08: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
Andreas Fischer
e85321959e
SSH1: Math_BigInteger is supposed to be BigInteger.
2014-09-07 22:26:22 +02:00
Andreas Fischer
67aedc240b
Change constructors from class name to __construct().
...
This has been produced as follows:
<?php
$replace = $files = [];
$it = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($argv[1]));
foreach ($it as $fileinfo) {
if ($fileinfo->getExtension() === 'php') {
$file = $fileinfo->getPathname();
$content = file_get_contents($file);
$files[$file] = $content;
$tokens = token_get_all($content);
foreach ($tokens as $key => $value) {
if ($value[0] === T_CLASS) {
$class = $tokens[$key + 2][1];
$replace += array(
"$class::$class(" => "$class::__construct(",
"parent::$class(" => "parent::__construct(",
"function $class(" => "function __construct(",
);
}
}
}
}
foreach ($files as $file => $content) {
file_put_contents(
$file,
str_replace(
array_keys($replace),
array_values($replace),
$content
)
);
}
2014-06-16 17:06:34 +02:00
Andreas Fischer
f2f5fcd70a
Update users of Math_BigInteger.
2014-06-02 20:19:00 +02:00
Andreas Fischer
e6f87318f5
Adjust documentation to coding guidelines: No () around include.
2014-06-01 23:28:49 +02:00
terrafrost
677a291cb3
SSH: clarify role of constructor / connection timeout
...
Also, in Net_SSH2::_connect() $host is used in multiple places. Rather than changing all references to {$this->host}:{$this->port} preserve existing $host reference and update it accordingly
2014-04-07 10:26:46 -05:00
terrafrost
24bb941799
SSH1: do fsockopen() call when login has been called
2014-04-07 00:30:50 -05:00
Andreas Fischer
fb1296bbec
Drop meaningless, outdated, inconsistent version tags in doc blocks.
...
find phpseclib -type f -name "*.php" -exec sed -i '/@version/d' {} \;
2014-03-11 15:58:33 +01:00
Andreas Fischer
9c7c01c337
Merge pull request #223 from mpscholten/fix-ssh1-php55
...
Fix Net_SSH1 on Php5.5 (/e preg_replace modifier)
* mpscholten/fix-ssh1-php55:
Fixed classname of test
Fixed some wrong @see annotations
Fixed /e preg_replace modifier exactly like in 0dc8b27a6a
2013-12-26 18:41:25 +01:00
Marc Philip Scholten
6d8c02c432
Fixed some wrong @see annotations
2013-12-26 12:09:40 +01:00
Andreas Fischer
0f69d35584
Fix indentation of _append_log in SSH1 and SSH2.
2013-12-26 11:45:24 +01:00
