terrafrost
759e04f08e
Tests/SFTP: updates to newly added unit test
2015-09-27 10:57:41 -05:00
terrafrost
23db2f7be3
add unit test demo'ing issue # 830
2015-09-27 10:54:08 -05:00
terrafrost
fab5a66fe5
RSA: make createKey static and make it return RSA objects
2015-09-24 09:43:19 -05:00
terrafrost
604dddc82b
Merge branch 'getkeylength' into getkeylength-2.0-2
...
Conflicts:
phpseclib/Crypt/Blowfish.php
phpseclib/Crypt/DES.php
phpseclib/Crypt/RC2.php
phpseclib/Crypt/RC4.php
phpseclib/Crypt/Rijndael.php
phpseclib/Crypt/TripleDES.php
phpseclib/Crypt/Twofish.php
2015-09-22 21:26:00 -05:00
terrafrost
bfba3db1a7
Crypt: make it so the key length can be explicitly set for all ciphers
2015-09-20 12:24:06 -05:00
Andreas Fischer
3b33941d3d
Merge pull request #813 from bantu/hash-rewrite
...
[master] More work on Hash.php
* bantu/hash-rewrite:
Hash: Cover remaining uncovered line.
Hash: Update incorrect documentation, use max line length 80.
Hash: Remove constructor return value documentation.
Hash: Do not assign false to length property. It's documented as an int.
Hash: Rename properly l to length.
Slightly rework of HashTest.php.
2015-09-14 22:47:37 +02:00
Andreas Fischer
5b6642ae37
Hash: Cover remaining uncovered line.
2015-09-14 01:34:20 +02:00
Andreas Fischer
3342eb6d09
Merge branch '2.0'
...
* 2.0:
Fixed another case
Minor tweaks
Fixed error
More fixes
PHPDoc fixes
2015-09-14 01:27:11 +02:00
Andreas Fischer
4387b64426
Merge branch '1.0' into 2.0
...
* 1.0:
Fixed another case
Minor tweaks
Fixed error
More fixes
PHPDoc fixes
Conflicts:
phpseclib/Crypt/Random.php
phpseclib/Math/BigInteger.php
phpseclib/Net/SSH2.php
tests/Functional/Net/SFTPUserStoryTest.php
2015-09-14 01:27:04 +02:00
Andreas Fischer
06a4cc5eba
Slightly rework of HashTest.php.
2015-09-07 19:32:58 +02:00
terrafrost
57d5081948
Tests/Hash: tiger is buggy in PHP 5.3
2015-09-06 09:16:18 -05:00
terrafrost
d76ae873ac
Hash: rm internal and mhash implementations (5.3 has hash built in)
2015-09-06 07:55:33 -05:00
Graham Campbell
eec8c9cb5d
More fixes
2015-09-06 12:39:14 +01:00
Andreas Fischer
0deae03dca
Merge branch '2.0'
...
* 2.0:
Remove unnecessary parens
Convert most instances of function_exists() to extension_loaded() where applicable
Remove conditions for PHP < 5.3.0 for this branch
Switch to extension_loaded('gmp')
Switch to extension_loaded instead of function_exists where it makes sense
2015-09-04 15:05:50 +02:00
Andreas Fischer
864493bbf6
Merge pull request #790 from cweagans/switch-to-extension-loaded-2.0
...
Switch to extension loaded (2.0)
* cweagans/switch-to-extension-loaded-2.0:
Remove conditions for PHP < 5.3.0 for this branch
Switch to extension_loaded('gmp')
Switch to extension_loaded instead of function_exists where it makes sense
2015-09-04 15:05:40 +02:00
Andreas Fischer
e08e2fd300
Merge pull request #791 from cweagans/switch-to-extension-loaded-1.0
...
Switch to extension loaded (1.0)
* cweagans/switch-to-extension-loaded-1.0:
Remove unnecessary parens
Convert most instances of function_exists() to extension_loaded() where applicable
2015-09-04 15:04:17 +02:00
Andreas Fischer
19d93fe76c
Merge branch '2.0'
...
* 2.0:
X509: updates to getOID() as suggested by bantu
X509: add getOID() method
2015-09-02 15:06:40 +02:00
Andreas Fischer
9fbc0358bb
Merge branch '1.0' into 2.0
...
* 1.0:
X509: updates to getOID() as suggested by bantu
X509: add getOID() method
2015-09-02 15:06:35 +02:00
Dmitry Balabka
70dd67c4d9
Connection reuse refactoring to rid of globals
2015-09-01 21:50:30 +03:00
Cameron Eagans
2b75c37cc9
Convert most instances of function_exists() to extension_loaded() where applicable
2015-09-01 14:32:22 -04:00
Cameron Eagans
a84699a346
Switch to extension_loaded instead of function_exists where it makes sense
2015-09-01 14:22:12 -04:00
terrafrost
d7d9d782b0
X509: add getOID() method
2015-08-29 22:15:04 -05:00
Andreas Fischer
0f1d043428
Merge branch '1.0' into 2.0
...
* 1.0:
Tests/X509: add unit test showing need for return by reference
2015-08-24 14:02:39 +02:00
Andreas Fischer
e391fdbd27
Merge pull request #772 from terrafrost/x509_unit_test
...
Tests/X509: add unit test showing need for return by reference
* terrafrost/x509_unit_test:
Tests/X509: add unit test showing need for return by reference
2015-08-24 14:01:41 +02:00
Andreas Fischer
af939f9aa5
Make paths to runkit_import() absolute due to lack of include path.
2015-08-18 00:00:47 -04:00
Andreas Fischer
785b37b505
Remove include statement from BigInteger TestCase.
...
This was previously required to load MATH_BIGINTEGER_MODE_* constants, but
these are autoloadable via \phpseclib\Math\BigInteger::MODE_* now and the
include path was removed.
2015-08-13 15:12:20 -04:00
Andreas Fischer
54a1aeeefe
Merge branch '1.0' into 2.0
...
* 1.0:
Tests/RSA: add PSS test
RSA: fix regression for PSS signatures
2015-08-13 14:37:15 -04:00
terrafrost
a56e0daf07
Tests/X509: add unit test showing need for return by reference
2015-08-13 10:22:01 -05:00
terrafrost
f591962fc4
Tests/RSA: add PSS test
2015-08-11 11:47:19 -05:00
Andreas Fischer
58f8affcad
SSH2: Add support for curve25519-sha256@libssh.org.txt via libsodium-php.
2015-07-27 22:58:59 +02:00
terrafrost
4d086bee86
Merge branch 'ssh-custom-socket-1.0' into ssh-custom-socket-2.0
...
Conflicts:
phpseclib/Net/SSH2.php
2015-07-17 12:43:50 -05:00
terrafrost
33a97391bc
SSH2: make it so you can connect using open sockets
2015-07-17 12:30:44 -05:00
Andreas Fischer
d9e9504fba
Merge branch 'PSR2-1.0' into PSR2-2.0
...
* PSR2-1.0:
Fix indentation phpcbf did not fix.
Remove PSR2.Methods.FunctionCallSignature.SpaceAfterOpenBracket exception.
Use phpcbf to fix PHP code to ruleset.
Ignore coding guidelines in ANSI switch block.
Base code sniffer ruleset on PSR2 rather than PEAR.
Update PHP Code Sniffer to 2.3.3
Conflicts:
build/code-sniffer-ruleset-tests.xml
build/code-sniffer-ruleset.xml
composer.lock
phpseclib/Crypt/DES.php
phpseclib/Crypt/Hash.php
phpseclib/Crypt/RSA.php
phpseclib/File/X509.php
phpseclib/Math/BigInteger.php
phpseclib/Net/SFTP.php
phpseclib/Net/SSH1.php
phpseclib/Net/SSH2.php
tests/Functional/Net/SFTPUserStoryTest.php
tests/Unit/Crypt/TwofishTest.php
2015-07-17 13:41:59 +02:00
Andreas Fischer
5eb205b237
Remove PSR2.Methods.FunctionCallSignature.SpaceAfterOpenBracket exception.
2015-07-17 12:57:41 +02:00
Andreas Fischer
2013a31ecd
Use phpcbf to fix PHP code to ruleset.
2015-07-17 12:57:41 +02:00
Andreas Fischer
4b5cc0c286
Merge branch '1.0' into 2.0
...
* 1.0:
SFTP: stat cache updates
2015-07-17 12:45:42 +02:00
terrafrost
862b63e9e5
SFTP: stat cache updates
2015-07-17 12:34:56 +02:00
Andreas Fischer
83cac3385b
Merge branch '1.0' into 2.0
...
* 1.0:
SFTP: update how recursive delete's update stat cache
Tests/SFTP: add unit test
2015-07-06 23:38:10 +02:00
Andreas Fischer
643103449c
Merge pull request #731 from terrafrost/sftp-recur-delete-stat-cache-1.0
...
SFTP: delete stat cache for recursive deletes / 1.0 branch
* terrafrost/sftp-recur-delete-stat-cache-1.0:
SFTP: update how recursive delete's update stat cache
Tests/SFTP: add unit test
2015-07-06 23:37:55 +02:00
terrafrost
52aeb2ea3f
Tests/SFTP: add unit test
2015-07-04 12:57:50 -05:00
Andreas Fischer
727677d4e1
Merge pull request #713 from bantu/SFTPStreamTest
...
[1.0] Various fixes to fopen mode handling in SFTP Stream
* bantu/SFTPStreamTest:
Explicitly set size to 0 when creating or truncating.
mode[0] of 'c' is not supposed to truncate.
Need to create the file when it does not exist and mode[0] is not 'r'.
Add SFTPStreamTest::testFopenFcloseCreatesFile()
2015-07-04 14:28:06 +02:00
Andreas Fischer
ba46db1758
Merge pull request #713 from bantu/SFTPStreamTest
...
Various fixes to fopen mode handling in SFTP Stream
* bantu/SFTPStreamTest:
Explicitly set size to 0 when creating or truncating.
mode[0] of 'c' is not supposed to truncate.
Need to create the file when it does not exist and mode[0] is not 'r'.
Add SFTPStreamTest::testFopenFcloseCreatesFile()
Conflicts:
tests/Functional/Net/SFTPLargeFileTest.php
2015-07-04 01:18:19 +02:00
Andreas Fischer
483c253879
Merge branch '1.0' into 2.0
...
* 1.0:
X509: set one more parameter to null
X509: set another parameters field to null
2015-06-30 12:27:06 +02:00
terrafrost
77c757d095
X509: set one more parameter to null
2015-06-29 22:10:18 -05:00
terrafrost
6c2798be90
X509: set another parameters field to null
2015-06-29 21:53:27 -05:00
terrafrost
815f443ed1
Merge branch 'x509-rsa-null-1.0' into x509-rsa-null-2.0-2
...
Conflicts:
tests/Unit/File/X509/X509Test.php
2015-06-28 16:10:40 -05:00
terrafrost
2c8cb0b426
Tests/X509: CS adjustments
2015-06-28 14:52:07 -05:00
terrafrost
2277c0fbac
Tests/X509: typo
2015-06-28 11:40:34 -05:00
terrafrost
46a3c0fbbb
X509: set parameter field to null for RSA keys
2015-06-28 11:32:42 -05:00
Andreas Fischer
e1dd7e9d69
Merge branch '1.0' into 2.0
...
* 1.0:
Tests/SFTP: $lstat->$stat
Tests/SFTP: just check to see that stat / lstat return an array
SFTP: update conditions under which cache for lstat / . is used
Tests/SFTP: add test for stat's on .
2015-06-27 21:59:45 +02:00
terrafrost
fb3bd8adff
Tests/SFTP: $lstat->$stat
2015-06-27 07:56:47 -05:00
terrafrost
df65acb999
Tests/SFTP: just check to see that stat / lstat return an array
2015-06-27 07:43:35 -05:00
terrafrost
26818ebb40
Tests/SFTP: add test for stat's on .
2015-06-26 22:25:22 -05:00
Andreas Fischer
01f547ba17
Add SFTPStreamTest::testFopenFcloseCreatesFile()
2015-06-25 14:05:18 +02:00
terrafrost
5385104d2c
Unit/X509/CSR: looks like a line got overwritten..
2015-06-20 20:46:30 -05:00
terrafrost
4d82df3fc7
Merge branch 'stat-cache-fix-1.0' into stat-cache-fix-2.0
...
Conflicts:
tests/Functional/Net/SFTPUserStoryTest.php
2015-06-20 19:59:48 -05:00
terrafrost
6bc3513914
SFTP: stat cache updates
2015-06-20 19:33:19 -05:00
Andreas Fischer
a79b4ac6ad
Merge pull request #699 from terrafrost/asn1-fix-1.0
...
ASN1 parsing fix for issue mainly effecting CSR's for 1.0 branch
* terrafrost/asn1-fix-1.0:
ASN1: handle malformed input better
Tests/X509/CSR: add unit test for ASN1 changes
ASN1: constructed context-specific tags can have x sub elements
2015-06-16 16:30:35 +02:00
Andreas Fischer
902e41a2a4
Merge pull request #693 from terrafrost/rsa-none-2.0
...
add "none" encryption mode for 2.0 branch
* terrafrost/rsa-none-2.0:
Tests/RSA: pack expected result
Tests/RSA: pack expected result
Tests/RSA: re-added accidentally removed $rsa initialization
Tests/RSA: use correct constant
Tests/RSA: fix error
Tests/RSA: hard-coded key and result
RSA: add "none" encryption mode
2015-06-09 17:19:16 +02:00
Andreas Fischer
956607d4e0
Merge pull request #692 from terrafrost/rsa-none-1.0
...
add "none" encryption mode for 1.0 branch
* terrafrost/rsa-none-1.0:
Tests/RSA: pack expected result
Tests/RSA: re-added accidentally removed $rsa initialization
Tests/RSA: fix error
Tests/RSA: hard-coded key and result
RSA: add "none" encryption mode
2015-06-09 17:18:47 +02:00
terrafrost
1ecd006685
Tests/X509/CSR: add unit test for ASN1 changes
2015-06-04 23:08:55 -05:00
terrafrost
ab489801fe
Tests/RSA: pack expected result
2015-05-31 10:07:18 -05:00
terrafrost
2536d224ee
Tests/RSA: pack expected result
2015-05-31 10:06:13 -05:00
terrafrost
6bce2c79ac
Tests/RSA: re-added accidentally removed $rsa initialization
2015-05-31 09:20:03 -05:00
terrafrost
1316fd45f4
Tests/RSA: use correct constant
2015-05-31 09:17:53 -05:00
terrafrost
0166d3a7ec
Tests/RSA: fix error
2015-05-31 02:20:16 -05:00
terrafrost
71104e8120
Merge branch 'rsa-none-1.0' into rsa-none-2.0
...
Conflicts:
tests/Unit/Crypt/RSA/ModeTest.php
2015-05-31 02:19:06 -05:00
terrafrost
26d528855a
Tests/RSA: hard-coded key and result
2015-05-31 02:13:11 -05:00
terrafrost
30260f3321
Merge branch 'rsa-none-1.0' into rsa-none-2.0
...
Conflicts:
phpseclib/Crypt/RSA.php
2015-05-25 22:36:10 -05:00
terrafrost
1d924cfc7b
RSA: add "none" encryption mode
2015-05-25 22:30:38 -05:00
terrafrost
6c345acc1d
ANSI: PHP5 updates
2015-05-23 18:23:40 -05:00
terrafrost
e4fee53c93
Merge branch 'ansi-updates-1.0' into ansi-updates-2.0
2015-05-23 18:18:22 -05:00
terrafrost
4f19085e68
Tests: add ANSI unit test
2015-05-23 17:41:16 -05:00
terrafrost
f19bf7a07d
RSA: backport getPublicKeyFingerprint from Lukas-W's PR
2015-05-06 22:55:12 -05:00
Lukas W
a67f4df164
RSA: Add support for calculating a public key's fingerprint
2015-05-04 09:21:37 +02:00
terrafrost
1b22d523dc
Merge remote-tracking branch 'audrey/sftp-put-callback'
2015-04-16 07:45:51 -05:00
terrafrost
1d772c3a6f
Merge remote-tracking branch 'audrey/sftp-put-callback-for-1.0' into 1.0
2015-04-16 07:45:24 -05:00
terrafrost
d00e20a140
Merge remote-tracking branch 'graham/1.0-phpdoc' into 2.0-phpdoc
...
Conflicts:
phpseclib/Crypt/Base.php
phpseclib/Net/SCP.php
tests/Unit/File/ASN1Test.php
2015-04-16 00:42:53 -05:00
terrafrost
9f626c67b6
Merge remote-tracking branch 'graham/1.0-phpdoc' into 1.0-phpdoc
2015-04-16 00:31:54 -05:00
andrey012
16430d4d2e
support for callback function for SFTP::put function - in order to pipe data directly to remote server without putting it into file or keeping in memory. This can be useful particularly for dumping big databases directly to remote server.
2015-04-15 03:29:01 +03:00
Andrey Grinenko
e58427221d
support for callback function for SFTP::put function - in order to pipe data directly to remote server without putting it into file or keeping in memory. This can be useful particularly for dumping big databases directly to remote server.
2015-04-09 02:59:00 +03:00
terrafrost
188cef4665
Tests/DES: method is testing decryption - not encryption
2015-04-02 22:20:02 -05:00
terrafrost
46d22b962d
yet another typo in unit test
2015-04-02 07:07:58 -05:00
terrafrost
4c8a56f2ad
Tests: more typos
2015-04-02 06:43:33 -05:00
terrafrost
1fa4734acd
Tests/Blowfish - fix typo
2015-04-02 06:31:36 -05:00
terrafrost
e510dc878b
Merge branch '1.0' of https://github.com/phpseclib/phpseclib into openssl-support
...
Conflicts:
phpseclib/Net/SSH2.php
2015-04-02 05:40:14 -05:00
terrafrost
023fef8d8b
Merge branch '2.0' of https://github.com/phpseclib/phpseclib into openssl-support-2.0
...
Conflicts:
phpseclib/Net/SSH2.php
2015-04-02 05:37:04 -05:00
terrafrost
ebcb3130b7
Merge branch 'openssl-support' into 2.0
...
Conflicts:
phpseclib/Crypt/AES.php
phpseclib/Crypt/Base.php
phpseclib/Crypt/Blowfish.php
phpseclib/Crypt/DES.php
phpseclib/Crypt/RC2.php
phpseclib/Crypt/RC4.php
phpseclib/Crypt/Rijndael.php
phpseclib/Crypt/TripleDES.php
phpseclib/Crypt/Twofish.php
phpseclib/Net/SSH2.php
tests/Functional/Net/SFTPLargeFileTest.php
tests/Unit/Crypt/AES/InternalTest.php
tests/Unit/Crypt/AES/McryptTest.php
tests/Unit/Crypt/AES/TestCase.php
2015-04-02 05:32:31 -05:00
Andreas Fischer
6dc32808f1
Merge pull request #644 from terrafrost/agentforwarding-1.0
...
Agent Forwarding for 1.0 branch
* terrafrost/agentforwarding-1.0:
removed unwarrented user_error
preference isset over array_key_exists, return false on failure, break after return channel opened
moved agent forwarding channel handling to filter method and reusing existing open channels to request forwarding
removed stopSSHForwarding
determining what failure to expect
addresses low hanging fruit comments from terrafrost and bantu
removed superfluous default case
SSH agent forwarding implementation
2015-03-30 12:22:57 +02:00
Graham Campbell
e50cbacd4e
Fixed some phpdocs
2015-03-29 17:07:17 +01:00
terrafrost
a8e702b34f
Merge branch 'agentforwarding-1.0' into agentforwarding-2.0
...
Conflicts:
phpseclib/Net/SSH2.php
phpseclib/System/SSH/Agent.php
2015-03-29 10:32:30 -05:00
terrafrost
bb01002233
Merge remote-tracking branch 'agentforwarding/feature/ssh_agent_forwarding' into agentforwarding-1.0
2015-03-28 21:03:17 -05:00
Andreas Fischer
f57e01df65
Merge branch '1.0' into 2.0
...
* 1.0:
Tests/X509: add unit test
X509: make it so you can use File_ASN1_Element for custom X.509 extensions
2015-03-10 13:46:15 +01:00
terrafrost
dad8a9ef37
Tests/X509: add unit test
2015-03-10 01:39:13 -05:00
Andreas Fischer
63ed03b119
Merge branch '1.0' into 2.0
...
* 1.0:
Tests/X509: swap expected and actual value
Tests/X509: fix unit test
Tests/X509: add unit test for unsupported extension encoding
X509: always base64-encode extensions for which _getMapping returns a bool
2015-03-05 15:37:46 +01:00
terrafrost
31e2308ea9
Tests/X509: swap expected and actual value
2015-03-04 23:37:33 -06:00
terrafrost
cc08406a76
Tests/X509: fix unit test
2015-03-04 08:18:54 -06:00
terrafrost
3e1aa8c213
Tests/X509: add unit test for unsupported extension encoding
2015-03-04 08:03:02 -06:00
montdidier
25b328c440
removed stopSSHForwarding
2015-02-05 13:19:57 +08:00
terrafrost
1dd1c65bfd
Merge branch 'master' into openssl-support
2015-01-29 23:00:59 -06:00
Andreas Fischer
257d44331e
Merge branch 'master' into php5
...
* master:
.scrutinizer.yml: Use large timeout to prevent coverage receiver from timing out.
Reenable SSH Functional Tests on Travis CI (PHP 5.3.3 and below).
2015-01-28 23:03:31 +01:00
Andreas Fischer
f908040d20
Reenable SSH Functional Tests on Travis CI (PHP 5.3.3 and below).
2015-01-28 13:37:21 +01:00
terrafrost
fbfc935a1e
Tests/RC2: rm space
2015-01-26 20:06:01 -06:00
terrafrost
a467c9e0bd
Tests/RC2: use data provider
2015-01-26 19:51:57 -06:00
terrafrost
8b8d9ac423
Tests/RC2: add test vectors
2015-01-26 19:24:48 -06:00
terrafrost
808a460f15
Tests/Twofish: disable padding
2015-01-19 22:00:49 -06:00
terrafrost
06d9f07830
Tests/Twofish: fix E_NOTICE
2015-01-19 21:19:12 -06:00
terrafrost
b852e8c6cb
Tests: add twofish unit test
2015-01-19 20:52:25 -06:00
terrafrost
c90010297c
Tests/TripleDES: CS adjustments
2015-01-17 10:33:12 -06:00
terrafrost
eaf2397cb6
Tests/TripleDES: fix one last error
2015-01-17 10:17:23 -06:00
terrafrost
1547ec497a
Tests/TripleDES: another syntax error
2015-01-17 10:04:01 -06:00
terrafrost
fb41f3492b
Tests/TripleDES: fix syntax error
2015-01-17 09:56:32 -06:00
terrafrost
e9470d1fc5
TripleDES: updates to accomodate inner chaining
2015-01-17 09:42:47 -06:00
terrafrost
0f01128e98
Tests/AES: change CRYPT_AES_MODE_* -> CRYPT_MODE_*
2015-01-16 20:27:43 -06:00
terrafrost
f1b41e2782
Tests/AES: pack everything
2015-01-14 22:46:46 -06:00
terrafrost
7efc032d4b
Tests/AES: pass everything through bin2hex
...
(i thought this was already being done..)
2015-01-14 21:05:34 -06:00
terrafrost
569967de20
Tests/Blowfish: CS adjustments
2015-01-14 20:28:23 -06:00
terrafrost
cd57289555
Tests/AES: attempt to fix failing unit test
2015-01-14 20:19:03 -06:00
terrafrost
009d883d4c
Merge branch 'master' of https://github.com/phpseclib/phpseclib into openssl-support
2015-01-14 20:13:08 -06:00
montdidier
8571d0c6d7
determining what failure to expect
2015-01-13 09:52:01 +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
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
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
terrafrost
4766973e61
Tests/AES: add official test vectors to test
2015-01-01 23:56:01 -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
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
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
montdidier
aca4ba3286
SSH agent forwarding implementation
2014-12-30 10:44:31 +08:00
terrafrost
cf17141930
Tests/TripleDES: disable padding
2014-12-29 10:25:31 -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
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
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
baf65d3fef
Tests: small unit test updates
2014-12-20 11:14:08 -06:00
Andreas Fischer
ffb2fcab80
Remove side-effects from test files.
2014-12-17 04:50:18 +01:00
Clint Nelissen
fe742e18d7
Namespaced Crypt Package
2014-12-16 16:16:54 -08:00
Clint Nelissen
c1f647c77d
Rebased
2014-12-15 14:33:25 -08:00
Clint Nelissen
794fcb7ee8
Updated unit tests
2014-12-15 14:29:34 -08:00
Clint Nelissen
628949fb73
Namespaced classes
2014-12-15 14:29:20 -08:00
Clint Nelissen
fddf20f89c
Namespaced classes
2014-12-15 09:25:46 -08:00
terrafrost
8f27aaa323
Tests (DES): i didn't realize last commit included all the changes that it did
...
not all of them were ready to go out. i just meant for it to include a one-line change.
meh.
2014-12-13 15:10:47 -06:00
terrafrost
c8281dd4a3
Tests (DES): disable padding for decryption test
...
When padding is enabled $des->decrypt() will return false with ciphertext's
of invalid length. Which makes sense. Null padding doesn't work when padding
is enabled because 0 isn't a valid PKCS7 padding character (has to be between
1 and the block_length, inclusive).
2014-12-13 15:00:38 -06:00
terrafrost
b1fdbd6bbd
Tests: CRYPT_MODE_* -> CRYPT_ENGINE_* in one more place
2014-12-13 14:42:58 -06:00
terrafrost
8d40eb22ef
Tests: update unit tests to use CRYPT_ENGINE_* instead of CRYPT_MODE_*
2014-12-13 14:34:48 -06:00
terrafrost
7e2d0147b6
Tests: don't set CRYPT_MODE_CIPHER to CRYPT_MODE_MCRYPT
2014-12-13 14:17:10 -06:00
terrafrost
c5f74eb3a3
Merge branch 'master' of https://github.com/phpseclib/phpseclib into openssl-support
2014-12-13 14:15:34 -06:00
terrafrost
4d6e7efda6
Tests: CS adjustments
2014-12-13 13:47:37 -06:00
Andreas Fischer
768ac083dc
Merge pull request #564 from bantu/engine-back-to-mode
...
Use _MODE instead of the incorrect _ENGINE.
* bantu/engine-back-to-mode:
Use _MODE instead of the incorrect _ENGINE.
2014-12-12 22:22:39 +01:00
Andreas Fischer
30ef0e164f
Merge branch 'master' into php5
...
* master:
Properly skip SFTPLargeFileTest when environment variables not defined.
2014-12-12 22:22:23 +01:00
Andreas Fischer
de69f3b83f
Use _MODE instead of the incorrect _ENGINE.
...
Partially reverts 0305a4827c
.
2014-12-12 20:15:43 +01:00
Andreas Fischer
f1865af505
Properly skip SFTPLargeFileTest when environment variables not defined.
2014-12-12 19:38:04 +01:00
Andreas Fischer
3f912eed59
Merge pull request #554 from cnelissen/NamespaceFilePackage
...
Namespace file package
* cnelissen/NamespaceFilePackage:
Namespaced classes
2014-12-12 17:55:44 +01:00
Andreas Fischer
e0f8892521
Make SFTPLargeFileTest compatible with php5 branch.
2014-12-12 17:46:43 +01:00
Andreas Fischer
81ae4c924e
Merge branch 'master' into php5
...
* master:
SFTP: Add test for put() from local file.
2014-12-12 17:39:20 +01:00
Andreas Fischer
ca4bcc180e
SFTP: Add test for put() from local file.
2014-12-12 17:09:55 +01:00
Andreas Fischer
609532df25
Merge branch 'master' into php5
...
* master:
Setup SSH key and agent for travis user.
Add a functional test case for SSH2 login using Agent.
2014-12-12 12:48:26 +01:00
Andreas Fischer
6d42873b87
Merge pull request #552 from bantu/ssh2-agent-login-test
...
SSH2 Agent Login Test
* bantu/ssh2-agent-login-test:
Setup SSH key and agent for travis user.
Add a functional test case for SSH2 login using Agent.
2014-12-12 12:48:21 +01:00
Andreas Fischer
2b1a0229e1
Merge branch 'master' into php5
...
* master:
Allow SCP test to run on 5.2 by not depending on GMP, but also allowing bcmath.
Conflicts:
tests/PhpseclibFunctionalTestCase.php
2014-12-12 12:17:57 +01:00
Andreas Fischer
ce2c7c7591
Allow SCP test to run on 5.2 by not depending on GMP, but also allowing bcmath.
2014-12-12 11:59:51 +01:00
Clint Nelissen
cea5e317b6
Namespaced classes
2014-12-09 16:53:05 -08:00
Andreas Fischer
9672b31af0
Add a functional test case for SSH2 login using Agent.
2014-12-10 00:27:53 +01:00
Andreas Fischer
c4b103468c
Merge pull request #549 from bantu/fix-547
...
Change copyright years from roman numeral to decimal numbers.
* bantu/fix-547:
Change copyright years from roman numeral to decimal numbers.
Conflicts:
phpseclib/System/SSH_Agent.php
2014-12-10 00:06:08 +01:00
Andreas Fischer
0efae5a91e
Change copyright years from roman numeral to decimal numbers.
2014-12-10 00:04:08 +01:00
Clint Nelissen
0305a4827c
Moved globally defined constants to class constants
2014-12-09 10:46:30 -08:00
Andreas Fischer
be44f6c8a4
Merge branch 'master' into php5
...
* master:
SCP: Allow for null byte in tests as long as #146 is under investigation.
Some SCP tests.
Infrastructure for obtaining temporary files.
2014-12-09 13:35:44 +01:00
Andreas Fischer
1c949e47c8
Merge pull request #529 from bantu/scp-tests
...
Some SCP tests.
* bantu/scp-tests:
SCP: Allow for null byte in tests as long as #146 is under investigation.
Some SCP tests.
Infrastructure for obtaining temporary files.
2014-12-09 13:35:38 +01:00
Andreas Fischer
51ea6255c8
SCP: Allow for null byte in tests as long as #146 is under investigation.
2014-12-09 13:21:59 +01:00
Andreas Fischer
494e0d68eb
Some SCP tests.
2014-12-09 13:21:59 +01:00
Andreas Fischer
4dc6179207
Infrastructure for obtaining temporary files.
2014-12-09 13:10:34 +01:00
Clint Nelissen
f5d6b7423d
Refactor defined MATH_BIGINTEGER_ constants into class constants.
2014-12-07 22:33:39 +01:00
Andreas Fischer
da2ea27e7a
Merge pull request #523 from cnelissen/FilePackageConstantsFix
...
File package constants fix
* cnelissen/FilePackageConstantsFix:
Docblock fix
Moved global constants into class constants and updated all references
2014-12-05 01:00:01 +01:00
Andreas Fischer
c036787a1a
crypt_random_string() -> Random::string()
2014-12-05 00:20:19 +01:00
Andreas Fischer
4133da34db
Merge pull request #530 from bantu/random-tests
...
Some tests for crypt_random_string().
* bantu/random-tests:
Use assertArrayNotHasKey().
Some tests for crypt_random_string().
2014-12-05 00:19:25 +01:00
Andreas Fischer
d6c210984c
Use assertArrayNotHasKey().
2014-12-05 00:18:45 +01:00
Andreas Fischer
f2a08f7b6c
Some tests for crypt_random_string().
2014-12-04 19:23:22 +01:00
Clint Nelissen
a9925941b0
Moved global constants into class constants and updated all references
2014-12-03 18:20:10 -08:00
terrafrost
8fc4f4b70c
Merge branch 'master' of https://github.com/phpseclib/phpseclib into openssl-support
2014-11-29 07:46:06 -06:00
terrafrost
f6e0c4b506
Crypt: add OpenSSL support
...
aside from the addition of OpenSSL support a few other changes have been included:
- setEngine(), as added by petrich, is depricated (not that it was ever in trunk to begin with)
it has been replaced with isValidEngine() and setPreferredEngine().
- replace _generate_xor() with increment_str()
_increment_str() had extra functionality that wasn't being used. ie. it could concatenate
multiple successive string increments to one another automatically. but not only was that
functionality not used - it also made the function less versatile. _increment_str() can be
used more easily for iterative brute forcing (for example)
- rename Crypt_Base::_stringShift to Crypt_Base::_string_shift (for consistency)
- more expansive unit test coverage
2014-11-29 07:39:21 -06:00
Andreas Fischer
d494cc5100
Merge branch 'master' into php5
...
* master:
SFTP: Add truncate() to size() test for files larger than 4 GiB.
2014-10-19 21:07:47 +02:00
Andreas Fischer
6182a64394
SFTP: Add truncate() to size() test for files larger than 4 GiB.
2014-10-19 20:52:40 +02:00
terrafrost
e7708b0d20
AES: update unit tests
2014-10-15 17:59:48 -05:00
Andreas Fischer
eff5f64560
Merge branch 'master' into php5
...
* master:
ASN1: fix unit test
ASN1: add unit test for non-constructed context-specific change
ASN1: fix issue with non-constructed context-specific tags
README: update download link to 0.3.8
2014-09-24 16:50:12 +02:00
terrafrost
3785bebcce
ASN1: fix unit test
2014-09-24 00:07:49 -05:00
terrafrost
a2f4a2cbba
ASN1: add unit test for non-constructed context-specific change
2014-09-22 23:03:06 -05:00