Commit Graph

1029 Commits

Author SHA1 Message Date
terrafrost
c8bf68ac02 ASN1: make it so bit string's can have an optional minimum size 2014-04-05 18:07:35 -05:00
Andreas Fischer
a455c1771e Merge pull request #304 from bantu/ssh-agent-psr0-fix
SSH_Agent: mv SSH_Agent to SSH/Agent and create SSH_Agent for BC

* bantu/ssh-agent-psr0-fix:
  SSH_Agent: add new line at end of file to comply with CS
  SSH_Agent: another CS update
  SSH_Agent: CS updates
  SSH_Agent: mv SSH_Agent to SSH/Agent and create SSH_Agent for BC
2014-04-01 23:13:58 +02:00
Andreas Fischer
6f4ddf0e33 SSH_Agent: add new line at end of file to comply with CS 2014-04-01 22:54:26 +02:00
terrafrost
1694012f78 SSH_Agent: another CS update 2014-03-30 16:37:11 -05:00
terrafrost
50b250ce69 SSH_Agent: CS updates 2014-03-30 16:32:05 -05:00
Andreas Fischer
fba7376b08 Merge pull request #299 from terrafrost/phpinfo-fix
add error suppression to phpinfo()

* terrafrost/phpinfo-fix:
  add error suppression to phpinfo()
2014-03-30 17:23:30 +02:00
terrafrost
a8c2ff0fb0 add error suppression to phpinfo()
bad timezone settings can make phpinfo() throw errors so we'll just
suppress them. if there are legit non-timezone errors with php install
those will probably be hit in other parts of the code
2014-03-30 10:15:08 -05:00
terrafrost
924014fe72 SSH_Agent: mv SSH_Agent to SSH/Agent and create SSH_Agent for BC 2014-03-30 08:49:22 -05:00
terrafrost
a478b74860 ASN1: explicit application tags didn't work (although implicit ones did) 2014-03-30 01:11:47 -05:00
terrafrost
dfa583b9ea X509: Array -> array (CS consistency) 2014-03-29 15:26:50 -05:00
terrafrost
ea4dc53a06 Merge remote-tracking branch 'michael/fix_cert_time_encoding' 2014-03-29 15:25:32 -05:00
Michael Braun
457f8fbb99 fix certificate date encoding
RFC 3280 requires in section
 - 4.1.2.5 Validity
 - 5.1.2.4 This Update
 - 5.1.2.5 Next Update
 - 5.1.2.6 Revoked Certificates
that dates are to be encoded as utcTime iff they are before 2050 and
as generalTime otherwise.

Currently, phpseclib does not respect this by always choosing generalTime.
Further, the format used interally to represent dates only keeps two digits,
so dates in 2050 and later cannot be represented in this format.

This patch fixes this by
 1. changing the interal format to be capable of unambiguously representing
    dates in 2050 or later (i.e. use four digits to represent the year),
 2. choosing between utcTime and generalTime accordingly.

Without this patch, openssl_x509_parse complains:
 Warning: openssl_x509_parse(): illegal ASN1 data type for timestamp
2014-03-28 15:02:50 +01:00
Andreas Fischer
c6b990432c Merge pull request #297 from terrafrost/ssh-channel-fix-2
fix more ssh channel issues

* terrafrost/ssh-channel-fix-2:
  fix more ssh channel issues
2014-03-21 18:27:00 +01:00
terrafrost
7a2c7a414c fix more ssh channel issues
In logs that were provided to me phpseclib sent a packet that was 2536 bytes long (excluding the bytes denoting the channel and data length) but the length packet said it was 32764 bytes long (ie. $max_size).

So when $max_size is less than the data being sent and has to be adjusted by a new window adjust message from the server and the adjustment makes $max_Size bigger than the data being sent over problems arise.

SSH's window size has caused issues before. Overall I don't think the SSH specs really explain the window size very well. I opened up an errata on SSH's RFC a while back about the issue.
2014-03-21 02:53:43 -05:00
Andreas Fischer
b77b26f692 Merge pull request #288 from bantu/drop-meaningless-version-tags
Drop version tags from doc blocks.

* bantu/drop-meaningless-version-tags:
  Drop meaningless, outdated, inconsistent version tags in doc blocks.
2014-03-13 00:03:21 +01:00
Andreas Fischer
fb1296bbec Drop meaningless, outdated, inconsistent version tags in doc blocks.
find phpseclib -type f -name "*.php" -exec sed -i '/@version/d' {} \;
2014-03-11 15:58:33 +01:00
Andreas Fischer
5dcc63ef6c Merge pull request #283 from bantu/tests-bug280
Tests for bug280 [use of $callback()]

* bantu/tests-bug280:
  Tests for bug280.
  Also replace this with call_user_func
  Use call_user_func, as this will work on PHP < 5.4, whereas $callback() does not
2014-03-06 12:05:11 +01:00
Andreas Fischer
aa64ddfd4d Merge pull request #280 from nickygerritsen/master
Use call_user_func, as this will work on PHP < 5.4, whereas $callback() does not

* nickygerritsen/master:
  Also replace this with call_user_func
  Use call_user_func, as this will work on PHP < 5.4, whereas $callback() does not
2014-03-06 12:01:14 +01:00
Andreas Fischer
90ff32d56d Tests for bug280. 2014-03-06 11:55:14 +01:00
Andreas Fischer
60e2bfc073 Merge pull request #282 from vlajos/typofixes-20140305
typo fixes

* vlajos/typofixes-20140305:
  typofixes - https://github.com/vlajos/misspell_fixer
