Commit Graph

1613 Commits

Author SHA1 Message Date
terrafrost
cae579a19b Tests/BigInteger: update testDebugInfo test 2015-12-14 13:26:56 -06:00
terrafrost
786cecf309 Merge branch '1.0' into identifier-update-1.0 2015-12-14 11:07:42 -06:00
terrafrost
b9ce54aae9 Travis: re-add hhvm and use zenovich github repo only 2015-12-13 16:16:50 -06:00
terrafrost
f17f1b2baf Merge branch '1.0' of https://github.com/phpseclib/phpseclib into small-tweaks-2 2015-12-11 13:44:39 -06:00
terrafrost
d8b74a7ee0 SSH2: update unit test 2015-12-07 22:02:02 -06:00
terrafrost
c655b16f75 BigInteger: add engine to __debugInfo output and add unit test 2015-12-07 15:22:53 -06:00
terrafrost
faa977c587 Merge branch '1.0' into identifier-update-1.0 2015-12-07 15:20:45 -06:00
terrafrost
fe6e60c5bd Travis: rm hhvm 2015-12-07 15:00:17 -06:00
terrafrost
c0632bb8af Travis: compile GNU Parallel 2015-12-06 23:30:37 -06:00
terrafrost
ee0f45fea6 update identifier to current version 2015-12-05 10:33:28 -06:00
Andreas Fischer
9f0f8fd7e5 Correct indentation on pvno array definition. 2015-12-05 10:33:28 -06:00
Andreas Fischer
45dd6651af Merge pull request #885 from bantu/fix-884-1.0
Correct indentation on pvno array definition.

* bantu/fix-884-1.0:
  Correct indentation on pvno array definition.
2015-12-01 10:06:19 +01:00
Andreas Fischer
2e8e4bf04a Correct indentation on pvno array definition. 2015-11-29 18:44:21 +01:00
Andreas Fischer
ae99173aed Merge pull request #883 from bantu/pr-876-1.0
Fix PHP invalid index warning

* bantu/pr-876-1.0:
  Fix PHP invalid index warning
2015-11-24 09:28:00 +01:00
splitice
77d5f8da20 Fix PHP invalid index warning 2015-11-24 09:13:30 +01:00
terrafrost
37535744b2 small tweaks 2015-11-21 22:55:20 -05:00
Andreas Fischer
1021eb3ab1 Merge pull request #875 from bantu/travis-status-image-update-1.0
README: Use the svg Travis image

* bantu/travis-status-image-update-1.0:
  README: Use the svg Travis image
2015-11-19 09:36:44 +01:00
Kevin Ji
e9e5c412ad README: Use the svg Travis image 2015-11-19 09:22:46 +01:00
Andreas Fischer
8abb069478 Merge pull request #865 from terrafrost/rsa-pkcs8-fix
RSA: PKCS8 constant fix for 1.0 branch

* terrafrost/rsa-pkcs8-fix:
  RSA: fix issue with loading PKCS8 specific keys
  Tests/RSA: add unit test for loading PKCS8 specific keys
2015-11-10 10:04:31 +01:00
Andreas Fischer
0f7ec36e3e Merge pull request #863 from mmcev106/composer_test_message_1.0
Removed the deprecated "--dev" argument from the recommended composer…

* mmcev106/composer_test_message_1.0:
  Removed the deprecated "--dev" argument from the recommended composer command.  When that argument is specified, composer prints the following:
2015-11-10 09:45:42 +01:00
terrafrost
7339112e10 RSA: fix issue with loading PKCS8 specific keys 2015-11-09 22:53:50 -06:00
terrafrost
e8d75b2e8d Tests/RSA: add unit test for loading PKCS8 specific keys 2015-11-09 22:10:08 -06:00
Mark McEver
c1659a5842 Removed the deprecated "--dev" argument from the recommended composer command. When that argument is specified, composer prints the following:
You are using the deprecated option "dev". Dev packages are installed by default now.
2015-11-08 09:30:22 -06:00
terrafrost
46bb95a265 X509: improve base64-encoded detection rules 2015-10-22 09:45:40 -05:00
Andreas Fischer
dd34eb1c30 Merge pull request #852 from bantu/sftp-chmod-realpath
Fix SFTP::chmod not using realpath on the filepath

* bantu/sftp-chmod-realpath:
  Add test case for GitHub Issue 850: Realpath in SFTP chmod().
  Fixed a bug in SFTP::chmod not using realpath on the filepath
2015-10-19 00:19:07 +02:00
Andreas Fischer
579e51c58f Add test case for GitHub Issue 850: Realpath in SFTP chmod(). 2015-10-19 00:07:55 +02:00
Bob4ever
b67c690498 Fixed a bug in SFTP::chmod not using realpath on the filepath 2015-10-19 00:05:02 +02:00
terrafrost
5321b9b610 Merge branch 'phpdoc-1.0' into 1.0
Conflicts:
	phpseclib/Crypt/Base.php
	phpseclib/Crypt/DES.php
	phpseclib/Crypt/Rijndael.php
2015-10-13 08:52:52 -05:00
terrafrost
666092c889 Merge branch 'getkeylength' into 1.0 2015-10-12 22:59:46 -05:00
terrafrost
5f1ff099da Crypt/Base: one more cs update 2015-10-12 22:52:56 -05:00
terrafrost
2048a49aac use self:: in phpdoc comments to reduce merge conflicts 2015-10-11 12:22:07 -05:00
terrafrost
19229ed224 phpDoc changes 2015-10-05 13:22:51 -05:00
terrafrost
d91158f6ef rename key_size -> key_length 2015-10-04 21:06:17 -05:00
terrafrost
27034825f3 cs changes per bantu 2015-10-04 16:29:48 -05: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
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
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
terrafrost
8691035228 Crypt/Base: add getBlockLength() method 2015-09-24 09:29:00 -05:00
terrafrost
bfba3db1a7 Crypt: make it so the key length can be explicitly set for all ciphers 2015-09-20 12:24:06 -05: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
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
783a07fecd Fixed readme links 2015-09-15 17:28:41 +01: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
833da775b6 BigInteger: fix PHP7 error
$x = gmp_init(6); empty($x); demonstrates the problem
2015-09-13 19:13:31 -05: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
Graham Campbell
010c1285ba Fixed another case 2015-09-06 23:05:41 +01:00