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,026 Commits 4 Branches 121 Tags 19 MiB
61b0fe2ddf
Commit Graph

1026 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Andreas Fischer
f79d662401 PHP_Compat is required when the PHP version below 4.3.3 (not above or equal). 2014-01-30 03:11:43 +01:00
Andreas Fischer
52fa1df044 Merge branch 'master' into php5 
* master:
  The HHVM environment does not know phpize, so we can not install extensions.
  Run travis tests on HipHop Virtual Machine (hhvm).
 2014-01-22 04:16:42 +01:00
Andreas Fischer
8876c820c3 Merge pull request #211 from bantu/travis/hhvm 
Run travis tests on HipHop Virtual Machine (hhvm).

* bantu/travis/hhvm:
  The HHVM environment does not know phpize, so we can not install extensions.
  Run travis tests on HipHop Virtual Machine (hhvm).
 2014-01-22 04:16:33 +01:00
Andreas Fischer
4f0fbe065a Merge branch 'master' into php5 
* master:
  Put PHP extension installation into a shell script.
  Add a folder for travis.
 2014-01-22 04:15:13 +01:00
Andreas Fischer
80310d61b4 Merge pull request #252 from bantu/travis/reorganisation 
Reorganise travis configuration

* bantu/travis/reorganisation:
  Put PHP extension installation into a shell script.
  Add a folder for travis.
 2014-01-22 04:14:46 +01:00
Andreas Fischer
b74a81e074 The HHVM environment does not know phpize, so we can not install extensions. 2014-01-22 03:54:32 +01:00
Andreas Fischer
ff9a23227a Run travis tests on HipHop Virtual Machine (hhvm). 2014-01-22 03:54:32 +01:00
Andreas Fischer
3084a30615 Put PHP extension installation into a shell script. 2014-01-22 03:54:02 +01:00
Andreas Fischer
0a639cd7f5 Add a folder for travis. 2014-01-22 03:41:24 +01:00
Andreas Fischer
0c4cc0bd0e Merge branch 'master' into php5 
* master:
  Cleaned up whitespace

Conflicts:
	composer.json
 2014-01-18 18:58:55 +01:00
Andreas Fischer
211e237090 Merge pull request #250 from GrahamCampbell/whitespace-fixes 
Cleaned Up Whitespace

* GrahamCampbell/whitespace-fixes:
  Cleaned up whitespace
 2014-01-18 18:51:33 +01:00
Graham Campbell
1c2796e3eb Cleaned up whitespace 2014-01-18 17:29:25 +00:00
terrafrost
777db22709 Merge branch 'php5' of https://github.com/phpseclib/phpseclib into php5 2013-12-28 13:56:27 -06:00
terrafrost
05077cf0f3 Merge branch 'ssh2-identifier' into php5 2013-12-28 13:50:05 -06:00
terrafrost
268ec2e5d1 Merge branch 'ssh2-identifier' 2013-12-28 13:49:05 -06:00
terrafrost
0ccac2c998 SSH2: add new line in docblock comment 2013-12-28 13:47:24 -06:00
Marc Philip Scholten
19be15c4c4 Fixed typos 2013-12-28 18:16:09 +01:00
Andreas Fischer
df69d479db Merge branch 'master' into php5 
* master:
  RSA: add unit test for $rsa->loadKey()
 2013-12-28 13:42:34 +01:00
Andreas Fischer
28573d63f5 Merge pull request #236 from terrafrost/rsa-loadkey-unittest 
RSA: add unit test for $rsa->loadKey()

* terrafrost/rsa-loadkey-unittest:
  RSA: add unit test for $rsa->loadKey()
 2013-12-28 13:41:58 +01:00
Andreas Fischer
d48e284cae Merge branch 'master' into php5 
* master:
  SFTP: make get() return correctly sized strings
 2013-12-28 13:41:09 +01:00
Andreas Fischer
b82478b48f Merge pull request #237 from terrafrost/sftp-get-size-fix 
SFTP: make get() return correctly sized strings

* terrafrost/sftp-get-size-fix:
  SFTP: make get() return correctly sized strings
 2013-12-28 13:41:03 +01:00
Andreas Fischer
b9e785f292 Merge branch 'master' into php5 
* master:
  RSA: remove unit test for time being - it's going to be renamed and rewritten
  RSA: update comments for _extractBER
  RSA: more verbose RSA key handling
 2013-12-28 13:40:49 +01:00
terrafrost
466f9354df SFTP: make get() return correctly sized strings 2013-12-27 11:08:33 -06:00
terrafrost
40bf0b1e59 RSA: add unit test for $rsa->loadKey() 2013-12-27 10:41:07 -06:00
terrafrost
a1b749a0a0 Merge branch 'master' into php5 2013-12-27 10:25:19 -06:00
terrafrost
d2c4ccfc28 Merge branch 'master' of https://github.com/phpseclib/phpseclib 2013-12-27 10:24:47 -06:00
terrafrost
48ab947fe1 RSA: remove unit test for time being - it's going to be renamed and 
rewritten
 2013-12-27 10:22:36 -06:00
