Andreas Fischer
8ecf956499
Move in-code comments to property doc blocks.
2014-12-07 23:00:59 +01:00
Clint Nelissen
f5d6b7423d
Refactor defined MATH_BIGINTEGER_ constants into class constants.
2014-12-07 22:33:39 +01:00
terrafrost
9a55ab1892
Blowfish: syntax error
2014-12-07 14:43:30 -06:00
Andreas Fischer
05ae7a1e66
Merge pull request #542 from bantu/fix-540
...
Add public keyword to Crypt\Random::string().
* bantu/fix-540:
Add public keyword to Crypt\Random::string().
2014-12-07 15:20:49 +01:00
Andreas Fischer
7b7e7d8de5
Add public keyword to Crypt\Random::string().
2014-12-07 15:14:34 +01:00
terrafrost
69614034ec
Crypt_Base: fix to the IV handling of the last commit
2014-12-07 07:35:30 -06:00
terrafrost
b35cedcb15
Crypt_Base: deal with IV's more appropriately
2014-12-06 23:36:26 -06:00
Andreas Fischer
e52a3aff5a
Merge branch 'master' into php5
...
* master:
SSH2: simplify _send_channel_packet
2014-12-06 12:25:16 +01:00
Andreas Fischer
4ba7bfb6da
Merge pull request #538 from terrafrost/window-size-changes
...
SSH2: simplify _send_channel_packet
* terrafrost/window-size-changes:
SSH2: simplify _send_channel_packet
2014-12-06 12:25:11 +01:00
terrafrost
96eb1f3797
SSH2: simplify _send_channel_packet
...
the last _send_channel_packet was unnecessarily complex. this lead
to a number of problems. for example,
the window size was checked for adjustments in two places. in the
second place it receives a window adjustment packet and just assumes
that the window adjustment packet was big enough for the rest of the
data.
(thanks, pixall!)
2014-12-05 22:01:39 -06: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
6b8079f87a
Merge pull request #533 from bantu/random-tests-php5
...
Some tests for crypt_random_string().
* bantu/random-tests-php5:
crypt_random_string() -> Random::string()
2014-12-05 00:48:46 +01:00
Andreas Fischer
deb8f4f03c
Merge branch 'master' into php5
...
* master:
Use assertArrayNotHasKey().
Some tests for crypt_random_string().
2014-12-05 00:47:13 +01:00
Andreas Fischer
1698880660
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:47:07 +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
Clint Nelissen
99b9cc477d
Moved global constants to class constants
2014-12-04 13:45:13 -08:00
Andreas Fischer
01650cf7d7
Merge pull request #524 from cnelissen/SystemPackageConstantsFix
...
System package constants fix
* cnelissen/SystemPackageConstantsFix:
Added SSH_AGENT_FAILURE constant back in
Missed a couple SYSTEM_ prefixes
Moved global constants to class constants
2014-12-04 20:05:55 +01:00
Andreas Fischer
a3f52dcf61
Merge branch 'master' into php5
...
* master:
Quote shell argument with escapeshellarg()
2014-12-04 20:00:45 +01:00
Andreas Fischer
262da528a0
Merge pull request #527 from DavidAnderson684/patch-2
...
Quote shell argument with escapeshellarg()
* DavidAnderson684/patch-2:
Quote shell argument with escapeshellarg()
2014-12-04 20:00:41 +01:00
Andreas Fischer
243ad0c54a
Merge branch 'master' into php5
...
* master:
SCP: Add missing space after case statement.
2014-12-04 19:56:34 +01:00
Andreas Fischer
067699bce2
Merge pull request #528 from bantu/scp-case
...
SCP: Add missing space after case statement.
* bantu/scp-case:
SCP: Add missing space after case statement.
2014-12-04 19:56:29 +01:00
Clint Nelissen
f085f91d16
Added SSH_AGENT_FAILURE constant back in
2014-12-04 10:38:58 -08:00
Andreas Fischer
f2a08f7b6c
Some tests for crypt_random_string().
2014-12-04 19:23:22 +01:00
Andreas Fischer
f40bb9190f
SCP: Add missing space after case statement.
2014-12-04 18:42:47 +01:00
David Anderson
14dc468b70
Quote shell argument with escapeshellarg()
...
Currently, the call to "scp -t" or "scp -f" just uses naive quoting - i.e. a couple of quote marks are thrown in.
But, this can easily be escaped from - if the filename has a quote mark of its own in it, for example.
e.g. if the filename is as follows, then bad things will happen:
";rm -rf /
Instead, escapeshellarg should be used, to make sure it gets escaped properly.
2014-12-04 16:50:23 +00:00
Clint Nelissen
e8c93d8cfe
Docblock fix
2014-12-04 08:30:07 -08:00
Clint Nelissen
19b4d0ec0c
Missed a couple SYSTEM_ prefixes
2014-12-04 08:28:05 -08:00
Clint Nelissen
f7fb93276a
Moved global constants to class constants
2014-12-03 18:44:30 -08:00
Clint Nelissen
a9925941b0
Moved global constants into class constants and updated all references
2014-12-03 18:20:10 -08:00
Andreas Fischer
b771ca36cf
Merge pull request #519 from bantu/remove-license-text
...
Remove LICENSE text from source code files.
* bantu/remove-license-text:
Remove LICENSE text from source code files.
2014-12-03 23:13:00 +01:00
Andreas Fischer
632c47e55f
Merge branch 'master' into php5
...
* master:
Avoid calling fclose(false)
2014-12-03 23:08:56 +01:00
Andreas Fischer
630a71bee6
Merge pull request #522 from DavidAnderson684/patch-1
...
Avoid calling fclose(false)
* DavidAnderson684/patch-1:
Avoid calling fclose(false)
2014-12-03 23:08:51 +01:00
David Anderson
647a1e9a5e
Avoid calling fclose(false)
...
The previous code would always call fclose(false) if the file was not successfully opened - resulting in a PHP notice.
2014-12-03 19:29:46 +00:00
Andreas Fischer
638e62d60a
Remove LICENSE text from source code files.
2014-12-03 18:49:33 +01:00
Andreas Fischer
dbbc21cb64
Merge pull request #510 from cnelissen/FixFileAsn1Classes
...
Split File_ASN1 and File_ASN1_Element into separate files
* cnelissen/FixFileAsn1Classes:
Code sniffer php version fix
Removed duplicated docblock text
Codesniff fix
Split File_ASN1 and File_ASN1_Element into separate files
2014-12-03 18:38:23 +01:00
Andreas Fischer
cc4aac1f29
Merge pull request #509 from cnelissen/FixSSHAgentClasses
...
Split System_SSH_Agent and System_SSH_Agent_Identity into separate files
* cnelissen/FixSSHAgentClasses:
Code sniff php version fix
Removed duplicated docblock text
Split System_SSH_Agent and System_SSH_Agent_Identity into separate files
2014-12-03 18:38:17 +01:00
Clint Nelissen
ef3c96a46f
Code sniff php version fix
2014-12-03 08:59:01 -08:00
Clint Nelissen
9bb9f54773
Code sniffer php version fix
2014-12-03 08:57:41 -08:00
Andreas Fischer
74d0b8ccce
Merge branch 'master' into php5
...
* master:
Updated dependencies
Conflicts:
composer.lock
2014-12-03 12:30:55 +01:00
Andreas Fischer
bce3c02126
Merge pull request #517 from GrahamCampbell/deps
...
Updated dependencies
* GrahamCampbell/deps:
Updated dependencies
2014-12-03 12:30:12 +01:00
Graham Campbell
91511b7c5c
Updated dependencies
2014-12-02 21:25:47 +00:00
Andreas Fischer
cd10ded72e
Merge pull request #508 from cnelissen/RandomAsClass
...
Promote Crypt/Random.php to a fully qualified class
* cnelissen/RandomAsClass:
Removed includes for Random.php and fixed up user_error message
Renamed Random::crypt_random_string to Random::string
Regenerated lock file
Namespaced Crypt\Random
Code sniff fix
Initial commit
Conflicts:
composer.lock
2014-12-02 21:56:21 +01:00
Andreas Fischer
946aa08aec
Merge pull request #515 from GrahamCampbell/patch-1
...
Alias the php5 branch as 2.0.x for now
* GrahamCampbell/patch-1:
Alias the php5 branch as 2.0.x for now
2014-12-02 21:50:38 +01:00
Andreas Fischer
885359bf21
Merge branch 'master' into php5
...
* master:
Update squizlabs/php_codesniffer from 1.5.2 to 1.5.5
Update phpunit/phpunit to 4.3.*
Update sami/sami to 2.*
Conflicts:
composer.lock
2014-12-02 21:41:01 +01:00
Andreas Fischer
6445e58bc0
Merge pull request #516 from bantu/dev-deps-update
...
Update development dependencies
* bantu/dev-deps-update:
Update squizlabs/php_codesniffer from 1.5.2 to 1.5.5
Update phpunit/phpunit to 4.3.*
Update sami/sami to 2.*
2014-12-02 21:39:41 +01:00
Andreas Fischer
420653a0a6
Update squizlabs/php_codesniffer from 1.5.2 to 1.5.5
2014-12-02 21:27:35 +01:00
Andreas Fischer
cd6e50bfb9
Update phpunit/phpunit to 4.3.*
2014-12-02 21:23:58 +01:00
Andreas Fischer
a71ace33ad
Update sami/sami to 2.*
2014-12-02 21:23:40 +01:00