1
0
mirror of https://github.com/danog/phpseclib.git synced 2024-12-16 02:47:05 +01:00
Commit Graph

1968 Commits

Author SHA1 Message Date
Andreas Fischer
4728823fc9 bug280 is ambiguous. Use github prefix instead. 2014-04-18 16:49:37 +02:00
Andreas Fischer
14cfcc1b53 Merge pull request #310 from terrafrost/keberos-fix
ASN1 changes

* terrafrost/keberos-fix:
  ASN1: test case updates
  ASN1: add test cases for latest changes
  ASN1: CS update
  ASN1: make developing new ASN.1 scripts a little easier
  ASN1: make it so bit string's can have an optional minimum size
  ASN1: explicit application tags didn't work (although implicit ones did)
2014-04-18 16:47:48 +02:00
Andreas Fischer
a104be4a77 Merge pull request #316 from bantu/readme-update
Add "Installing Dependencies" and "Contributing" sections to README.md

* bantu/readme-update:
  Use "Development Dependencies" instead of "Dependencies" for less confusion.
  Capitalisation improvements.
  Add Contributing section to README.md
  Add section about Dependency Installation to README.md
2014-04-18 16:44:43 +02:00
terrafrost
f970b69a9e ASN1: test case updates 2014-04-17 23:53:33 -05:00
terrafrost
317efaf28a RSA: auto-detect public keys vs private keys 2014-04-17 10:30:32 -05:00
terrafrost
27b3ea4059 ASN1: add test cases for latest changes 2014-04-16 15:18:45 -05:00
Andreas Fischer
4fece986e3 Use "Development Dependencies" instead of "Dependencies" for less confusion.
There are currently no production dependencies.
2014-04-15 16:51:50 +02:00
Andreas Fischer
9653e3c70f Capitalisation improvements. 2014-04-12 20:42:15 +02:00
Andreas Fischer
a7e7f5891a Add Contributing section to README.md 2014-04-12 20:32:32 +02:00
Andreas Fischer
670222bc31 Add section about Dependency Installation to README.md 2014-04-12 20:26:58 +02:00
Andreas Fischer
1a7e3746d5 Merge pull request #314 from bantu/codesniffer-via-phing
Add phing build script and run CodeSniffer from it

* bantu/codesniffer-via-phing:
  Run Code Sniffer via phing.
  Depend on phing/phing build script.
2014-04-12 19:30:37 +02:00
terrafrost
10be403aff ASN1: CS update 2014-04-12 12:01:04 -05:00
Andreas Fischer
4a064a0506 Run Code Sniffer via phing. 2014-04-12 07:48:32 +02:00
Andreas Fischer
8c9b7083d8 Depend on phing/phing build script. 2014-04-12 07:47:26 +02:00
Andreas Fischer
367c856605 Merge pull request #313 from bantu/more-coverage-segfault
Extend segfault workaround to PHP versions below 5.4.

* bantu/more-coverage-segfault:
  Extend segfault workaround to PHP versions below 5.4.
2014-04-12 07:23:23 +02:00
Andreas Fischer
96b7baa9f1 Extend segfault workaround to PHP versions below 5.4. 2014-04-12 07:13:44 +02:00
Andreas Fischer
a7f625c6f3 Merge pull request #312 from bantu/phpunit-4-via-composer
Install PHPUnit via Composer and update to version 4.0.

* bantu/phpunit-4-via-composer:
  Update composer before using it. Fixes openssl for https error.
  Install PHPUnit via Composer and update to version 4.0.
2014-04-12 06:52:51 +02:00
Andreas Fischer
ca59f278da Update composer before using it. Fixes openssl for https error. 2014-04-12 06:18:56 +02:00
Andreas Fischer
86d7c6830c Install PHPUnit via Composer and update to version 4.0. 2014-04-12 04:28:11 +02:00
Andreas Fischer
242cd2c319 Merge pull request #309 from bantu/php5.3.3-coverage-segfault
Prevent segfault on PHP 5.3.3 by disabling GC.

