octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-11-09 23:31:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,902 Commits 4 Branches 121 Tags 19 MiB
53a46ca6fa
Commit Graph

1902 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
terrafrost
b053ba612b Merge branch 'master' of https://github.com/phpseclib/phpseclib into openssl-support 2014-12-20 11:54:31 -06:00
terrafrost
f91c4ccf60 DES: apparently TripleDES extends DES 
this was not always the case:

See c4752cbeba
 2014-12-20 11:14:29 -06:00
terrafrost
baf65d3fef Tests: small unit test updates 2014-12-20 11:14:08 -06:00
Andreas Fischer
a272b58322 Merge pull request #551 from bantu/2.0-code-sniffer 
Code Sniffer rules witnessing PSR-4 and related goals

* bantu/2.0-code-sniffer:
  Remove side-effects from test files.
  Do not require test classes to be namespaced.
  Add code sniffer rules for 2.0 goals.
 2014-12-17 05:03:45 +01:00
Andreas Fischer
ffb2fcab80 Remove side-effects from test files. 2014-12-17 04:50:18 +01:00
Andreas Fischer
218f151693 Do not require test classes to be namespaced. 2014-12-17 04:06:36 +01:00
Andreas Fischer
b5227ddb67 Add code sniffer rules for 2.0 goals. 2014-12-17 04:06:36 +01:00
Andreas Fischer
96172d4ac5 Merge pull request #569 from cnelissen/NamespaceCryptPackage 
Namespaced Crypt Package (Final)

* cnelissen/NamespaceCryptPackage:
  Namespaced Crypt Package
 2014-12-17 02:54:30 +01:00
Clint Nelissen
fe742e18d7 Namespaced Crypt Package 2014-12-16 16:16:54 -08:00
Andreas Fischer
6c1695c9a2 Merge pull request #555 from cnelissen/NamespaceNetPackage 
Namespace net package

* cnelissen/NamespaceNetPackage:
  Rebased
  Temporary constant fix
  Updated unit tests
  Namespaced classes
 2014-12-16 00:05:09 +01:00
Clint Nelissen
c1f647c77d Rebased 2014-12-15 14:33:25 -08:00
Clint Nelissen
dfb8d52806 Temporary constant fix 2014-12-15 14:29:34 -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
Andreas Fischer
2871cce58d Merge pull request #567 from cnelissen/NamespaceSystemPackage 
Namespace system package #2

* cnelissen/NamespaceSystemPackage:
  Namespaced classes
 2014-12-15 23:17:09 +01:00
Clint Nelissen
fddf20f89c Namespaced classes 2014-12-15 09:25:46 -08:00
terrafrost
5d0cb1cee9 Crypt/Base: more fixes to pre 5.4.0 padding adjustments 2014-12-14 12:00:34 -06:00
terrafrost
d9adb66609 Crypt/Base: fix typo 2014-12-14 11:03:12 -06:00
terrafrost
4cc23b7006 Crypt/Base: $block_size -> $this->block_size 2014-12-14 10:48:18 -06:00
terrafrost
31af2b3ed3 Crypt/Base: fix decryption for ECB / CBC on PHP < 5.4.0 2014-12-14 10:40:40 -06:00
Andreas Fischer
16503848a4 Merge branch 'master' into php5 
* master:
  Run HHVM tests in parallel.
 2014-12-14 01:51:44 +01:00
Andreas Fischer
eefcb55138 Merge pull request #565 from bantu/hhvm-parallel 
Run HHVM tests in parallel.

* bantu/hhvm-parallel:
  Run HHVM tests in parallel.
 2014-12-14 01:51:38 +01:00
Andreas Fischer
10050c1748 Run HHVM tests in parallel. 2014-12-14 01:27:57 +01: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
51c0deba45 Crypt/Base: update one more comment 2014-12-13 14:22:12 -06:00
terrafrost
7d31f924a8 Crypt/Base: clean up comments 2014-12-13 14:20:25 -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
8d8c2693c5 Crypt: rm @version stuff 2014-12-13 14:13:24 -06:00
terrafrost
f5f9c3d409 Crypt: replace CRYPT_MODE_INTERNAL/MCRYPT/OPENSSL with CRYPT_ENGINE_* 2014-12-13 13:58:41 -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
956660e9b9 Merge pull request #562 from bantu/properly-skip-SFTPLargeFileTest 
Properly skip SFTPLargeFileTest when environment variables not defined.

* bantu/properly-skip-SFTPLargeFileTest:
  Properly skip SFTPLargeFileTest when environment variables not defined.
 2014-12-12 22:22:07 +01:00
Andreas Fischer
46075077ac Merge branch 'master' into php5 
* master:
  Update Code Sniffer to version 1.5.6
 2014-12-12 22:21:54 +01:00
Andreas Fischer
93213ccc70 Merge pull request #563 from bantu/code-sniffer-1.5.6 
Update Code Sniffer to version 1.5.6

* bantu/code-sniffer-1.5.6:
  Update Code Sniffer to version 1.5.6
 2014-12-12 22:21:13 +01:00
Andreas Fischer
de69f3b83f Use _MODE instead of the incorrect _ENGINE. 
Partially reverts 0305a4827c.
 2014-12-12 20:15:43 +01:00
Clint Nelissen
0547d182fc Update Code Sniffer to version 1.5.6 2014-12-12 19:44:25 +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
a98714031c Merge pull request #458 from bantu/sftp-put-from-local 
SFTP: Add test for put() from local file.

* bantu/sftp-put-from-local:
  SFTP: Add test for put() from local file.
 2014-12-12 17:39:15 +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
fa410ab2e8 Setup SSH key and agent for travis user. 2014-12-12 12:32:44 +01:00