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
Andreas Fischer
618215dd0d
Merge branch '2.0'
...
* 2.0:
Backport to 2.0: Add PHP7 to Travis CI.
Remove duplicate allow_failures section
Test on PHP 7 & allow failures
Coding standards fix
Switch from EngineException to Error
Remove string assignment
Use random_bytes() when appropriate.
2015-09-02 20:38:11 +02:00
Andreas Fischer
9691924b31
Merge pull request #794 from cweagans/php7-random-bytes-2.0
...
Use random_bytes() when appropriate (2.0)
* cweagans/php7-random-bytes-2.0:
Remove duplicate allow_failures section
Test on PHP 7 & allow failures
Coding standards fix
Switch from EngineException to Error
Remove string assignment
Use random_bytes() when appropriate.
2015-09-02 20:38:02 +02:00
Andreas Fischer
79e90801bc
Merge pull request #805 from bantu/travis-php-7.0-2.0
...
Backport to 2.0: Add PHP7 to Travis CI.
* bantu/travis-php-7.0-2.0:
Backport to 2.0: Add PHP7 to Travis CI.
2015-09-02 20:37:56 +02:00
Andreas Fischer
1b93e0bf38
Backport to 2.0: Add PHP7 to Travis CI.
...
Cherry pick of 2813e2cd3b
2015-09-02 20:26:11 +02:00
Andreas Fischer
19d93fe76c
Merge branch '2.0'
...
* 2.0:
X509: updates to getOID() as suggested by bantu
X509: add getOID() method
2015-09-02 15:06:40 +02:00
Andreas Fischer
9fbc0358bb
Merge branch '1.0' into 2.0
...
* 1.0:
X509: updates to getOID() as suggested by bantu
X509: add getOID() method
2015-09-02 15:06:35 +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
6433a10fa5
Merge pull request #787 from torinaki/remove-global-and-earn-25$
...
Connection reuse refactoring to rid of globals
* torinaki/remove-global-and-earn-25$:
Connection reuse refactoring to rid of globals
2015-09-02 15:04:52 +02:00
Andreas Fischer
07dd7955c4
Merge branch '1.0' into 2.0
...
* 1.0:
Test on php 5.5.9 too
2015-09-02 14:52:44 +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
Andreas Fischer
3194cbdc17
Merge branch '2.0'
...
* 2.0:
Test on php 5.5.9 too
2015-09-02 14:52:44 +02:00
Graham Campbell
7cd45e5e1b
Fixed lots of phpdoc typos
2015-09-02 00:44:55 +01:00
Graham Campbell
2be0506514
Fixed invalid param phpdoc
2015-09-02 00:44:39 +01:00
Graham Campbell
634c1c2a18
Fixed lots of phpdoc typos
2015-09-02 00:42:15 +01:00
Graham Campbell
c08c099c56
Fixed invalid param phpdoc
2015-09-02 00:41:38 +01: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
2939322826
Remove duplicate allow_failures section
2015-09-01 15:08:20 -04:00
Cameron Eagans
465d1d975c
Test on PHP 7 & allow failures
2015-09-01 15:02:58 -04:00
Cameron Eagans
8a5dc21835
Coding standards fix
2015-09-01 15:00:57 -04:00
Cameron Eagans
bbbfc1795d
Switch from EngineException to Error
2015-09-01 14:56:06 -04:00
Cameron Eagans
08025c134d
Remove string assignment
2015-09-01 14:53:45 -04:00
Dmitry Balabka
70dd67c4d9
Connection reuse refactoring to rid of globals
2015-09-01 21:50:30 +03:00
Cameron Eagans
5a5edc7798
Use random_bytes() when appropriate.
2015-09-01 14:49:32 -04:00
Andreas Fischer
09769f60fb
Merge pull request #739 from terrafrost/exceptions-v1
...
Exception support
* terrafrost/exceptions-v1:
Exceptions: CS adjustment
SSH/Agent/Identity: replace user_error's with exceptions
SSH2: missed a few user_error's
SCP: replace user_error's with exceptions
SSH/Agent: replace user_error's with exceptions
SFTP: replace user_error's with exceptions
RSA: some of the exceptions being thrown weren't valid
SSH2: replace user_error's with exceptions
ASN1/X509: throw exceptions instead of user_errors
rm unused exception
RSA: replace user_error's with Exceptions
Random: replace user_error with exception
Crypt/Base: use the built-in spl exceptions instead
Exceptions: more CS adjustments
Exceptions: CS adjustment
Crypt/Base: add initial exception support
2015-09-01 20:45:53 +02:00
Cameron Eagans
2b75c37cc9
Convert most instances of function_exists() to extension_loaded() where applicable
2015-09-01 14:32:22 -04:00
Cameron Eagans
78bac871af
Remove conditions for PHP < 5.3.0 for this branch
2015-09-01 14:22:22 -04:00
Cameron Eagans
df6b201ab9
Switch to extension_loaded('gmp')
2015-09-01 14:22:17 -04:00
Cameron Eagans
a84699a346
Switch to extension_loaded instead of function_exists where it makes sense
2015-09-01 14:22:12 -04:00
terrafrost
c27f70c577
Exceptions: CS adjustment
2015-08-31 23:54:35 -05:00
terrafrost
2a8da097ae
Merge branch 'master' into exceptions-v1
...
Conflicts:
phpseclib/Net/SSH2.php
2015-08-31 23:47:12 -05:00
terrafrost
e399a320dc
SSH/Agent/Identity: replace user_error's with exceptions
2015-08-31 23:36:56 -05:00
terrafrost
724ba7ccc9
SSH2: missed a few user_error's
2015-08-31 23:34:33 -05:00
terrafrost
a6fd9ea8b6
SCP: replace user_error's with exceptions
2015-08-31 23:28:20 -05:00
terrafrost
2eb4ebf11c
SSH/Agent: replace user_error's with exceptions
2015-08-31 23:23:40 -05:00
terrafrost
2e46aec03a
SFTP: replace user_error's with exceptions
2015-08-31 23:12:33 -05:00
terrafrost
453e6fcf18
RSA: some of the exceptions being thrown weren't valid
2015-08-31 22:44:41 -05:00
