terrafrost
6bfbfdbf7e
Merge branch '1.0' into 2.0
2016-03-19 12:23:04 -05:00
terrafrost
56acb6723c
Tests/BigInteger: add unit test for abhishektaneja's sliding window fix
2016-03-19 12:06:12 -05:00
terrafrost
574d36fb7d
Merge branch 'cipher-revamp'
2016-03-14 23:00:21 -05:00
terrafrost
ea7d647612
Merge branch 'cipher-revamp'
2016-03-14 22:42:51 -05:00
terrafrost
ac8960d049
Merge branch '2.0'
2016-03-02 10:13:28 -06:00
terrafrost
e666562569
Merge branch '1.0' into 2.0
2016-03-02 10:13:15 -06:00
terrafrost
da36b5c91e
RC2: fix issue with decrypting
2016-03-01 16:30:36 -06:00
terrafrost
7558f097c0
Tests/AES: update newest unit test
2016-02-20 21:44:39 -06:00
terrafrost
ae1e5c13f9
Merge branch 'master' into cipher-revamp
2016-02-20 21:44:00 -06:00
terrafrost
1e50a102ac
Merge branch '2.0'
2016-02-20 14:16:06 -06:00
terrafrost
b566fcaeee
Tests/AES: Crypt_AES -> AES
2016-02-20 14:15:57 -06:00
terrafrost
82ab57e14c
Merge branch '2.0'
2016-02-19 15:19:30 -06:00
terrafrost
6d3c04ef4d
Merge branch '1.0' into 2.0
2016-02-19 15:19:20 -06:00
terrafrost
b69fa7f2a9
Merge branch '2.0'
2016-02-07 11:54:16 -06:00
terrafrost
b972a4b36d
Tests/AES: add unit test for continuous mode
2016-02-05 23:29:20 -06:00
terrafrost
e74841477f
Crypt: become a lot less tolerant of bad parameters
2016-02-03 08:56:25 -06:00
terrafrost
73a4221988
Crypt: become a lot less tolerant of bad parameters
2016-01-31 12:37:38 -06:00
metaclassing
88a04862ae
Added unit test for IPv4 and IPv6 address decoding in X509v3 subject alternative names extended attribute
2016-01-27 05:13:47 -06:00
terrafrost
977a4ebeaa
Merge pull request #925 from terrafrost/rsa-revamp-part-3
...
RSA: error out when encrypting strings that are too long
2016-01-21 10:20:53 -06:00
terrafrost
d5a868ed4f
Crypt/Base: throw an exception if an IV is required but not defined
2016-01-17 11:48:07 -06:00
terrafrost
5d85d5eca1
RSA: error out when encrypting strings that are too long
2016-01-17 09:45:13 -06:00
terrafrost
ad4c3670d3
Merge branch 'biginteger-revamp'
2016-01-16 22:59:19 -06:00
terrafrost
f8dc527af5
Merge branch 'master' into biginteger-revamp
2016-01-08 10:43:49 -06:00
terrafrost
232880b0d9
Merge branch '2.0'
2016-01-08 10:43:11 -06:00
terrafrost
1e15ef5a55
Merge branch 'bitwise-not-1.0' into 2.0
2016-01-08 10:42:20 -06:00
terrafrost
7ad9eade2d
BigInteger: fix issue with doing bitwise not on 0
2016-01-08 10:31:48 -06:00
terrafrost
f7efbcbc8e
BigInteger: updates per Joey3000
2016-01-08 10:19:48 -06:00
terrafrost
d86c61de78
BigInteger: add getprecision
2016-01-03 10:42:44 -06:00
terrafrost
a0d21b6321
BigInteger: make select methods static, add type hinting, etc
2015-12-27 10:24:17 -06:00
terrafrost
806249c7e9
RSA: changes to how encryption / signatures work
2015-12-25 11:28:24 -06:00
terrafrost
adf6ea07e8
Merge branch '2.0'
2015-12-14 13:28:50 -06:00
terrafrost
89af727f32
Merge branch '1.0' into 2.0
2015-12-14 13:28:10 -06:00
terrafrost
cae579a19b
Tests/BigInteger: update testDebugInfo test
2015-12-14 13:26:56 -06:00
terrafrost
9f529623da
Merge branch '2.0'
2015-12-14 13:03:24 -06:00
terrafrost
2d2f359300
Tests/BigInteger: fix for 2.0 branch
2015-12-14 13:03:07 -06:00
terrafrost
786cecf309
Merge branch '1.0' into identifier-update-1.0
2015-12-14 11:07:42 -06:00
terrafrost
b86497d298
Merge branch '2.0'
2015-12-14 11:02:14 -06:00
terrafrost
8448f63d76
Merge branch '1.0' into 2.0
2015-12-14 11:01:51 -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
Andreas Fischer
9f0f8fd7e5
Correct indentation on pvno array definition.
2015-12-05 10:33:28 -06:00
Andreas Fischer
27bf47e7a4
Merge branch '2.0'
...
* 2.0:
Correct indentation on pvno array definition.
2015-12-01 10:06:20 +01:00
Andreas Fischer
694579617e
Merge branch '1.0' into 2.0
...
* 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
3793f34876
Merge branch '2.0'
...
* 2.0:
RSA: fix issue with loading PKCS8 specific keys
Tests/RSA: add unit test for loading PKCS8 specific keys
2015-11-10 10:13:32 +01:00
terrafrost
c34be16c3a
Merge branch 'rsa-pkcs8-fix' into rsa-pkcs8-fix-2.0
...
Conflicts:
phpseclib/Crypt/RSA.php
2015-11-09 23:10:21 -06:00
terrafrost
e8d75b2e8d
Tests/RSA: add unit test for loading PKCS8 specific keys
2015-11-09 22:10:08 -06:00
terrafrost
43165d976c
RSA: changes to OpenSSH and PuTTY plugins
2015-10-24 15:54:34 -05:00
terrafrost
7b1b7c22e2
RSA: throw an exception if the modulo is too small
2015-10-23 13:45:35 -05:00
terrafrost
1522e6606b
RSA: add getSupportedFormats() and getLoadedFormat()
2015-10-22 10:57:05 -05:00
terrafrost
efe36d67ce
Merge branch 'master' into rsa-plugins
...
Conflicts:
phpseclib/Crypt/RSA.php
2015-10-22 10:16:52 -05:00
terrafrost
33bf6e42c3
Merge branch '2.0'
2015-10-22 10:14:50 -05:00
terrafrost
96dd14fd6f
Merge branch 'extractber-fix' into extractber-fix-2.0
...
Conflicts:
phpseclib/File/X509.php
2015-10-22 09:56:07 -05:00
terrafrost
46bb95a265
X509: improve base64-encoded detection rules
2015-10-22 09:45:40 -05:00
terrafrost
e2fcd9d951
RSA: misc fixes to select plugins
2015-10-21 21:24:12 -05:00
terrafrost
6eb5ea3ef7
RSA: add support for the microsoft BLOB key format
2015-10-20 23:17:11 -05:00
terrafrost
ad55d3cd75
RSA: fixes to last non-merge commit
2015-10-16 14:04:17 -05:00
terrafrost
31c14063fa
RSA: updates to raw plugin
2015-10-16 09:36:49 -05:00
terrafrost
177b52088d
Merge branch '2.0'
2015-10-12 23:10:15 -05:00
terrafrost
cfcf554531
RSA: changes to putty plugin and rm comment methods from rsa etc
2015-10-01 23:11:55 -05:00
terrafrost
fb22529c44
Tests/RSA: add unit test for new functionality
2015-10-01 20:11:11 -05:00
terrafrost
91887c957d
Merge remote-tracking branch 'upstream/master' into rsa-plugins
...
Conflicts:
phpseclib/Crypt/RSA.php
phpseclib/Net/SSH2.php
2015-10-01 15:57:31 -05:00
terrafrost
ec3fe7277b
RSA: move key format handling to plugins
2015-10-01 15:41:11 -05:00
terrafrost
fab5a66fe5
RSA: make createKey static and make it return RSA objects
2015-09-24 09:43:19 -05:00
terrafrost
604dddc82b
Merge branch 'getkeylength' into getkeylength-2.0-2
...
Conflicts:
phpseclib/Crypt/Blowfish.php
phpseclib/Crypt/DES.php
phpseclib/Crypt/RC2.php
phpseclib/Crypt/RC4.php
phpseclib/Crypt/Rijndael.php
phpseclib/Crypt/TripleDES.php
phpseclib/Crypt/Twofish.php
2015-09-22 21:26: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
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
Andreas Fischer
5b6642ae37
Hash: Cover remaining uncovered line.
2015-09-14 01:34:20 +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
06a4cc5eba
Slightly rework of HashTest.php.
2015-09-07 19:32:58 +02: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
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
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
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
Dmitry Balabka
70dd67c4d9
Connection reuse refactoring to rid of globals
2015-09-01 21:50:30 +03: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
a84699a346
Switch to extension_loaded instead of function_exists where it makes sense
2015-09-01 14:22:12 -04:00
terrafrost
d7d9d782b0
X509: add getOID() method
2015-08-29 22:15:04 -05:00
Andreas Fischer
0f1d043428
Merge branch '1.0' into 2.0
...
* 1.0:
Tests/X509: add unit test showing need for return by reference
2015-08-24 14:02:39 +02: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
785b37b505
Remove include statement from BigInteger TestCase.
...
This was previously required to load MATH_BIGINTEGER_MODE_* constants, but
these are autoloadable via \phpseclib\Math\BigInteger::MODE_* now and the
include path was removed.
2015-08-13 15:12:20 -04:00
Andreas Fischer
54a1aeeefe
Merge branch '1.0' into 2.0
...
* 1.0:
Tests/RSA: add PSS test
RSA: fix regression for PSS signatures
2015-08-13 14:37:15 -04:00
terrafrost
a56e0daf07
Tests/X509: add unit test showing need for return by reference
2015-08-13 10:22:01 -05:00
terrafrost
f591962fc4
Tests/RSA: add PSS test
2015-08-11 11:47:19 -05:00
Andreas Fischer
58f8affcad
SSH2: Add support for curve25519-sha256@libssh.org.txt via libsodium-php.
2015-07-27 22:58:59 +02:00
Andreas Fischer
d9e9504fba
Merge branch 'PSR2-1.0' into PSR2-2.0
...
* PSR2-1.0:
Fix indentation phpcbf did not fix.
Remove PSR2.Methods.FunctionCallSignature.SpaceAfterOpenBracket exception.
Use phpcbf to fix PHP code to ruleset.
Ignore coding guidelines in ANSI switch block.
Base code sniffer ruleset on PSR2 rather than PEAR.
Update PHP Code Sniffer to 2.3.3
Conflicts:
build/code-sniffer-ruleset-tests.xml
build/code-sniffer-ruleset.xml
composer.lock
phpseclib/Crypt/DES.php
phpseclib/Crypt/Hash.php
phpseclib/Crypt/RSA.php
phpseclib/File/X509.php
phpseclib/Math/BigInteger.php
phpseclib/Net/SFTP.php
phpseclib/Net/SSH1.php
phpseclib/Net/SSH2.php
tests/Functional/Net/SFTPUserStoryTest.php
tests/Unit/Crypt/TwofishTest.php
2015-07-17 13:41:59 +02:00
Andreas Fischer
5eb205b237
Remove PSR2.Methods.FunctionCallSignature.SpaceAfterOpenBracket exception.
2015-07-17 12:57:41 +02:00
Andreas Fischer
2013a31ecd
Use phpcbf to fix PHP code to ruleset.
2015-07-17 12:57:41 +02:00
Andreas Fischer
483c253879
Merge branch '1.0' into 2.0
...
* 1.0:
X509: set one more parameter to null
X509: set another parameters field to null
2015-06-30 12:27:06 +02:00
terrafrost
77c757d095
X509: set one more parameter to null
2015-06-29 22:10:18 -05:00
terrafrost
6c2798be90
X509: set another parameters field to null
2015-06-29 21:53:27 -05:00
terrafrost
815f443ed1
Merge branch 'x509-rsa-null-1.0' into x509-rsa-null-2.0-2
...
Conflicts:
tests/Unit/File/X509/X509Test.php
2015-06-28 16:10:40 -05:00
terrafrost
2c8cb0b426
Tests/X509: CS adjustments
2015-06-28 14:52:07 -05:00
terrafrost
2277c0fbac
Tests/X509: typo
2015-06-28 11:40:34 -05:00