Commit Graph

1583 Commits

Author SHA1 Message Date
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
Andreas Fischer
cb8f991752 Merge pull request #448 from terrafrost/bits-change
BigInteger:  small optimization to bitwise_not

* terrafrost/bits-change:
  BigInteger: fix previous fix
  BigInteger:  small optimization to bitwise_not
2014-08-12 11:30:21 +02:00
Andreas Fischer
1089dfb797 Merge branch 'master' into php5
* master:
  Hash: rm first parameter of testHMAC call
  Hash: fix unit tests
  Hash: refactor unit tests
2014-08-11 20:55:09 +02:00
Andreas Fischer
42edd4d8e4 Merge pull request #450 from terrafrost/hash-96-3
Hash: refactor unit tests

* terrafrost/hash-96-3:
  Hash: rm first parameter of testHMAC call
  Hash: fix unit tests
  Hash: refactor unit tests
2014-08-11 20:55:03 +02:00
terrafrost
89970885ed Hash: rm first parameter of testHMAC call 2014-08-10 15:18:51 -05:00
terrafrost
3f897cf48b Hash: fix unit tests 2014-08-10 14:54:36 -05:00
terrafrost
33182bb2de BigInteger: fix previous fix 2014-08-10 14:47:08 -05:00
terrafrost
fb2ecc6c18 Hash: refactor unit tests 2014-08-10 11:52:31 -05:00
Andreas Fischer
83485c130f Merge branch 'master' into php5
* master:
  Hash: apply fixes to sha512 unit tests as well
  Hash: one more fix to unit test
  Hash: fix unit tests
  Hash: add unit tests
  Hash: add sha256-96 and sha512-96
2014-08-10 17:59:08 +02:00
Andreas Fischer
63974e9bbc Merge pull request #446 from terrafrost/hash-96-2
Hash: add sha256-96 and sha512-96

* terrafrost/hash-96-2:
  Hash: apply fixes to sha512 unit tests as well
  Hash: one more fix to unit test
  Hash: fix unit tests
  Hash: add unit tests
  Hash: add sha256-96 and sha512-96
2014-08-10 17:59:03 +02:00
terrafrost
4fa96e384c Hash: apply fixes to sha512 unit tests as well 2014-08-10 09:14:33 -05:00
terrafrost
a52315a0cb Hash: one more fix to unit test 2014-08-10 09:08:52 -05:00
Andreas Fischer
9dc92a82a4 Merge branch 'master' into php5
* master:
  SSH2: white space adjustment
  SSH: update getServerPublicHostKey() to use new _connect() method
  SSH2: fix if statement for conditional _connect() call
  simplify calls to $this->_connect()
  SSH2: make it so negotiated algorithms can be seen before login
2014-08-10 12:10:11 +02:00
Andreas Fischer
1de939fb4a Merge pull request #427 from terrafrost/ssh2-show-methods-before-login
SSH2: make it so negotiated algorithms can be seen before login

* terrafrost/ssh2-show-methods-before-login:
  SSH2: white space adjustment
  SSH: update getServerPublicHostKey() to use new _connect() method
  SSH2: fix if statement for conditional _connect() call
  simplify calls to $this->_connect()
  SSH2: make it so negotiated algorithms can be seen before login
2014-08-10 12:10:04 +02:00
terrafrost
04e263bb8c SSH2: white space adjustment 2014-08-10 02:09:28 -05:00
terrafrost
a906e83f2a Hash: fix unit tests 2014-08-10 02:07:54 -05:00
terrafrost
4ce7a0f63a BigInteger: small optimization to bitwise_not 2014-08-10 02:03:58 -05:00
terrafrost
e3136ccd13 Hash: add unit tests 2014-08-10 02:01:21 -05:00
terrafrost
085fb0ebb8 SSH: update getServerPublicHostKey() to use new _connect() method 2014-08-06 14:42:08 -05:00
terrafrost
88d6517d93 Hash: add sha256-96 and sha512-96
IPSec uses them and some versions of OpenSSH use them (even though RFC6668 makes no mention of them)
2014-08-05 23:27:11 -05:00
terrafrost
5b019b22d9 SSH2: fix if statement for conditional _connect() call 2014-08-05 19:30:14 -05:00
terrafrost
dffef50838 simplify calls to $this->_connect() 2014-08-04 20:11:34 -05:00
Andreas Fischer
194b0d967b Merge branch 'master' into php5
* master:
  only use runkit functions if runkit isn't loaded
  Unit tests: changing the mode with runkit causes issues with static vars
2014-08-05 00:10:26 +02:00
Andreas Fischer
c52441e7f2 Merge pull request #443 from terrafrost/runkit-fix
Unit tests: changing the mode with runkit causes issues with static vars

* terrafrost/runkit-fix:
  only use runkit functions if runkit isn't loaded
  Unit tests: changing the mode with runkit causes issues with static vars
2014-08-05 00:10:19 +02:00
terrafrost
c0731df4be only use runkit functions if runkit isn't loaded 2014-08-04 16:33:23 -05:00