octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-09-16 09:39:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,145 Commits 4 Branches 121 Tags 19 MiB
29b1bb7a58
Commit Graph

2145 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott
29b1bb7a58 Update random_bytes() to conform to PHP7.0.0-RC3 
Fixes #843
 2015-10-09 15:19:59 -04:00
Andreas Fischer
0ba1a04c05 Merge branch '2.0' 
* 2.0:
  SFTP: don't start in local file middle when uploading to middle of the remote file
  Tests/SFTP: updates to newly added unit test
  SFTP: backport DavidAnderson684's changes to 1.0 branch
  add unit test demo'ing issue # 830
 2015-09-30 17:28:03 +02:00
Andreas Fischer
b8071428f1 Merge branch '1.0' into 2.0 
* 1.0:
 2015-09-30 17:27:45 +02:00
Andreas Fischer
cf101b5d8c Merge pull request #834 from terrafrost/sftp-endless-loop-v2 
SFTP.php : prevent endless loop when upload completed with non-zero $start or $local_start for 2.0

* terrafrost/sftp-endless-loop-v2:
  SFTP: don't start in local file middle when uploading to middle of the remote file
  Tests/SFTP: updates to newly added unit test
  SFTP: backport DavidAnderson684's changes to 1.0 branch
  add unit test demo'ing issue # 830
 2015-09-30 17:27:37 +02:00
Andreas Fischer
c0e42ad751 Merge pull request #833 from terrafrost/sftp-endless-loop 
SFTP.php : prevent endless loop when upload completed with non-zero $start or $local_start for 1.0

* terrafrost/sftp-endless-loop:
  SFTP: don't start in local file middle when uploading to middle of the remote file
  Tests/SFTP: updates to newly added unit test
  SFTP: backport DavidAnderson684's changes to 1.0 branch
  add unit test demo'ing issue # 830
 2015-09-30 17:26:23 +02:00
terrafrost
0f49fb86bf Merge branch 'sftp-endless-loop' into sftp-endless-loop-v2 
Conflicts:
	phpseclib/Net/SFTP.php
	tests/Functional/Net/SFTPUserStoryTest.php
 2015-09-29 21:51:20 -05:00
terrafrost
6688f650f1 SFTP: don't start in local file middle when uploading to middle of 
the remote file
 2015-09-29 21:39:35 -05:00
terrafrost
26ddf02fee Merge branch 'sftp-endless-loop' into sftp-endless-loop-v2 
Conflicts:
	phpseclib/Net/SFTP.php
 2015-09-28 09:20:38 -05:00
terrafrost
759e04f08e Tests/SFTP: updates to newly added unit test 2015-09-27 10:57:41 -05:00
terrafrost
e2a2ad8c91 SFTP: backport DavidAnderson684's changes to 1.0 branch 2015-09-27 10:56:05 -05:00
terrafrost
23db2f7be3 add unit test demo'ing issue # 830 2015-09-27 10:54:08 -05:00
Andreas Fischer
70f55bd156 Merge pull request #825 from terrafrost/rsa-revamp 
RSA: make createKey static and make it return RSA objects

* terrafrost/rsa-revamp:
  RSA: make createKey static and make it return RSA objects
 2015-09-25 13:16:56 +02:00
terrafrost
fab5a66fe5 RSA: make createKey static and make it return RSA objects 2015-09-24 09:43:19 -05:00
Andreas Fischer
f278e60c9c Merge pull request #823 from GrahamForks/readme-3 
[3.0] Fixed readme links

* GrahamForks/readme-3:
  Fixed readme
 2015-09-16 13:43:17 +02:00
Andreas Fischer
84a60cfff5 Merge branch '2.0' 
* 2.0:
  Fixed readme
  Fixed readme links
 2015-09-16 13:43:10 +02:00
Andreas Fischer
bff8e3093f Merge pull request #822 from GrahamForks/readme-2 
[2.0] Fixed readme links

* GrahamForks/readme-2:
  Fixed readme
 2015-09-16 13:41:09 +02:00
Andreas Fischer
aef80c4182 Merge branch '1.0' into 2.0 
* 1.0:
  Fixed readme links

Conflicts:
	README.md
 2015-09-16 13:41:01 +02:00
Andreas Fischer
34f581554a Merge pull request #821 from GrahamForks/readme 
[1.0] Fixed readme links

* GrahamForks/readme:
  Fixed readme links
 2015-09-16 13:40:37 +02:00
Andreas Fischer
ccd18552e5 Merge branch '2.0' 
* 2.0:
  Fixed phpdoc

Conflicts:
	phpseclib/Crypt/Hash.php
 2015-09-16 13:36:04 +02:00