* bantu/php5.3.3-coverage-segfault:
  Prevent segfault on PHP 5.3.3 by disabling GC.
2014-04-11 00:45:32 +02:00
Andreas Fischer
c391f52221 Prevent segfault on PHP 5.3.3 by disabling GC. 2014-04-11 00:03:02 +02:00
terrafrost
61cd5e4f5a ASN1: make developing new ASN.1 scripts a little easier 2014-04-10 13:49:28 -05:00
Andreas Fischer
652788ac34 Merge pull request #308 from terrafrost/ssh2-connect-after-login
SSH2: connect to server in login() function

* terrafrost/ssh2-connect-after-login:
  SSH2: move _connect() call to _login() from login()
  SSH2: phpdoc updates
  SSH: clarify role of constructor / connection timeout
  SSH1: do fsockopen() call when login has been called
  SSH2: != -> |=
  SSH2: phpdoc changes
  SSH2: syntax error
  SSH2: timeout set in constructor != timeout set by setTimeout()
  SSH2: add phpdoc header
  SSH2: connect to server in login() function
2014-04-10 17:45:54 +02:00
terrafrost
79719e8f74 SSH2: move _connect() call to _login() from login()
Per bantu, this is required for it to work with Net/SFTP.php
2014-04-08 08:48:12 -05:00
terrafrost
0ad0bb4c37 SSH2: phpdoc updates 2014-04-07 15:43:31 -05:00
Andreas Fischer
46d2862b42 Merge pull request #306 from bantu/sftp-functional-tests
A few functional tests for Net_SFTP.

* bantu/sftp-functional-tests:
  A few functional tests for Net_SFTP.
2014-04-07 18:58:45 +02:00
Andreas Fischer
fe50a6cdac A few functional tests for Net_SFTP. 2014-04-07 18:16:59 +02:00
Andreas Fischer
48a917c3f8 Merge pull request #307 from bantu/travis-home-directory
Setup Travis CI phpseclib user home directory accordingly.

* bantu/travis-home-directory:
  Use pwd instead of ls. If the directory is empty callback will not be called.
  Setup Travis CI phpseclib user home directory accordingly.
2014-04-07 18:15:39 +02:00
Andreas Fischer
96aaa262eb Use pwd instead of ls. If the directory is empty callback will not be called. 2014-04-07 17:59:21 +02:00
terrafrost
677a291cb3 SSH: clarify role of constructor / connection timeout
Also, in Net_SSH2::_connect() $host is used in multiple places. Rather than changing all references to {$this->host}:{$this->port} preserve existing $host reference and update it accordingly
2014-04-07 10:26:46 -05:00
terrafrost
24bb941799 SSH1: do fsockopen() call when login has been called 2014-04-07 00:30:50 -05:00
terrafrost
6fcfe5c885 SSH2: != -> |= 2014-04-07 00:25:38 -05:00
terrafrost
8f08301744 SSH2: phpdoc changes 2014-04-07 00:19:35 -05:00
terrafrost
ab341df973 SSH2: syntax error 2014-04-07 00:16:54 -05:00
terrafrost
f27a49299e SSH2: timeout set in constructor != timeout set by setTimeout() 2014-04-07 00:02:03 -05:00
terrafrost
fc748346fc SSH2: add phpdoc header 2014-04-06 23:56:21 -05:00
terrafrost
a14e71f38b SSH2: connect to server in login() function
this change will make it so some parameters can be set after the
Net_SSH2 object has been created. eg. instead of doing
define('NET_SSH2_LOGGING', NET_SSH2_LOG_COMPLEX) one can now do
$ssh->setLogging(...) or something.
2014-04-06 23:45:25 -05:00
Andreas Fischer
526a5c2ffb Setup Travis CI phpseclib user home directory accordingly. 2014-04-06 23:30:35 +02:00
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