Commit Graph

1433 Commits

Author SHA1 Message Date
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
Andreas Fischer
135d1c6f06 Merge pull request #365 from bantu/x509-missing-use-biginteger
Add missing use BigInteger statement to X509.

* bantu/x509-missing-use-biginteger:
  Add missing use BigInteger statement to X509.
2014-06-05 17:16:13 +02:00
Andreas Fischer
b217994534 Add missing use BigInteger statement to X509. 2014-06-05 17:08:36 +02:00
terrafrost
b64573f4b5 SFTP: add the ability for nlist() and rawlist() to be sorted 2014-06-05 09:56:49 -05:00
Andreas Fischer
2a9d7e5e03 Merge branch 'master' into php5
* master:
  X509: Unit test CS changes
  X509: move location of SPKAC unit test
  X509: CS adjustments
  X509: PHP4 compat changes
  RSA: PHP4 compat changes
  X509: rm trailing white space from unit test
  X509: add SPKAC unit test
  X509: add signSPKAC() and saveSPKAC() methods
2014-06-05 16:56:36 +02:00
Andreas Fischer
25d31e5867 Merge pull request #362 from terrafrost/spkac
X509: add signSPKAC() and saveSPKAC() methods

* terrafrost/spkac:
  X509: Unit test CS changes
  X509: move location of SPKAC unit test
  X509: CS adjustments
  X509: PHP4 compat changes
  RSA: PHP4 compat changes
  X509: rm trailing white space from unit test
  X509: add SPKAC unit test
  X509: add signSPKAC() and saveSPKAC() methods
2014-06-05 16:56:34 +02:00
terrafrost
231566c1fb X509: Unit test CS changes 2014-06-05 09:23:22 -05:00
terrafrost
4a98679519 X509: move location of SPKAC unit test 2014-06-05 09:03:17 -05:00
terrafrost
daa466db94 Merge branch 'master' of https://github.com/phpseclib/phpseclib into spkac 2014-06-05 08:40:49 -05:00
terrafrost
b1ad911d20 X509: CS adjustments 2014-06-05 08:33:27 -05:00
terrafrost
aabc5cf822 X509: PHP4 compat changes 2014-06-05 08:10:52 -05:00
terrafrost
af0040b813 RSA: PHP4 compat changes 2014-06-05 08:10:20 -05:00
Andreas Fischer
95a99a840b Merge pull request #361 from bantu/namespacify-biginteger
Namespacify BigInteger

* bantu/namespacify-biginteger:
  Correct the remaining case by using instanceof.
  Update users of Math_BigInteger.
  Some more documentation polishing in Math/BigInteger.php.
  Adjust test cases using Math_BigInteger.
  Replace new Math_BigInteger with new static.
  Reference to instances as BigInteger instead of Math_BigInteger.
  Use namespace in example code.
  Remove any include statement.
  Add namespace statement. Rename class.
  Use __construct.
  Add PSR4 namespace to composer.json.
2014-06-04 12:08:36 +02:00
terrafrost
0cc6383c32 X509: rm trailing white space from unit test 2014-06-04 00:22:46 -05:00
terrafrost
75a045bec4 X509: add SPKAC unit test 2014-06-04 00:11:57 -05:00
terrafrost
dce03bb003 X509: add signSPKAC() and saveSPKAC() methods 2014-06-03 23:44:09 -05:00
Andreas Fischer
a643e5bfb5 Correct the remaining case by using instanceof. 2014-06-02 20:24:25 +02:00
Andreas Fischer
f2f5fcd70a Update users of Math_BigInteger. 2014-06-02 20:19:00 +02:00
Andreas Fischer
65ec4dc8bc Some more documentation polishing in Math/BigInteger.php. 2014-06-02 20:19:00 +02:00
Andreas Fischer
68ab62e70f Adjust test cases using Math_BigInteger. 2014-06-02 20:19:00 +02:00
Andreas Fischer
a011596578 Replace new Math_BigInteger with new static. 2014-06-02 20:19:00 +02:00
Andreas Fischer
740422c65f Reference to instances as BigInteger instead of Math_BigInteger. 2014-06-02 20:19:00 +02:00
Andreas Fischer
00f77ab341 Use namespace in example code. 2014-06-02 20:19:00 +02:00
Andreas Fischer
ae4099dc64 Remove any include statement. 2014-06-02 20:19:00 +02:00
Andreas Fischer
8dff257cae Add namespace statement. Rename class. 2014-06-02 20:17:18 +02:00
Andreas Fischer
7d9598a21e Use __construct. 2014-06-02 20:17:18 +02:00
Andreas Fischer
68ade659ba Add PSR4 namespace to composer.json. 2014-06-02 20:17:18 +02:00
Andreas Fischer
6f4a873cad Merge branch 'master' into php5
* master:
  Adjust documentation to coding guidelines: No () around include.
