octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-09-19 19:19:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,009 Commits 4 Branches 121 Tags 19 MiB
8b8d7a5dcd
Commit Graph

359 Commits

Author SHA1 Message Date
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