montdidier
1ebba5b32c
Merge branch 'feature/ssh_agent_forwarding' of github.com:KrugerHeavyIndustries/phpseclib into feature/ssh_agent_forwarding
2015-01-12 17:14:14 +08:00
montdidier
dd0b3e6bd5
addresses low hanging fruit comments from terrafrost and bantu
2015-01-12 17:13:33 +08:00
Andreas Fischer
38e6196127
Merge branch 'master' into php5
...
* master:
ASN1: empty constructed context-specific tags error'd out
Conflicts:
phpseclib/File/ASN1.php
2015-01-11 16:09:50 +01:00
Andreas Fischer
fd6aa5258c
Merge pull request #606 from terrafrost/asn-csr-2
...
ASN1 / CSR fixes
* terrafrost/asn-csr-2:
ASN1: empty constructed context-specific tags error'd out
2015-01-11 16:05:19 +01:00
terrafrost
84325d415e
ASN1: empty constructed context-specific tags error'd out
...
eg. an attributes field in a CSR that's blank
2015-01-10 23:58:50 -06:00
Andreas Fischer
04dad3ff8c
Merge branch 'master' into php5
...
* master:
Compare numeric part of OpenSSL version
2015-01-09 13:09:21 +01:00
Andreas Fischer
09ccfdbcb9
Merge pull request #598 from haphan/master
...
(OpenSSL Big integer) Only require major version to match
* haphan/master:
Compare numeric part of OpenSSL version
2015-01-09 13:08:59 +01:00
Ha Phan
b0129e9125
Compare numeric part of OpenSSL version
2015-01-08 20:55:14 +07:00
terrafrost
3485242ef6
Tests/AES: pack plaintext prior to encryption
2015-01-07 22:55:35 -06:00
terrafrost
8713e94001
Tests/AES: disable padding
2015-01-07 21:36:02 -06:00
terrafrost
b34a05887c
Tests: add Blowfish test
2015-01-07 21:23:04 -06:00
terrafrost
e75d94663e
Tests/AES: use bin2hex for result comparison
2015-01-07 21:14:02 -06:00
Andreas Fischer
d6037e5e87
Merge pull request #599 from bantu/php-5.3.3
...
Require PHP 5.3.3 since that is the lowest version we are running tests ...
* bantu/php-5.3.3:
Require PHP 5.3.3 since that is the lowest version we are running tests on.
2015-01-06 21:15:12 +01:00
Andreas Fischer
293df05546
Require PHP 5.3.3 since that is the lowest version we are running tests on.
2015-01-06 20:55:36 +01:00
Clint Nelissen
71c2d43956
Marked Base as abstract
2015-01-05 08:42:30 -08:00
Andreas Fischer
520fdcdd29
Merge pull request #596 from bantu/disconnect-fix-php5
...
SSH2: update conditions under which _disconnect's code is executed
* bantu/disconnect-fix-php5:
NET_SSH2_ -> self::
2015-01-04 11:58:39 +01:00
Andreas Fischer
b8159ee2fb
Merge branch 'master' into php5
...
* master:
SSH2: update conditions under which _disconnect's code is executed
2015-01-04 11:58:12 +01:00
Andreas Fischer
3c99773184
Merge pull request #588 from terrafrost/disconnect-fix
...
SSH2: update conditions under which _disconnect's code is executed
* terrafrost/disconnect-fix:
SSH2: update conditions under which _disconnect's code is executed
2015-01-04 11:57:52 +01:00
Andreas Fischer
1c923576c6
NET_SSH2_ -> self::
2015-01-04 11:38:03 +01:00
Andreas Fischer
ec21aa23f1
Merge pull request #588 from terrafrost/disconnect-fix
...
SSH2: update conditions under which _disconnect's code is executed
* terrafrost/disconnect-fix:
SSH2: update conditions under which _disconnect's code is executed
2015-01-04 11:36:14 +01:00
Andreas Fischer
8fae19a024
Merge pull request #581 from cnelissen/ReplaceGetClassFix
...
Replaced get_class() calls with instanceof operators
* cnelissen/ReplaceGetClassFix:
Revert changes for abstract methods in Base class
Replaced get_class() calls with instanceof operators
2015-01-03 17:22:39 +01:00
terrafrost
4766973e61
Tests/AES: add official test vectors to test
2015-01-01 23:56:01 -06:00
terrafrost
b24e7c3fc9
Crypt/Base: don't modify the IV when the mode isn't continuous for CFB
2015-01-01 00:27:30 -06:00
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
