1
0
mirror of https://github.com/danog/phpseclib.git synced 2024-12-14 01:57:20 +01:00
Commit Graph

1791 Commits

Author SHA1 Message Date
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
Graham Campbell
b1db7f05d9 Minor tweaks 2015-09-06 23:01:03 +01:00
Graham Campbell
06a1d3d981 Fixed error 2015-09-06 22:19:34 +01:00
Graham Campbell
eec8c9cb5d More fixes 2015-09-06 12:39:14 +01:00
Graham Campbell
dd031a1702 PHPDoc fixes 2015-09-06 12:28:08 +01:00
Andreas Fischer
4f11a517bf Merge pull request #808 from lem9/1.0
Typo in variable name

* lem9/1.0:
  Typo in variable name
2015-09-05 18:14:02 +02:00
Marc Delisle
01e7c65f07 Typo in variable name 2015-09-05 12:13:11 -04:00
Andreas Fischer
e08e2fd300 Merge pull request #791 from cweagans/switch-to-extension-loaded-1.0
Switch to extension loaded (1.0)

* cweagans/switch-to-extension-loaded-1.0:
  Remove unnecessary parens
  Convert most instances of function_exists() to extension_loaded() where applicable
2015-09-04 15:04:17 +02:00
Cameron Eagans
8206061a30 Remove unnecessary parens 2015-09-02 15:22:37 -04:00
Andreas Fischer
e1bd0dfaf5 Merge pull request #801 from GrahamForks/1.0-phpdoc
[1.0] PHPDoc Fixes

* GrahamForks/1.0-phpdoc:
  Fixed lots of phpdoc typos
  Fixed invalid param phpdoc
2015-09-02 20:43:38 +02:00
Andreas Fischer
04e68212fe Merge pull request #789 from terrafrost/oid-changes
X509: add getOID() method

* terrafrost/oid-changes:
  X509: updates to getOID() as suggested by bantu
  X509: add getOID() method
2015-09-02 15:05:53 +02:00
Andreas Fischer
bdd6159d82 Merge pull request #797 from GrahamCampbell/patch-1
[1.0] Test on php 5.5.9 too

* GrahamCampbell/patch-1:
  Test on php 5.5.9 too
2015-09-02 14:52:44 +02:00
Graham Campbell
cd0e10cf9d Fixed lots of phpdoc typos 2015-09-02 00:37:54 +01:00
Graham Campbell
5890f3da98 Fixed invalid param phpdoc 2015-09-02 00:22:30 +01:00
Graham Campbell
429f08a4f4 Test on php 5.5.9 too 2015-09-01 23:12:58 +01:00
Cameron Eagans
2b75c37cc9 Convert most instances of function_exists() to extension_loaded() where applicable 2015-09-01 14:32:22 -04:00
terrafrost
abbee318cc X509: updates to getOID() as suggested by bantu 2015-08-31 15:20:38 -05:00
terrafrost
d7d9d782b0 X509: add getOID() method 2015-08-29 22:15:04 -05:00
Andreas Fischer
e391fdbd27 Merge pull request #772 from terrafrost/x509_unit_test
Tests/X509: add unit test showing need for return by reference

* terrafrost/x509_unit_test:
  Tests/X509: add unit test showing need for return by reference
2015-08-24 14:01:41 +02:00
Andreas Fischer
f7f93961a5 Merge pull request #780 from bantu/scrutinizer-comment-removal-travis-yml
.travis.yml: Remove outdated comment about .scrutinizer.yml

* bantu/scrutinizer-comment-removal-travis-yml:
  .travis.yml: Remove outdated comment about .scrutinizer.yml
2015-08-18 11:40:56 -04:00
Andreas Fischer
de896a7169 .travis.yml: Remove outdated comment about .scrutinizer.yml 2015-08-18 00:36:36 -04:00
Andreas Fischer
fe8fc0701b Merge pull request #769 from terrafrost/pss-fix
RSA: fix regression for PSS signatures

* terrafrost/pss-fix:
  Tests/RSA: add PSS test
  RSA: fix regression for PSS signatures
2015-08-13 14:34:43 -04:00
terrafrost
a56e0daf07 Tests/X509: add unit test showing need for return by reference 2015-08-13 10:22:01 -05:00