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
Andreas Fischer
06a4cc5eba
Slightly rework of HashTest.php.
2015-09-07 19:32:58 +02:00
Andreas Fischer
150065fb9c
Merge pull request #811 from terrafrost/hash-rewrite
...
Hash: rm internal and mhash support (5.3 has hash ext built-in)
* terrafrost/hash-rewrite:
Tests/Hash: tiger is buggy in PHP 5.3
Hash: rm internal and mhash implementations (5.3 has hash built in)
2015-09-07 19:08:24 +02:00
Andreas Fischer
ef3d0a8ed0
Merge pull request #806 from metaclassing/sshv1-exceptions
...
Exception support for SSHv1
* metaclassing/sshv1-exceptions:
I misinterpreted the meaning of === true and messed up quotes on one throw
Tried to replicate SSHv2 exception support into SSHv1
2015-09-07 00:39:26 +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
terrafrost
57d5081948
Tests/Hash: tiger is buggy in PHP 5.3
2015-09-06 09:16:18 -05:00
terrafrost
d76ae873ac
Hash: rm internal and mhash implementations (5.3 has hash built in)
2015-09-06 07:55:33 -05: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
70dc4448f7
Merge branch '2.0'
...
* 2.0:
Typo in variable name
2015-09-05 18:14:04 +02:00
Andreas Fischer
09ac065459
Merge branch '1.0' into 2.0
...
* 1.0:
Typo in variable name
2015-09-05 18:14:03 +02: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
metaclassing
029228b3fe
I misinterpreted the meaning of === true and messed up quotes on one throw
2015-09-04 14:20:51 -05:00
metaclassing
2b5c2eb9ab
Tried to replicate SSHv2 exception support into SSHv1
2015-09-04 14:13:16 -05:00
Andreas Fischer
0deae03dca
Merge branch '2.0'
...
* 2.0:
Remove unnecessary parens
Convert most instances of function_exists() to extension_loaded() where applicable
Remove conditions for PHP < 5.3.0 for this branch
Switch to extension_loaded('gmp')
Switch to extension_loaded instead of function_exists where it makes sense
2015-09-04 15:05:50 +02:00
Andreas Fischer
864493bbf6
Merge pull request #790 from cweagans/switch-to-extension-loaded-2.0
...
Switch to extension loaded (2.0)
* cweagans/switch-to-extension-loaded-2.0:
Remove conditions for PHP < 5.3.0 for this branch
Switch to extension_loaded('gmp')
Switch to extension_loaded instead of function_exists where it makes sense
2015-09-04 15:05:40 +02:00
Andreas Fischer
5cfa3a584e
Merge branch '1.0' into 2.0
...
* 1.0:
Remove unnecessary parens
Convert most instances of function_exists() to extension_loaded() where applicable
Conflicts:
phpseclib/Crypt/Random.php
phpseclib/Math/BigInteger.php
2015-09-04 15:05:22 +02: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
ed6f754137
Merge pull request #803 from GrahamForks/phpdoc
...
[3.0] PHPDoc Fixes
* GrahamForks/phpdoc:
Fixed lots of phpdoc typos
Fixed invalid param phpdoc
2015-09-02 20:49:05 +02:00
Andreas Fischer
d1f6df7594
Merge branch '2.0'
...
* 2.0:
Fixed lots of phpdoc typos
Fixed invalid param phpdoc
Fixed lots of phpdoc typos
Fixed invalid param phpdoc
Conflicts:
phpseclib/Crypt/Base.php
phpseclib/Crypt/RSA.php
phpseclib/Crypt/Random.php
phpseclib/File/ASN1.php
phpseclib/File/X509.php
phpseclib/Net/SCP.php
phpseclib/Net/SFTP.php
phpseclib/Net/SSH2.php
phpseclib/System/SSH/Agent.php
phpseclib/System/SSH/Agent/Identity.php
2015-09-02 20:48:52 +02:00
Andreas Fischer
40927a4033
Merge pull request #802 from GrahamForks/2.0-phpdoc
...
[2.0] PHPDoc Fixes
* GrahamForks/2.0-phpdoc:
Fixed lots of phpdoc typos
Fixed invalid param phpdoc
2015-09-02 20:47:45 +02:00
Andreas Fischer
1aa911d4a3
Merge branch '1.0' into 2.0
...
* 1.0:
Fixed lots of phpdoc typos
Fixed invalid param phpdoc
Conflicts:
phpseclib/Crypt/AES.php
phpseclib/Crypt/Base.php
phpseclib/Crypt/Blowfish.php
phpseclib/Crypt/DES.php
phpseclib/Crypt/Hash.php
phpseclib/Crypt/RC2.php
phpseclib/Crypt/RC4.php
phpseclib/Crypt/RSA.php
phpseclib/Crypt/Random.php
phpseclib/Crypt/Rijndael.php
phpseclib/Crypt/TripleDES.php
phpseclib/Crypt/Twofish.php
phpseclib/File/ASN1.php
phpseclib/File/X509.php
phpseclib/Math/BigInteger.php
phpseclib/Net/SCP.php
phpseclib/Net/SFTP.php
phpseclib/Net/SSH1.php
phpseclib/Net/SSH2.php
phpseclib/System/SSH/Agent.php
2015-09-02 20:47:28 +02: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
