octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-11-09 15:20:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,321 Commits 4 Branches 121 Tags 19 MiB
e4516fb453
Commit Graph

1321 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
4ada8675ba Check for old-style constructor names via Code Sniffer. 2014-06-16 17:06:18 +02:00
Andreas Fischer
ac449e1965 Merge branch 'master' into php5 
* master:
  Always correctly link to the constructor of Crypt_Base.
 2014-06-16 17:03:52 +02:00
Andreas Fischer
765154f54e Merge pull request #378 from bantu/UselessOverridingMethod 
Always correctly link to the constructor of Crypt_Base.

* bantu/UselessOverridingMethod:
  Always correctly link to the constructor of Crypt_Base.
 2014-06-16 17:03:51 +02:00
Andreas Fischer
fc417115be Merge branch 'master' into php5 
* master:
  BigInteger: one more change to the comments
  BigInteger: update comments
  BigInteger: unit test update
  BigInteger: change argument names for random / randomPrime
  BigInteger: fix unit tests
  BigInteger: fix syntax error
  BigInteger: make it so you can do $min->random($max)

Conflicts:
	phpseclib/Math/BigInteger.php
 2014-06-16 17:00:00 +02:00
terrafrost
0bafe1e6c6 Crypt/Base: readability improvement 2014-06-16 09:57:04 -05:00
Andreas Fischer
088e31b6ea Merge pull request #373 from terrafrost/another-random-change 
BigInteger: make it so you can do $min->random($max)

* terrafrost/another-random-change:
  BigInteger: one more change to the comments
  BigInteger: update comments
  BigInteger: unit test update
  BigInteger: change argument names for random / randomPrime
  BigInteger: fix unit tests
  BigInteger: fix syntax error
  BigInteger: make it so you can do $min->random($max)
 2014-06-16 16:54:00 +02:00
terrafrost
82b5e02f06 Random: add explanatory comment 2014-06-16 09:53:55 -05:00
terrafrost
4401b7e21e SSH2: replace _is_includable() with stream_resolve_include_path 2014-06-16 09:47:13 -05:00
Andreas Fischer
d38886c2a9 Always correctly link to the constructor of Crypt_Base. 2014-06-16 16:42:18 +02:00
terrafrost
638e6c78ec Random: include the Crypt_* classes if they're available 
also error out if none are available
 2014-06-16 09:40:27 -05:00
Andreas Fischer
c2a6667ed2 Merge branch 'master' into php5 
* master:
  Remove unnecessary constructors.
 2014-06-16 16:29:29 +02:00
Andreas Fischer
c05cfe4c10 Merge pull request #376 from bantu/UselessOverridingMethod 
Remove unnecessary constructors.

* bantu/UselessOverridingMethod:
  Remove unnecessary constructors.
 2014-06-16 16:29:28 +02:00
Andreas Fischer
635c524b6b Merge branch 'master' into php5 
* master:
  RC4: speedups
 2014-06-16 16:28:29 +02:00
Andreas Fischer
5cc024a3b5 Merge pull request #377 from terrafrost/rc4-changes 
RC4: speedups

* terrafrost/rc4-changes:
  RC4: speedups
 2014-06-16 16:28:29 +02:00
terrafrost
4b9eb4af27 BigInteger: one more change to the comments 2014-06-16 09:23:34 -05:00
terrafrost
0938cba3c3 RC4: speedups 2014-06-16 09:19:14 -05:00
Andreas Fischer
91e78c2106 Remove unnecessary constructors. 2014-06-16 16:14:35 +02:00
terrafrost
0eb0ae7ff7 BigInteger: update comments 2014-06-16 09:09:26 -05:00
terrafrost
92e6b23528 BigInteger: unit test update 2014-06-15 12:13:56 -05:00
terrafrost
34a971d317 BigInteger: change argument names for random / randomPrime 2014-06-14 23:49:57 -05:00
terrafrost
281a8c669e BigInteger: fix unit tests 2014-06-14 20:47:57 -05:00
terrafrost
f8f0bd44b7 BigInteger: fix syntax error 2014-06-14 19:20:05 -05:00
terrafrost
46166c7351 BigInteger: make it so you can do $min->random($max) 
...and $min->randomPrime($max) as well
 2014-06-14 14:07:33 -05:00
Andreas Fischer
6a8ac88a0c Merge branch 'master' into php5 
* master:
  RC2: speed-ups and CS changes
 2014-06-13 23:49:53 +02:00
Andreas Fischer
8e07ebfd51 Merge pull request #371 from terrafrost/rc2 
RC2: speed-ups and CS changes

* terrafrost/rc2:
  RC2: speed-ups and CS changes
 2014-06-13 23:49:53 +02:00
terrafrost
04d66db309 RC2: speed-ups and CS changes 2014-06-13 16:30:12 -05:00
terrafrost
d8b235141e RSA: CS adjustments 2014-06-13 13:17:37 -05:00
terrafrost
83301097ea RSA: rename PUBLIC_FORMAT_PKCS1_RAW -> PUBLIC_FORMAT_PKCS8 
also make CRYPT_RSA_PUBLIC_FORMAT_PKCS8 the default format
 2014-06-13 13:11:59 -05:00
