Commit Graph

3363 Commits

Author SHA1 Message Date
Andreas Fischer
9758ab1688 [coverage-html] Generate HTML code coverage report and rsync it out of travis. 2013-01-16 18:59:35 +01:00
terrafrost
309a31c431 Merge pull request #55 from bantu/travis/php-5.5
[travis/php-5.5] Also build on PHP 5.5 environment.
2013-01-15 09:38:04 -08:00
Andreas Fischer
c4311c5297 [travis/php-5.5] Also build on PHP 5.5 environment. 2013-01-15 16:54:51 +01:00
terrafrost
ff4f724c7e Merge pull request #54 from bantu/travis/php-5.3.3
[travis/php-5.3.3] Also build on PHP 5.3.3 in addition to the latest 5.3...
2013-01-14 18:46:32 -08:00
Andreas Fischer
0082ae0434 [travis/php-5.3.3] Build on PHP 5.3.3 in addition to the latest 5.3 version. 2013-01-15 02:52:30 +01:00
Hans-Jürgen Petrich
f7dc23a18e 3DES: Fixed ContinuousBuffer() in CTR/CFB/OFB
FIXED: multiple calls to enable/enableContinuousBuffer() work's now in CTR/CFB/OFB
FIXED: "Illegal string offset" and strlen(array()) Warning/Notice
Performance improvement in CFB Mode with enableContinuousBuffer() using MODE_MCRYPT
2013-01-14 21:23:20 +07:00
terrafrost
c7c150bcd9 Merge remote-tracking branch 'upstream/master' 2013-01-14 01:18:02 -06:00
terrafrost
efe8cc45e5 Merge branch 'petrich' 2013-01-14 01:17:06 -06:00
terrafrost
f1ccbd4ee1 Merge pull request #50 from bantu/constant-trickery
Also test Math_BigInteger without OpenSSL.
2013-01-13 14:43:37 -08:00
Andreas Fischer
93d7bf4444 [constant-trickery] Also test without OpenSSL. 2013-01-13 19:15:35 +01:00
Andreas Fischer
6d24b92b11 [constant-trickery] Better name for constant redefine method. 2013-01-13 19:08:20 +01:00
terrafrost
5d49af105f SSH2: $this->channel_buffers is an array - not a string 2013-01-13 11:36:57 -06:00
terrafrost
db949bfc61 Merge remote-tracking branch 'upstream/master' 2013-01-13 10:50:47 -06:00
terrafrost
94ca5e1d0c SSH1,SSH2: strpos expects string - not array 2013-01-13 10:49:03 -06:00
terrafrost
5fab481a6a Merge pull request #48 from bantu/constant-trickery
Run BigInteger tests for all implementations if possible.
2013-01-12 15:59:22 -08:00
Andreas Fischer
f62a9114b3 [constant-trickery] Reimport class definition to clear static variables. 2013-01-12 21:38:38 +01:00
Hans-Jürgen Petrich
c624c785ee DES: Fixed CFB/OFB and continuousBuffer
FIXED: multiple calls to enable/disableCMode() will work now
FIXED: CFB/OFB modes
FIXED: "Illegal string offset" and strlen(array()) Warning/Notice
2013-01-13 01:48:48 +07:00
terrafrost
bccce5802c SSH2: Use strlen instead of empty 2013-01-12 10:46:19 -06:00
terrafrost
b8768c8d11 SSH1: Make it so SSH packets spanning multiple TCP/IP packets can be rcvd 2013-01-12 10:45:35 -06:00
Andreas Fischer
3c75fa1ad4 [constant-trickery] Also skip tests when required extension is missing. 2013-01-12 03:07:41 +01:00
Andreas Fischer
306f0711ed [constant-trickery] Try to use runkit to redefine mode constants. 2013-01-12 03:03:29 +01:00
Andreas Fischer
55e9f4d7ef [constant-trickery] Add runkit to PHP. Thanks to kherge for those lines. 2013-01-12 03:03:07 +01:00
Andreas Fischer
b83ca10246 [constant-trickery] Add extra test cases for BCMath and GMP. 2013-01-12 02:57:21 +01:00
Andreas Fischer
2ad6f71002 [constant-trickery] Provide infrastructure for setting mode constants. 2013-01-12 02:48:19 +01:00
Andreas Fischer
2c3b165556 [constant-trickery] Add PhpseclibTestCase. No longer use PHPUnit directly. 2013-01-12 02:34:46 +01:00
Andreas Fischer
f897e36e96 [constant-trickery] Turn existing BigIntegerTest into an abstract TestCase. 2013-01-12 02:21:51 +01:00
terrafrost
bbed0916cd SSH2: Make $stop be after all network activity 2013-01-11 18:38:38 -06:00
terrafrost
4c3bf94806 Merge branch 'master' of https://github.com/phpseclib/phpseclib 2013-01-11 18:38:08 -06:00
terrafrost
ab7f65d436 SSH1: Added setTimeout()
Note that interactiveRead() was left untouched.
2013-01-11 18:36:58 -06:00
terrafrost
e379138450 Merge pull request #40 from bantu/issue/39
[issue/39] Test case for Github ContinuousBuffer issue 39
2013-01-11 16:14:40 -08:00
terrafrost
76a24dc546 AES: $pos will always be 0 in the last if statement for CFB 2013-01-11 18:09:28 -06:00
terrafrost
7c0926d94a Merge remote-tracking branch 'origin/petrich'
Conflicts:
	phpseclib/Crypt/AES.php
