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
|
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 |
|
Graham Campbell
|
e50cbacd4e
|
Fixed some phpdocs
|
2015-03-29 17:07:17 +01:00 |
|
Clint Nelissen
|
fe742e18d7
|
Namespaced Crypt Package
|
2014-12-16 16:16:54 -08:00 |
|
Clint Nelissen
|
794fcb7ee8
|
Updated unit tests
|
2014-12-15 14:29:34 -08:00 |
|
terrafrost
|
7e2d0147b6
|
Tests: don't set CRYPT_MODE_CIPHER to CRYPT_MODE_MCRYPT
|
2014-12-13 14:17:10 -06: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
|
f1865af505
|
Properly skip SFTPLargeFileTest when environment variables not defined.
|
2014-12-12 19:38:04 +01:00 |
|
Andreas Fischer
|
e0f8892521
|
Make SFTPLargeFileTest compatible with php5 branch.
|
2014-12-12 17:46:43 +01:00 |
|
Andreas Fischer
|
ca4bcc180e
|
SFTP: Add test for put() from local file.
|
2014-12-12 17:09:55 +01:00 |
|