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

2637 Commits

Author SHA1 Message Date
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
7348ab6ef7 Remove deprecated method Math_BigInteger::setRandomGenerator(). 2014-04-13 01:04:37 +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
61b0fe2ddf Merge branch 'master' into php5
* master:
  Run Code Sniffer via phing.
  Depend on phing/phing build script.

Conflicts:
	composer.lock
2014-04-12 19:33:05 +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
003dcbb75e Merge branch 'master' into php5
* master:
  Extend segfault workaround to PHP versions below 5.4.
2014-04-12 07:23:32 +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
7b7cc829d9 Merge branch 'master' into php5
* master:
  Update composer before using it. Fixes openssl for https error.
  Install PHPUnit via Composer and update to version 4.0.
2014-04-12 06:54:55 +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
1313009c9c Merge branch 'master' into php5
* master:
  Prevent segfault on PHP 5.3.3 by disabling GC.
2014-04-11 00:45:37 +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
58cdf692f8 Merge branch 'master' into php5
* master:
  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

Conflicts:
	phpseclib/Net/SSH2.php
2014-04-10 18:00:38 +02: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
12875cb12c Merge branch 'master' into php5
* master:
  A few functional tests for Net_SFTP.
2014-04-07 18:58:49 +02: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
4d8f056631 Merge branch 'master' into php5
* master:
  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:16:20 +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
a3adb4fad5 Merge pull request #305 from bantu/remove-ssh-agent-bc-file
[php5] Remove the phpseclib/System/SSH_Agent.php BC file.

* bantu/remove-ssh-agent-bc-file:
  Remove the phpseclib/System/SSH_Agent.php BC file.
2014-04-02 01:35:32 +02:00
Andreas Fischer
0288817203 Remove the phpseclib/System/SSH_Agent.php BC file. 2014-04-01 23:15:16 +02:00
Andreas Fischer
b7729feea0 Merge branch 'master' into php5
* master:
  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:14:44 +02: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
51fbabd6d6 Merge branch 'master' into php5
* master:
  add error suppression to phpinfo()
2014-03-30 17:23:42 +02: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