Marc Philip Scholten
3d5262156d Fixed missing dataProvider in test 2013-12-26 21:03:00 +01:00
Marc Philip Scholten
ad0c7c52bd Fixed cs 2013-12-26 21:02:18 +01:00
Marc Philip Scholten
b0de383f95 Replaced else { if ()...} with elseif() {} 2013-12-26 21:02:17 +01:00
Marc Philip Scholten
699ac0b0e9 Rewritten test to just check for possible combinations 2013-12-26 21:02:17 +01:00
Marc Philip Scholten
357d4253ee Fixed typo 2013-12-26 21:00:58 +01:00
Marc Philip Scholten
4817d28a54 Refactored Net_SSH2::$identifier and added unit tests 
Added return tag
 2013-12-26 21:00:58 +01:00
Andreas Fischer
28f6f19abe Merge branch 'master' into php5 
* master:
  SSH2: better accomodate Phar's
 2013-12-26 19:43:34 +01:00
Andreas Fischer
f63798b923 Merge pull request #233 from terrafrost/phar-fix 
SSH2: better accomodate Phar's

* terrafrost/phar-fix:
  SSH2: better accomodate Phar's
 2013-12-26 19:43:26 +01:00
Andreas Fischer
060ae325b7 Merge branch 'master' into php5 
* master:
  Fixed classname of test
  Fixed some wrong @see annotations
  Fixed /e preg_replace modifier exactly like in 0dc8b27a6a
  Added Net_SSH1::_format_log test
 2013-12-26 18:41:32 +01:00
Andreas Fischer
9c7c01c337 Merge pull request #223 from mpscholten/fix-ssh1-php55 
Fix Net_SSH1 on Php5.5 (/e preg_replace modifier)

* mpscholten/fix-ssh1-php55:
  Fixed classname of test
  Fixed some wrong @see annotations
  Fixed /e preg_replace modifier exactly like in 0dc8b27a6a
  Added Net_SSH1::_format_log test
 2013-12-26 18:41:25 +01:00
Marc Philip Scholten
2a7b6e39fb Fixed classname of test 2013-12-26 12:16:08 +01:00
Marc Philip Scholten
6d8c02c432 Fixed some wrong @see annotations 2013-12-26 12:09:40 +01:00
Andreas Fischer
83fbeac766 Merge branch 'master' into php5 
* master:
  Fix indentation of _append_log in SSH1 and SSH2.
 2013-12-26 12:00:42 +01:00
Andreas Fischer
b793286561 Merge pull request #229 from bantu/ssh-append-log-intendation 
Fix indentation of _append_log in SSH1 and SSH2.

* bantu/ssh-append-log-intendation:
  Fix indentation of _append_log in SSH1 and SSH2.
 2013-12-26 12:00:33 +01:00
Andreas Fischer
0f69d35584 Fix indentation of _append_log in SSH1 and SSH2. 2013-12-26 11:45:24 +01:00
Andreas Fischer
231f5a2697 Merge branch 'master' into php5 
* master:
  Use NET_SSH1_ instead of NET_SSH2_ prefix in SSH1.
 2013-12-26 11:42:19 +01:00
Andreas Fischer
2da2f5d29f Merge pull request #227 from bantu/ssh2-constant-prefix-ssh1 
Use NET_SSH1_ instead of NET_SSH2_ prefix in SSH1.

* bantu/ssh2-constant-prefix-ssh1:
  Use NET_SSH1_ instead of NET_SSH2_ prefix in SSH1.
 2013-12-26 11:42:11 +01:00
Andreas Fischer
7f6ac90380 Merge branch 'master' into php5 
* master:
  CS: Add useful whitespace CodeSniffer rules.
 2013-12-26 11:39:25 +01:00
Andreas Fischer
0dd5a9ba9f Merge pull request #228 from bantu/cs-whitespace 
CS: Add useful whitespace CodeSniffer rules.

* bantu/cs-whitespace:
  CS: Add useful whitespace CodeSniffer rules.
 2013-12-26 11:38:17 +01:00
terrafrost
70b9a69c46 SSH2: better accomodate Phar's 2013-12-26 01:55:05 -06:00
terrafrost
b23a693ae5 RSA: update comments for _extractBER 2013-12-26 01:46:58 -06:00
Andreas Fischer
c033e4ea57 Merge branch 'master' into php5 
* master:
  SFTP: add explanation for use of 4294967296
  SSH2: typos in last commit
  Compatibility fixes
 2013-12-26 00:37:08 +01:00