Andreas Fischer
95ccad70ee Merge pull request #820 from GrahamForks/phpdoc 
[2.0 Fixed phpdoc

* GrahamForks/phpdoc:
  Fixed phpdoc
 2015-09-16 13:34:55 +02:00
Andreas Fischer
5772f74199 Merge branch '2.0' 
* 2.0:
  Composer: add GrahamCampbell to composer.json
  AUTHORS: add GrahamCampbell
 2015-09-16 13:31:06 +02:00
Andreas Fischer
cb0f1a57e6 Merge branch '1.0' into 2.0 
* 1.0:
  Composer: add GrahamCampbell to composer.json
  AUTHORS: add GrahamCampbell

Conflicts:
	composer.lock
 2015-09-16 13:31:01 +02:00
Andreas Fischer
b48a01ec00 Merge pull request #824 from terrafrost/new-author 
AUTHORS: add GrahamCampbell

* terrafrost/new-author:
  Composer: add GrahamCampbell to composer.json
  AUTHORS: add GrahamCampbell
 2015-09-16 13:29:41 +02:00
terrafrost
fae274f9c9 Composer: add GrahamCampbell to composer.json 2015-09-15 19:12:57 -05:00
terrafrost
7b0b111fcd AUTHORS: add GrahamCampbell 2015-09-15 13:23:52 -05:00
Graham Campbell
fa41c5cac6 Fixed readme 2015-09-15 17:32:08 +01:00
Graham Campbell
7d11c830ce Fixed readme 2015-09-15 17:30:33 +01:00
Graham Campbell
783a07fecd Fixed readme links 2015-09-15 17:28:41 +01:00
Andreas Fischer
3b33941d3d Merge pull request #813 from bantu/hash-rewrite 
[master] More work on Hash.php

* bantu/hash-rewrite:
  Hash: Cover remaining uncovered line.
  Hash: Update incorrect documentation, use max line length 80.
  Hash: Remove constructor return value documentation.
  Hash: Do not assign false to length property. It's documented as an int.
  Hash: Rename properly l to length.
  Slightly rework of HashTest.php.
 2015-09-14 22:47:37 +02:00
Graham Campbell
7f1bbfe216 Fixed phpdoc 2015-09-14 16:30:31 +01:00
Andreas Fischer
970398f341 Merge pull request #819 from bantu/travis-php7-nofail 
No longer allow Travis CI to fail on PHP 7.

* bantu/travis-php7-nofail:
  No longer allow Travis CI to fail on PHP 7.
 2015-09-14 15:25:14 +02:00
Andreas Fischer
f97e1ee91d Merge branch '2.0' 
* 2.0:
  No longer allow Travis CI to fail on PHP 7.
 2015-09-14 15:25:14 +02:00
Andreas Fischer
ffc8107a12 No longer allow Travis CI to fail on PHP 7. 2015-09-14 14:09:56 +02:00
Andreas Fischer
4d4b7f9aec Merge branch '2.0' 
* 2.0:
  BigInteger: fix PHP7 error
 2015-09-14 14:07:44 +02:00
Andreas Fischer
6f6ec7f13a Merge branch '1.0' into 2.0 
* 1.0:
 2015-09-14 14:07:38 +02:00
Andreas Fischer
4d8388d5d0 Merge pull request #818 from terrafrost/php7-2.0 
BigInteger: fix PHP7 error for 2.0 branch

* terrafrost/php7-2.0:
  BigInteger: fix PHP7 error
 2015-09-14 14:07:34 +02:00
Andreas Fischer
4c7a2b5d73 Merge pull request #817 from terrafrost/php7 
BigInteger: fix PHP7 error

* terrafrost/php7:
  BigInteger: fix PHP7 error
 2015-09-14 14:07:24 +02:00
terrafrost
3f7b3b393e Merge branch 'php7' into 2.0 
Conflicts:
	phpseclib/Math/BigInteger.php
 2015-09-13 19:15:13 -05:00
terrafrost
833da775b6 BigInteger: fix PHP7 error 
$x = gmp_init(6); empty($x); demonstrates the problem
 2015-09-13 19:13:31 -05:00
Andreas Fischer
5b6642ae37 Hash: Cover remaining uncovered line. 2015-09-14 01:34:20 +02:00
Andreas Fischer
7d3a1db469 Hash: Update incorrect documentation, use max line length 80. 2015-09-14 01:34:20 +02:00
Andreas Fischer
189b709afb Hash: Remove constructor return value documentation. 2015-09-14 01:34:15 +02:00
Andreas Fischer
cd815c929e Hash: Do not assign false to length property. It's documented as an int. 2015-09-14 01:33:41 +02:00
Andreas Fischer
b34de90818 Hash: Rename properly l to length. 2015-09-14 01:32:56 +02:00
Andreas Fischer
5745c8a5be Merge branch '2.0' 
* 2.0:
  small CS changes
 2015-09-14 01:30:54 +02:00
Andreas Fischer
2986ea9d6d Merge pull request #816 from terrafrost/small-tweaks 
small CS changes

* terrafrost/small-tweaks:
  small CS changes
 2015-09-14 01:30:54 +02:00
Andreas Fischer
3342eb6d09 Merge branch '2.0' 
* 2.0:
  Fixed another case
  Minor tweaks
  Fixed error
  More fixes
  PHPDoc fixes
 2015-09-14 01:27:11 +02:00
Andreas Fischer
4387b64426 Merge branch '1.0' into 2.0 
* 1.0:
  Fixed another case
  Minor tweaks
  Fixed error
  More fixes
  PHPDoc fixes

Conflicts:
	phpseclib/Crypt/Random.php
	phpseclib/Math/BigInteger.php
	phpseclib/Net/SSH2.php
	tests/Functional/Net/SFTPUserStoryTest.php
 2015-09-14 01:27:04 +02:00
Andreas Fischer
71d7108d9a Merge pull request #810 from GrahamForks/cs 
PHPDoc Fixes And Others

* GrahamForks/cs:
  Fixed another case
  Minor tweaks
  Fixed error
  More fixes
  PHPDoc fixes
 2015-09-14 01:18:09 +02:00
terrafrost
8b8d7a5dcd small CS changes 2015-09-13 18:13:35 -05:00