octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-11-16 10:15:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,557 Commits 4 Branches 121 Tags 20 MiB
2871cce58d
Commit Graph

1557 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Fischer
cf921a347a Merge branch 'master' into php5 
* master:
  SSH2: rm unused constant
 2014-09-07 12:43:27 +02:00
Andreas Fischer
f2cab55fd5 Merge pull request #470 from terrafrost/ssh2-rm-unused-constant 
SSH2: rm unused constant

* terrafrost/ssh2-rm-unused-constant:
  SSH2: rm unused constant
 2014-09-07 12:43:22 +02:00
terrafrost
67279d7811 SSH2: rm unused constant 
it doesn't need to be defined since the strlen($this->last_interactive_response)
check in _login_helper serves the same purpose that NET_SSH_MASK_LOGIN_INTERACTIVE
was intended to serve
 2014-09-06 20:30:01 -05:00
terrafrost
713393c8ad RSA: make XML keys use unsigned integers 
PKCS1 / PKCS8 keys need *signed* integers because of section 8.3.3
at http://www.itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf#page=7
 2014-09-06 11:13:11 -05:00
Andreas Fischer
30385bdffc Merge branch 'master' into php5 
* master:
  runkit: Provide alternative repository for PHP 5.6.
  runkit: Change git from git:// to https://
 2014-09-04 22:59:23 +02:00
Andreas Fischer
2ef5a00dff Merge pull request #464 from bantu/runkit-php5.6 
Restore runkit on Travis CI PHP 5.6.

* bantu/runkit-php5.6:
  runkit: Provide alternative repository for PHP 5.6.
  runkit: Change git from git:// to https://
 2014-09-04 22:59:18 +02:00
Andreas Fischer
6360f2f8b8 Merge branch 'master' into php5 
* master:
  ASN1Test: Even better, use assertCount instead of assertSame.
  ASN1Test: The expected value comes first in assertEquals/assertSame.
  ASN1Test: Also check the type by using assertSame instead of assertEquals.
 2014-09-04 22:54:01 +02:00
Andreas Fischer
e8ccb7a995 Merge pull request #466 from bantu/asn1-handle-indef-lengths-tests-fixup 
ASN1Test: Use assertSame and the correct parameter order.

* bantu/asn1-handle-indef-lengths-tests-fixup:
  ASN1Test: Even better, use assertCount instead of assertSame.
  ASN1Test: The expected value comes first in assertEquals/assertSame.
  ASN1Test: Also check the type by using assertSame instead of assertEquals.
 2014-09-04 22:53:57 +02:00
Andreas Fischer
3fc86d641c runkit: Provide alternative repository for PHP 5.6. 2014-09-04 22:47:48 +02:00
Andreas Fischer
9c3ce656f4 ASN1Test: Even better, use assertCount instead of assertSame. 2014-09-04 22:33:41 +02:00
Andreas Fischer
8e3b83af56 ASN1Test: The expected value comes first in assertEquals/assertSame. 2014-09-04 22:27:33 +02:00
Andreas Fischer
7c2b399915 ASN1Test: Also check the type by using assertSame instead of assertEquals. 2014-09-04 22:26:37 +02:00
Andreas Fischer
6cb0528d6e Merge branch 'master' into php5 
* master:
  ASN1: one more unit test change
  ASN1: another unit test update
  ASN1: unit test adjustments
  ASN1: cs adjustments to unit test
  ASN1: add unit tests for indefinite length decoding
  ASN1: CS adjustment (rm whitespace at eol)
  ASN1: rewrite _decode_der

Conflicts:
	phpseclib/File/ASN1.php
 2014-09-04 22:22:16 +02:00
Andreas Fischer
5e9d41f403 Merge pull request #462 from terrafrost/asn1-handle-indef-lengths 
ASN1: rewrite _decode_der

* terrafrost/asn1-handle-indef-lengths:
  ASN1: one more unit test change
  ASN1: another unit test update
  ASN1: unit test adjustments
  ASN1: cs adjustments to unit test
  ASN1: add unit tests for indefinite length decoding
  ASN1: CS adjustment (rm whitespace at eol)
  ASN1: rewrite _decode_der
 2014-09-04 22:20:27 +02:00
Andreas Fischer
7b665a18a1 runkit: Change git from git:// to https:// 2014-09-04 04:23:11 +02:00
terrafrost
bb6d5d9bc0 ASN1: one more unit test change 2014-09-03 20:54:24 -05:00
terrafrost
8293b66136 ASN1: another unit test update 2014-09-03 20:28:07 -05:00
terrafrost
34866bf095 ASN1: unit test adjustments 2014-09-03 19:30:42 -05:00
Andreas Fischer
42e05a6714 Merge branch 'master' into php5 
* master:
  SSH2: don't count data length against window size
 2014-09-03 20:44:53 +02:00
Andreas Fischer
9774ee58d1 Merge pull request #463 from terrafrost/ssh-window-size-changes 
SSH2: don't count data length against window size

* terrafrost/ssh-window-size-changes:
  SSH2: don't count data length against window size
 2014-09-03 20:44:41 +02:00
terrafrost
36b4b13863 ASN1: cs adjustments to unit test 2014-09-03 00:36:43 -05:00
terrafrost
871e1a3070 ASN1: add unit tests for indefinite length decoding 2014-09-03 00:29:04 -05:00
terrafrost
3bb123c3d5 ASN1: CS adjustment (rm whitespace at eol) 2014-08-30 19:44:12 -05:00
terrafrost
9e71e0bce8 SSH2: don't count data length against window size 
it is my hope that the issues 8c9e7a890e
and ccb1c3e2bd sought to resolve were
fixed 9f8d8a7bf6 and
7a2c7a414c.
 2014-08-30 15:26:23 -05:00