2014-06-02 12:51:24 +02:00
Andreas Fischer
8b7a605c0f Merge pull request #359 from bantu/ticket/301
Adjust documentation to coding guidelines: No () around include.

* bantu/ticket/301:
  Adjust documentation to coding guidelines: No () around include.
2014-06-02 12:51:21 +02:00
Andreas Fischer
e6f87318f5 Adjust documentation to coding guidelines: No () around include. 2014-06-01 23:28:49 +02:00
Andreas Fischer
02e06a2c55 Merge branch 'master' into php5
* master:
  RSA: update unit test file
  RSA: auto-detect public keys vs private keys
2014-06-01 22:17:38 +02:00
Andreas Fischer
07e1f954de Merge pull request #325 from terrafrost/rsa-public-key
RSA: auto-detect public keys vs private keys

* terrafrost/rsa-public-key:
  RSA: update unit test file
  RSA: auto-detect public keys vs private keys
2014-06-01 22:17:38 +02:00
Andreas Fischer
6dbcdb8174 Merge pull request #357 from bantu/tests-composer-autoloader-php5
[php5] Use composer autoloader in test bootstrap.

* bantu/tests-composer-autoloader-php5:
  PHP 5.3+: Replace custom autoloader with composer autoloader.
2014-06-01 22:01:31 +02:00
Andreas Fischer
c7d4fd937e Merge pull request #358 from bantu/ticket/321
Reimplement testGenerateIdentifier

* bantu/ticket/321:
  Reimplement testGenerateIdentifier to fix #321
2014-06-01 22:00:08 +02:00
Andreas Fischer
89aab25362 Merge branch 'master' into php5
* master:
  Reimplement testGenerateIdentifier to fix #321
2014-06-01 22:00:08 +02:00
Andreas Fischer
602606d966 Merge pull request #356 from bantu/test-directory-reorganisation
Split Unit/Functional Test Suites.

* bantu/test-directory-reorganisation:
  Split Unit/Functional Test Suites.
2014-06-01 21:56:57 +02:00
Andreas Fischer
00e2d8d959 Merge branch 'master' into php5
* master:
  Split Unit/Functional Test Suites.
2014-06-01 21:56:57 +02:00
Andreas Fischer
bb3c2ca28d Merge pull request #355 from bantu/scrutinizer-coverage
Scrutinizer CI code coverage

* bantu/scrutinizer-coverage:
  Specify the runs option for external code coverage.
  No Scrutinizer Code Coverage on HHVM either.
  Extract into upload-code-coverage-scrutinizer.sh
  Add -html suffix to existing code-coverage shell script.
  Configure Scrutinizer CI to expect external code coverage data.
  Upload clover.xml from Travis CI into Scrutinizer CI.
  Produce a clover.xml code coverage file.
2014-06-01 21:55:25 +02:00
Andreas Fischer
453f883a89 Merge branch 'master' into php5
* master:
  Specify the runs option for external code coverage.
  No Scrutinizer Code Coverage on HHVM either.
  Extract into upload-code-coverage-scrutinizer.sh
  Add -html suffix to existing code-coverage shell script.
  Configure Scrutinizer CI to expect external code coverage data.
  Upload clover.xml from Travis CI into Scrutinizer CI.
  Produce a clover.xml code coverage file.
2014-06-01 21:55:25 +02:00