terrafrost
2536d224ee
Tests/RSA: pack expected result
2015-05-31 10:06:13 -05:00
terrafrost
1316fd45f4
Tests/RSA: use correct constant
2015-05-31 09:17:53 -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
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