2013-01-11 18:06:43 -06:00
terrafrost
74e61deb4f AES: CFB: decrypted strings were being truncated 2013-01-11 15:30:06 -06:00
terrafrost
d90caa17e3 SSH1: CS adjustments 2013-01-11 00:31:49 -06:00
terrafrost
4a1cbfa7fd Merge remote-tracking branch 'petrich/patch-3' into petrich
Conflicts:
	phpseclib/Crypt/AES.php
2013-01-10 23:49:59 -06:00
terrafrost
bbd62f6490 AES: CFB mode fix 2013-01-10 20:42:38 -06:00
terrafrost
5ce9ad6a42 Random: $urandom -> $fp 2013-01-10 13:19:31 -06:00
Hans-Jürgen Petrich
20461866ef AES: Fix broken CFB and disableContinuousBuffer()
Related to: https://github.com/phpseclib/phpseclib/pull/45
2013-01-10 23:27:12 +07:00
terrafrost
46baf1815f SSH1: Fix E_NOTICE 2013-01-10 00:42:53 -06:00
terrafrost
c3ee632587 SSH1: fix "Expected SSH_SMSG_SUCCESS" error 2013-01-09 23:56:33 -06:00
terrafrost
b1c96faf90 SSH1: Packets shown in log were encrypted 2013-01-09 22:54:11 -06:00
terrafrost
d741def23c AES: Fix broken CFB and disableContinuousBuffer()
Quoting from petrich's pull request (from which this commit was inspired):

Fixed: Broken CFB in continuous mode when using CRYPT_AES_MODE_MCRYPT (related to: #39 )
Fixed: Multiple calls to enable/disableContinuousBuffer()
Fixed: Some PHP Notice/Warnings about strlen(array())
2013-01-09 17:39:57 -06:00
terrafrost
2ead31dac2 rm debug code 2013-01-09 00:07:54 -06:00
terrafrost
e71fc97913 Revamp SSH1 logging and go back to using user_error
(_handle_error returned the line number in _handle_error - not the line number triggering the error)
2013-01-08 22:09:27 -06:00
terrafrost
10d9671601 SSH1: Fix E_NOTICE (thanks nosx!) 2013-01-08 11:15:28 -06:00
terrafrost
a890c6d127 Merge remote-tracking branch 'origin/petrich' 2013-01-06 19:14:05 -06:00
terrafrost
5e882d57fe Merge remote-tracking branch 'origin/petrich' 2013-01-06 19:10:25 -06:00
terrafrost
edc6d9cf5b AES.php in mcrypt mode always treated CFB as though it was a continuous cipher 2013-01-06 19:09:43 -06:00
terrafrost
fc2bf41588 Fix E_NOTICEs in the rewritten CFB mode 2013-01-06 19:08:36 -06:00
terrafrost
1626c0a3c7 CS adjustments to petrich's code and optimizations 2013-01-05 17:55:30 -06:00