2014-03-06 10:46:18 +01:00
Veres Lajos
930a3fb4d2 typofixes - https://github.com/vlajos/misspell_fixer 2014-03-05 23:41:20 +00:00
Nicky Gerritsen
b5e579f6c0 Also replace this with call_user_func 2014-03-05 18:38:33 +01:00
Nicky Gerritsen
97d1e75a51 Use call_user_func, as this will work on PHP < 5.4, whereas $callback() does not 2014-03-05 15:44:17 +01:00
Andreas Fischer
8b068b1df0 Merge pull request #278 from bantu/functional-tests
Introduce functional tests (SSH2 as an example)

* bantu/functional-tests:
  Mark SSH2 Test as Incomplete on Travis PHP 5.3.3 and below for now.
  Add basic SSH2 functional test as an example.
  Extract phpunit call to run-phpunit.sh
  Introduce abstract class for functional tests.
2014-03-04 18:21:01 +01:00
Andreas Fischer
3d3d55b407 Mark SSH2 Test as Incomplete on Travis PHP 5.3.3 and below for now. 2014-03-04 14:56:42 +01:00
Andreas Fischer
00c19f4cc1 Add basic SSH2 functional test as an example. 2014-03-03 02:14:27 +01:00
Andreas Fischer
dbcba51198 Extract phpunit call to run-phpunit.sh 2014-03-03 02:14:27 +01:00
Andreas Fischer
ea31d9d38c Introduce abstract class for functional tests. 2014-03-03 01:34:43 +01:00
Andreas Fischer
c1597f4533 Remove HTML from BigInteger code example. 2014-03-01 01:40:28 +01:00
Andreas Fischer
f744fbbcc9 Set permissions of phpseclib/Crypt/RC2.php to 644. 2014-03-01 00:56:08 +01:00
terrafrost
0ea31d9b65 composer: add System to psr-0 autoload section 2014-02-28 10:05:05 -06:00
terrafrost
76c9692908 update README.md to show latest version 2014-02-22 19:03:22 -06:00
terrafrost
b3a1f52bff SSH_Agent: a few changes per bantu 2014-02-21 23:15:24 -06:00
Andreas Fischer
e08c7244e2 Add newline at EOF to phpseclib/System/SSH_Agent.php. 2014-02-21 19:22:09 +01:00
Andreas Fischer
053a9ac9af Merge pull request #265 from terrafrost/ssh-agent
SSH2: add ssh-agent support

* terrafrost/ssh-agent:
  SSH_Agent: phpdoc updates
  SSH_Agent: misc updates
  SSH2: add ssh-agent support
2014-02-21 19:17:51 +01:00
terrafrost
b4b93b80f5 SSH_Agent: phpdoc updates 2014-02-20 13:38:07 -06:00
terrafrost
405ff3f7b4 SSH_Agent: misc updates 2014-02-19 10:13:54 -06:00
Andreas Fischer
8dc659d694 Merge pull request #269 from bantu/code-sniffer-tests
Apply Code Sniffer to tests folder

* bantu/code-sniffer-tests:
  Apply coding guidelines (with exceptions) to the tests directory.
  Update PHP_CodeSniffer from 1.4.7 to 1.5.2. This fixes a rule inheritance bug.
  Use exclude instead of changing severity.
  Add build directory.
2014-02-17 18:53:54 +01:00
Andreas Fischer
ef528ea879 Apply coding guidelines (with exceptions) to the tests directory. 2014-02-15 20:05:30 +01:00
Andreas Fischer
9cb25c3032 Update PHP_CodeSniffer from 1.4.7 to 1.5.2. This fixes a rule inheritance bug. 2014-02-15 19:40:19 +01:00
Andreas Fischer
6e851baca0 Use exclude instead of changing severity. 2014-02-15 19:16:21 +01:00
Andreas Fischer
6fc22d5405 Add build directory. 2014-02-15 18:51:09 +01:00
Andreas Fischer
b03100601b Merge pull request #268 from bantu/travis/php-5.6
Add Travis CI PHP 5.6 environment.

* bantu/travis/php-5.6:
  Add Travis CI PHP 5.6 environment.
2014-02-13 23:34:10 +01:00
Andreas Fischer
741d638447 Add Travis CI PHP 5.6 environment. 2014-02-13 22:50:04 +01:00
Andreas Fischer
a7106a737e Merge pull request #266 from bantu/cs-endfile-newline
CS: Each file MUST end with exactly one newline character

* bantu/cs-endfile-newline:
  CS: Each file MUST end with exactly one newline character
2014-02-11 01:00:44 +01:00
Andreas Fischer
56f1ada5c1 CS: Each file MUST end with exactly one newline character 2014-02-10 14:51:35 +01:00
terrafrost
e90648c7a5 SSH2: add ssh-agent support 2014-02-10 00:04:16 -06:00
Andreas Fischer
f4dbcb1b78 Merge pull request #264 from terrafrost/exit-status
SSH2: ignore exit_status channel requests

* terrafrost/exit-status:
  SSH2: ignore exit_status channel requests
2014-02-03 16:56:36 +01:00
terrafrost
cd9801db8a SSH2: ignore exit_status channel requests
Fixes #258
2014-02-02 23:42:06 -06:00
Andreas Fischer
8664b69e10 Merge pull request #256 from bantu/fix-php-compat-description
PHP_Compat is required when the PHP version below 4.3.3 (not above or eq...

* bantu/fix-php-compat-description:
  PHP_Compat is required when the PHP version below 4.3.3 (not above or equal).
2014-01-30 15:21:47 +01:00