terrafrost
e258e001fa ASN1: rewrite _decode_der 
this rewrite makes phpseclib better able to handle indef lengths,
which had previously been untested.
 2014-08-25 10:12:56 -05:00
Andreas Fischer
830667ce75 Merge branch 'master' into php5 
* master:
  Replaced "case true:" with "default:"
  Error: "Constant CRYPT_RSA_MODE already defined"
 2014-08-25 15:16:34 +02:00
Andreas Fischer
e0868df0ec Merge pull request #460 from kroleg/patch-1 
Error: "Constant CRYPT_RSA_MODE already defined"

* kroleg/patch-1:
  Replaced "case true:" with "default:"
  Error: "Constant CRYPT_RSA_MODE already defined"
 2014-08-25 15:16:23 +02:00
Vitaliy Zaytsev
2ee0529c9d Replaced "case true:" with "default:" 2014-08-25 19:58:38 +07:00
Vitaliy Zaytsev
cf10e07660 Error: "Constant CRYPT_RSA_MODE already defined" 
It happens if defined(MATH_BIGINTEGER_OPENSSL_DISABLE) && !function_exists('openssl_pkey_get_details')
 2014-08-25 19:03:24 +07:00
Andreas Fischer
a15079676c Merge branch 'master' into php5 
* master:
  SFTP: cs adjustment
  SFTP: optimize conditional calls to fclose in get() method
  SFTP: grammar
  SFTP: fix issue with uploading via a resource
  SFTP: make it so files can be downloaded into resources or upload   from resources
 2014-08-19 22:25:07 +02:00
Andreas Fischer
7696cbf826 Merge pull request #456 from terrafrost/sftp-resources 
SFTP: make it so files can be downloaded into resources or upload from resources

* terrafrost/sftp-resources:
  SFTP: cs adjustment
  SFTP: optimize conditional calls to fclose in get() method
  SFTP: grammar
  SFTP: fix issue with uploading via a resource
  SFTP: make it so files can be downloaded into resources or upload   from resources
 2014-08-19 22:25:02 +02:00
terrafrost
74feca9cf2 SFTP: cs adjustment 2014-08-19 14:20:20 -05:00
terrafrost
cb66c561c2 SFTP: optimize conditional calls to fclose in get() method 2014-08-19 14:05:24 -05:00
terrafrost
29e0143308 SFTP: grammar 2014-08-16 15:49:38 -05:00
terrafrost
7ed53f2428 SFTP: fix issue with uploading via a resource 2014-08-16 13:56:34 -05:00
terrafrost
e48ee12940 SFTP: make it so files can be downloaded into resources or upload 
from resources
 2014-08-16 12:49:55 -05:00
Andreas Fischer
6ba2b374e5 Merge branch 'master' into php5 
* master:
  AES: don't do mcrypt unit tests if mcrypt extension is not available
  AES: a few final changes
  AES: set CRYPT_RIJNDAEL_MODE as well in unit tests
  AES: CS changes to unit tests
  AES: more unit test fixes
  AES: unit test updates
  AES: more unit test fixes
  AES: add new lines to end of unit tests
  AES: CS adjustments to unit tests
  AES: first attempt at unit tests for key padding
  Rijndael, AES: adjustments to what key sizes are and aren't allowed
 2014-08-15 16:27:36 +02:00
Andreas Fischer
0d7e9199ef Merge pull request #453 from terrafrost/aes-fix 
Rijndael, AES: adjustments to what key sizes are and aren't allowed

* terrafrost/aes-fix:
  AES: don't do mcrypt unit tests if mcrypt extension is not available
  AES: a few final changes
  AES: set CRYPT_RIJNDAEL_MODE as well in unit tests
  AES: CS changes to unit tests
  AES: more unit test fixes
  AES: unit test updates
  AES: more unit test fixes
  AES: add new lines to end of unit tests
  AES: CS adjustments to unit tests
  AES: first attempt at unit tests for key padding
  Rijndael, AES: adjustments to what key sizes are and aren't allowed
 2014-08-15 16:27:31 +02:00
terrafrost
0d6fbb9e30 AES: don't do mcrypt unit tests if mcrypt extension is not available 2014-08-15 09:23:55 -05:00
terrafrost
aa0e7347ef AES: a few final changes 2014-08-14 23:09:17 -05:00
terrafrost
7a1b1df600 AES: set CRYPT_RIJNDAEL_MODE as well in unit tests 2014-08-14 11:27:27 -05:00
terrafrost
4d72d1b48d AES: CS changes to unit tests 2014-08-14 11:09:54 -05:00
terrafrost
d01c1b1eb7 AES: more unit test fixes 2014-08-14 10:59:37 -05:00
terrafrost
085ec03b53 AES: unit test updates 2014-08-14 10:47:26 -05:00
terrafrost
3fdd5731d1 AES: more unit test fixes 2014-08-14 10:37:10 -05:00
terrafrost
42e5c6845c AES: add new lines to end of unit tests 2014-08-14 10:31:57 -05:00
terrafrost
d88b7ed6dd AES: CS adjustments to unit tests 2014-08-14 10:06:25 -05:00
terrafrost
8cf6af94dd AES: first attempt at unit tests for key padding 2014-08-14 10:03:01 -05:00
terrafrost
35fd2888ea Rijndael, AES: adjustments to what key sizes are and aren't allowed 2014-08-13 09:56:49 -05:00
Andreas Fischer
c59750562a Merge branch 'master' into php5 
* master:
  BigInteger: fix previous fix
  BigInteger:  small optimization to bitwise_not
 2014-08-12 11:30:30 +02:00