Commit Graph

1942 Commits

Author SHA1 Message Date
terrafrost
7b58268d58 Crypt/Base: fix bug with openssl non-continuous CTR mode 2014-12-31 23:38:55 -06:00
terrafrost
dffde1fffc Tests/AES: rm last two commits - this info can already be derived 2014-12-31 23:02:22 -06:00
terrafrost
289ef9a2b7 Tests/AES: improve error message for continuous buffer test as well 2014-12-31 22:46:16 -06:00
terrafrost
bb6689add3 Tests/AES: use better error message 2014-12-31 22:32:55 -06:00
terrafrost
b831724e1a Crypt/Base: don't always treat CTR as being continuous w/ OpenSSL 2014-12-31 22:24:56 -06:00
terrafrost
805c99458b Tests/TripleDES: fix data provider for new test vectors 2014-12-31 19:18:57 -06:00
terrafrost
9199e624b2 Tests/TripleDES: add more test vectors 2014-12-31 15:41:43 -06:00
terrafrost
50a0ae7b6e Test/AES: don't test stuff with only one buffer 2014-12-31 15:15:15 -06:00
terrafrost
f9451c826a Tests/AES: add testNonContinuousBufferBatteryCombos 2014-12-31 15:00:54 -06:00
terrafrost
c6c1e8dcb0 Merge branch 'master' of https://github.com/phpseclib/phpseclib into openssl-support 2014-12-31 14:38:22 -06:00
terrafrost
be168e262f Crypt/Base: stream ciphers cannot be run in continuous mode with OpenSSL 2014-12-31 14:10:53 -06:00
terrafrost
e3487c8adb RC4: use the parent encrypt / decrypt methods if openssl is being used 2014-12-30 23:33:12 -06:00
Chris Kruger
8dad92f5e5 removed superfluous default case 2014-12-30 16:40:47 +08:00
terrafrost
162e2f26cf Tests/SSH2: syntax error 2014-12-30 00:57:01 -06:00
terrafrost
46f81c98ab Tests/SSH2: update testGenerateIdentifier test 2014-12-30 00:27:27 -06:00
terrafrost
5a91539148 SSH2: rm unsupported algorithms if OpenSSL is being used 2014-12-29 22:10:26 -06:00
montdidier
aca4ba3286 SSH agent forwarding implementation 2014-12-30 10:44:31 +08:00
Clint Nelissen
d4f04bcab1 Revert changes for abstract methods in Base class 2014-12-29 08:54:45 -08:00
terrafrost
cf17141930 Tests/TripleDES: disable padding 2014-12-29 10:25:31 -06:00
terrafrost
472e006b6c SSH2: update conditions under which _disconnect's code is executed 2014-12-29 08:37:44 -06:00
terrafrost
09c03d0f75 Tests/DES: the expeted output of testDecryptPadding() was incorrect
(the expected output can be obtained by setting the key and iv both to 'd')
2014-12-28 23:15:45 -06:00
Andreas Fischer
f2134aa4b2 Merge branch 'master' into php5
* master:
  "@access static" isn't a thing
2014-12-27 20:25:04 +01:00
Andreas Fischer
c3a8f98dcb Merge pull request #586 from GrahamForks/access-fix
"@access static" isn't a thing

* GrahamForks/access-fix:
  "@access static" isn't a thing
2014-12-27 20:24:27 +01:00
Graham Campbell
bd0537fec5 "@access static" isn't a thing 2014-12-27 15:38:14 +00:00
David Anderson
1cd286642e Change dochint as requested 2014-12-27 14:10:44 +00:00
David Anderson
fba6894474 Add docblock 2014-12-27 14:02:29 +00:00
David Anderson
e9b698fd65 Add callback to SFTP.php
Currently, Net_SCP::put() has a callback parameter, allowing the consumer to monitor/log/report progress (or whatever they please).

This patch adds the same feature, working in the same way, to Net_SFTP::put()
2014-12-27 13:55:00 +00:00
Andreas Fischer
6205531907 Merge branch 'master' into php5
* master:
  Fix undefined $raw error
2014-12-26 10:48:16 +01:00
Andreas Fischer
471cb1dfb0 Merge pull request #583 from bantu/SSH1UndefinedVariableFix
Fix undefined $raw error

* bantu/SSH1UndefinedVariableFix:
  Fix undefined $raw error
2014-12-26 10:47:51 +01:00
Clint Nelissen
01d7c96a11 Fix undefined $raw error 2014-12-26 10:37:46 +01:00
terrafrost
1d2a85a319 another fix for 3DES unit test 2014-12-25 10:09:04 -06:00
terrafrost
7ea7463855 fix 3DES unit test 2014-12-25 09:47:36 -06:00
terrafrost
f891410b3d add 3DES unit test 2014-12-25 03:09:37 -06:00
Clint Nelissen
f3565346fa Replaced get_class() calls with instanceof operators 2014-12-24 13:07:14 -08:00
terrafrost
432700db8f Tests/RC4: key is already packed 2014-12-21 10:16:37 -06:00
terrafrost
45a5c05da6 Tests: rename tests so that they actually run 2014-12-21 09:54:44 -06:00
terrafrost
7c5e7a0a72 Tests/RC4: engines weren't being set correctly 2014-12-20 13:17:15 -06:00
terrafrost
31dcbc919c Tests/RC4: add more RC4 test vectors 2014-12-20 12:47:47 -06:00
terrafrost
1e1615080b Tests/RC4: test updates 2014-12-20 12:24:07 -06:00
terrafrost
b703fbe12b Tests: add RC4 unit tests 2014-12-20 12:21:17 -06:00
terrafrost
b053ba612b Merge branch 'master' of https://github.com/phpseclib/phpseclib into openssl-support 2014-12-20 11:54:31 -06:00
terrafrost
f91c4ccf60 DES: apparently TripleDES extends DES
this was not always the case:

See c4752cbeba
2014-12-20 11:14:29 -06:00
terrafrost
baf65d3fef Tests: small unit test updates 2014-12-20 11:14:08 -06:00
Andreas Fischer
a272b58322 Merge pull request #551 from bantu/2.0-code-sniffer
Code Sniffer rules witnessing PSR-4 and related goals

* bantu/2.0-code-sniffer:
  Remove side-effects from test files.
  Do not require test classes to be namespaced.
  Add code sniffer rules for 2.0 goals.
2014-12-17 05:03:45 +01:00
Andreas Fischer
ffb2fcab80 Remove side-effects from test files. 2014-12-17 04:50:18 +01:00
Andreas Fischer
218f151693 Do not require test classes to be namespaced. 2014-12-17 04:06:36 +01:00
Andreas Fischer
b5227ddb67 Add code sniffer rules for 2.0 goals. 2014-12-17 04:06:36 +01:00
Andreas Fischer
96172d4ac5 Merge pull request #569 from cnelissen/NamespaceCryptPackage
Namespaced Crypt Package (Final)

* cnelissen/NamespaceCryptPackage:
  Namespaced Crypt Package
2014-12-17 02:54:30 +01:00
Clint Nelissen
fe742e18d7 Namespaced Crypt Package 2014-12-16 16:16:54 -08:00
Andreas Fischer
6c1695c9a2 Merge pull request #555 from cnelissen/NamespaceNetPackage
Namespace net package

* cnelissen/NamespaceNetPackage:
  Rebased
  Temporary constant fix
  Updated unit tests
  Namespaced classes
2014-12-16 00:05:09 +01:00