terrafrost
4878f2a99b RSA: add PKCS8 unit tests 2014-06-13 12:39:12 -05:00
terrafrost
4434d91f25 RSA: add support for saving encrypted PKCS8 keys 2014-06-13 11:43:32 -05:00
terrafrost
d474f56f60 Crypt/Base: adjust default key size for pbkdf1 2014-06-13 10:39:57 -05:00
terrafrost
abae026264 RSA: add support for loading PKCS8 encrypted private keys 2014-06-13 08:56:00 -05:00
terrafrost
21c6a15df3 Crypt/Base: add support for pbkdf1 2014-06-13 08:54:30 -05:00
terrafrost
0a5e26a648 RSA: add support for saving to PKCS8 (unencrypted) 2014-06-12 22:03:00 -05:00
Andreas Fischer
76ac2a863d Merge branch 'master' into php5 
* master:
  RSA: slight adjustment to CRYPT_RSA_PUBLIC_FORMAT_PKCS1_RAW format
 2014-06-11 08:05:49 +02:00
Andreas Fischer
90bc07e292 Merge pull request #366 from terrafrost/rsa-format-change 
RSA: slight adjustment to CRYPT_RSA_PUBLIC_FORMAT_PKCS1_RAW format

* terrafrost/rsa-format-change:
  RSA: slight adjustment to CRYPT_RSA_PUBLIC_FORMAT_PKCS1_RAW format
 2014-06-11 08:05:48 +02:00
Andreas Fischer
14ba37c539 Merge branch 'master' into php5 
* master:
  SSH2: make $mac_algorithms non-static
 2014-06-11 07:49:02 +02:00
Andreas Fischer
a39da4dba3 Merge pull request #367 from terrafrost/ssh-mac-algo 
SSH2: make $mac_algorithms non-static

* terrafrost/ssh-mac-algo:
  SSH2: make $mac_algorithms non-static
 2014-06-11 07:48:57 +02:00
terrafrost
246e9e154f SSH2: make $mac_algorithms non-static 
none of the other statically defined variables have the potential
to change as multiple Net_SSH2 objects are created but this one does.

ie. if you connect to one SSH-2.0-SSHD server then no subsequent server
will use hmac-sha1-96 even if it could
 2014-06-10 23:08:56 -05:00
terrafrost
72a0913d39 RSA: slight adjustment to CRYPT_RSA_PUBLIC_FORMAT_PKCS1_RAW format 
CRYPT_RSA_PUBLIC_FORMAT_PKCS1_RAW and CRYPT_RSA_PUBLIC_FORMAT_PKCS1
produce two very similar looking keys but they are not the same.
As dissection OpenSSL's asn1parse would reveal CRYPT_RSA_PUBLIC_FORMAT_PKCS1
has the fact that it is an RSA key embedded within it whereas
CRYPT_RSA_PUBLIC_FORMAT_PKCS1_RAW does not. phpseclib now resolves
this ambiguity in the same way that OpenSSH's ssh-keygen does.

Despite this change CRYPT_RSA_PUBLIC_FORMAT_PKCS1_RAW is still incompatible
with OpenSSL's rsautl (CRYPT_RSA_PUBLIC_FORMAT_PKCS1 is compatible). I guess
this incompatibility isn't just due to the headers but is also due to the
overall structure of the format.
 2014-06-10 22:16:59 -05:00
Andreas Fischer
f40bc4d3b8 Merge branch 'master' into php5 
* master:
  SFTP: update one last comment
  SFTP: update unit test comments
  SFTP: add new line to end of unit test
  SFTP: assertEquals -> assertSame
  SFTP: reset sort options every time and update unit test
  SFTP: rm whitespace
  SFTP: define $sortOptions
  SFTP: add the ability for nlist() and rawlist() to be sorted
 2014-06-09 20:19:39 +02:00
Andreas Fischer
6e796d091a Merge pull request #364 from terrafrost/sftp-sort2 
SFTP: add the ability for nlist() and rawlist() to be sorted

* terrafrost/sftp-sort2:
  SFTP: update one last comment
  SFTP: update unit test comments
  SFTP: add new line to end of unit test
  SFTP: assertEquals -> assertSame
  SFTP: reset sort options every time and update unit test
  SFTP: rm whitespace
  SFTP: define $sortOptions
  SFTP: add the ability for nlist() and rawlist() to be sorted
 2014-06-09 20:19:33 +02:00
terrafrost
3ded2d9f81 SFTP: update one last comment 2014-06-09 11:33:17 -05:00
terrafrost
0cb6fbc983 SFTP: update unit test comments 2014-06-09 09:46:31 -05:00
terrafrost
fb1dbbf75c SFTP: add new line to end of unit test 2014-06-09 09:44:27 -05:00
terrafrost
c8343e77c7 SFTP: assertEquals -> assertSame 2014-06-09 09:42:07 -05:00
terrafrost
0e2b2a416b SFTP: reset sort options every time and update unit test 2014-06-09 09:22:30 -05:00
terrafrost
8dff207ed3 SFTP: rm whitespace 2014-06-05 15:06:50 -05:00
terrafrost
8c0f710083 SFTP: define $sortOptions 2014-06-05 10:50:13 -05:00