danog/tgseclib
1
0
Fork 0
mirror of https://github.com/danog/tgseclib.git synced 2024-12-04 02:27:52 +01:00
Code Issues Projects Releases Wiki Activity
3,451 Commits 1 Branch 21 Tags 11 MiB
eddbdcc66c
Commit Graph

772 Commits

Author SHA1 Message Date
terrafrost
1630a6710d RSA/DSA: support XML keys with XML declarations 2017-06-26 21:58:20 -05:00
terrafrost
62a8047fa1 Hash: use hash extension for sha512/224 & sha512/256 on PHP 7.1+ 2017-06-26 21:45:29 -05:00
Matej Kravjar
47c419545a Fixed #632 Fatal error: Cannot access self:: when no class scope is active 2017-06-20 12:43:42 +02:00
terrafrost
6ca7323401 Merge branch '2.0' 2017-05-29 06:33:24 -05:00
terrafrost
a4cd384bab Merge branch '1.0' into 2.0 2017-05-29 06:32:23 -05:00
terrafrost
a451dd69f8 RSA: reset variables if bad key was loaded 2017-05-29 06:31:54 -05:00
terrafrost
e9d21367fa Merge branch '1.0' into 2.0 2017-05-28 09:57:45 -05:00
terrafrost
228b60cfe5 Random: suppress E_DEPRECATED errors 2017-05-28 09:53:02 -05:00
terrafrost
085d5ed495 Merge branch '2.0-crypt-fix-old-openssl' 2017-05-13 23:24:53 -05:00
terrafrost
9fc9d2fa19 Merge branch 'crypt-fix-old-openssl' into 2.0 2017-05-13 23:21:14 -05:00
terrafrost
a983412ea9 Crypt: fix OpenSSL engine on <= PHP 5.3.6 2017-05-13 23:18:42 -05:00
terrafrost
4a069f7c85 rm redundant files 2017-04-15 19:35:07 -05:00
terrafrost
42def63b00 Merge remote-tracking branch 'upstream/master' into dsa-test-2 2017-02-02 21:07:47 -05:00
terrafrost
ab1da5ac1f Merge pull request #1084 from terrafrost/php5-updates 
PHP5 updates for master branch
 2017-02-02 21:03:07 -05:00
terrafrost
eb459daeaf add DSA implementation 2017-02-02 20:20:47 -05:00
terrafrost
7d2e44b430 Merge branch '2.0' 2017-01-27 12:40:23 -06:00
terrafrost
ac2b7ef76c Merge branch '1.0' into 2.0 2017-01-27 12:17:04 -06:00
terrafrost
1bde98fc42 Crypt: OpenSSL apparently supports variable size keys 2017-01-27 11:20:22 -06:00
terrafrost
9ae5206588 RSA: setEngine -> setPreferredEngine (make it like SymmetricKey) 2016-12-11 09:59:50 -06:00
terrafrost
1dfd315725 RSA: use public / private / protected 2016-12-10 19:09:54 -06:00
terrafrost
813b85b5b2 Crypt: define visibility for more variables / methods 2016-12-09 16:46:01 -06:00
terrafrost
067c1882e5 SymmetricCiphers: rm some redundant methods / variables 2016-12-09 15:51:31 -06:00
terrafrost
d34a911402 SymmetricCiphers: don't cache "hi-optimized code" 
Also add a new engine - ENGINE_EVAL. Previously ENGINE_INTERNAL
had three different modes - a "hi-optimized" version, a
"lo-optimized" version and a version that didn't depend on
create_function and there wasn't a way to really isolate these
modes and test them individually.
 2016-12-08 09:20:19 -06:00
terrafrost
2a1177b256 SymmetricCiphers: add public / private / protected as appropriate 2016-12-07 22:19:20 -06:00
terrafrost
c852bae3c8 use short array syntax for arrays 2016-11-30 21:29:38 -06:00
terrafrost
7182ec393b make classes with only static methods abstract 2016-11-30 09:25:04 -06:00
terrafrost
370fbec300 ASN1: don't require octet / bit strings be base64-encoded 2016-11-28 20:51:21 -06:00
terrafrost
874ada8d93 ASN1: make methods static 2016-11-27 22:38:11 -06:00
terrafrost
df6d55fd97 ASN1: move ASN1 maps to external files for reuse 2016-11-22 23:56:07 -06:00
terrafrost
99a2127856 Hash: fix E_NOTICE with PHP4-style constructor 2016-11-17 20:54:38 -06:00
terrafrost
863ff6789b RSA: refactor PKCS1/PKCS8 to facilitate re-use 2016-11-17 08:09:10 -06:00
terrafrost
88e58c75d0 don't go out of our way to support < PHP 5.3 
...not when phpseclib 2.0 requires PHP 5.3+
 2016-10-02 22:07:33 -05:00
terrafrost
7ae4ea3e71 Merge branch '1.0' into 2.0 2016-10-02 21:56:59 -05:00
terrafrost
3c149e0e6a Merge branch '1.0-32bit-fixes' into 1.0 2016-10-02 21:39:16 -05:00
terrafrost
711079764e Merge branch '2.0' 2016-10-02 08:18:16 -05:00
terrafrost
42f5399960 Crypt/Base: fix bad merge 2016-10-02 08:09:54 -05:00
terrafrost
42fb96db16 fix float to int conversions on 32-bit linux PHP < 5.3 installs 2016-10-02 03:37:23 -05:00
terrafrost
3205c95177 Merge branch '1.0' into 2.0 2016-10-01 20:05:16 -05:00
terrafrost
d68975117c RC2: rm empty constructor 2016-09-23 21:55:26 -05:00
terrafrost
640f10609f fix PHP 7.1 compatibility errors 2016-09-21 01:21:54 -05:00
terrafrost
8019baee62 BigInteger: add randomRange / randomPrimeRange 
...and redo random / randomPrime such that they take the byte size
as the parameter instead of the range.
 2016-09-17 19:48:51 -07:00
terrafrost
c17a2604a0 Merge branch 'master-reorg' 2016-09-17 09:15:11 -07:00
terrafrost
845135f887 add PHP5-style constructors along side PHP4-style ones 2016-09-10 10:41:05 -07:00
terrafrost
47faa5736e RSA/PKCS8: CS adjustment 2016-08-18 14:53:21 -05:00
terrafrost
8b4ead6aef Merge branch 'master' of https://github.com/phpseclib/phpseclib 2016-08-18 13:49:28 -05:00
terrafrost
12f70270cd fix bad cherry pick 2016-08-04 01:06:52 -05:00
terrafrost
676c1982c7 fix bad merge 2016-08-04 01:04:00 -05:00
klemens
dd23d91d41 spelling fixes 2016-08-04 00:47:52 -05:00
terrafrost
c547ee16c7 Merge branch '1.0' into 2.0 2016-08-04 00:31:15 -05:00
klemens
dca95ac662 spelling fixes 2016-08-04 00:19:27 -05:00
terrafrost
d64599f799 Move _encodeLength and _decodeLength to Common\Functions\ASN1.php 2016-07-31 09:37:13 -05:00
terrafrost
c509909004 Organizational Revamp 
- rename \phpseclib\Crypt\Base to \phpseclib\Crypt\Common\SymmetricKey
- create BlockCipher and StreamCipher to extend SymmetricKey
- replace _string_shift with \phpseclib\Common\Functions\Strings::shift
 2016-07-30 22:18:06 -05:00
terrafrost
ec62e5d9f5 RSA: update PKCS1/8 comments 2016-07-28 22:14:37 -05:00
terrafrost
c12500cace RSA: code cleanup 2016-07-28 13:08:47 -05:00
terrafrost
caa7eed299 Merge branch '2.0' 2016-07-28 11:00:33 -05:00
terrafrost
eff01fba0e RSA: update phpdoc for 2.0 branch 2016-07-28 11:00:16 -05:00
terrafrost
61d0326bb6 Merge branch '1.0' into 2.0 2016-07-28 10:59:37 -05:00
terrafrost
b9f072bf03 RSA: phpdoc updates 2016-07-28 10:58:27 -05:00
terrafrost
c788ec574f Hash: CS adjustment 2016-06-22 10:10:32 -05:00
terrafrost
1e7bfe75b1 Tests/RSA: fix bad merge 2016-06-22 09:47:56 -05:00
terrafrost
4516227f13 Merge branch '2.0' 2016-06-21 22:55:33 -05:00
terrafrost
b08f17f514 Merge branch '1.0' into 2.0 2016-06-21 22:39:05 -05:00
andrewbelcher
dd754283bb Fix zero salt length RSA signatures. 2016-06-21 22:33:47 -05:00
terrafrost
1c4fe6b5ba Merge branch 'unsupported-hash-update' 2016-06-19 19:47:04 -05:00
terrafrost
7bdb09c4bd Merge branch '1.0' into 2.0 2016-06-18 23:29:33 -05:00
terrafrost
6ff421d354 BigInteger/RSA: don't compare openssl versions > 1.0 2016-06-18 23:28:33 -05:00
terrafrost
7a628c62b0 don't do phpinfo() check 2016-06-11 20:29:02 -05:00
terrafrost
e64a55955f Crypt/Base: trie -> true 2016-06-05 11:28:28 -05:00
terrafrost
fc2a7cef20 RSA: adjustments for master branch 2016-06-04 23:46:40 -05:00
terrafrost
39913e1248 Merge branch 'master' of https://github.com/phpseclib/phpseclib 2016-06-04 22:58:32 -05:00
terrafrost
6b66c1cd52 Merge branch '2.0' 2016-06-04 22:56:55 -05:00
terrafrost
87040bc518 Merge branch '1.0' into 2.0 2016-06-04 22:56:49 -05:00
terrafrost
e2a0b701c7 remove a few calls to paragonie/constant_time_encoding 
- Hex::decode('aabb') can be replaced with "\xaa\xbb"
- Hex::decode(sha1('...')) can be replaced with sha1('...', true)
 2016-06-04 22:31:23 -05:00
terrafrost
48fef11389 Merge branch 'cte' 2016-05-21 17:34:05 -05:00
Paragon Initiative Enterprises
adcbecae78 Use paragonie/constant_time_encoding 2016-05-21 12:57:53 -05:00
Paragon Initiative Enterprises
0e8fa93676 Use paragonie/constant_time_encoding 2016-05-12 16:28:40 -04:00
terrafrost
942d194d0a RSA: don't attempt to use the CRT when zero value components exist 2016-05-09 13:46:28 -05:00
terrafrost
c784d9e1e5 reapply PR #931 2016-05-08 01:34:37 -05:00
terrafrost
1f138916fa Merge branch '2.0' 2016-05-07 02:40:04 -05:00
terrafrost
a3d3dbd957 Merge branch '1.0' into 2.0 2016-05-07 02:39:17 -05:00
terrafrost
bf31e976c7 RSA: fix PHP4 compatability issue 2016-05-06 22:18:12 -05:00
terrafrost
e4c4824ddb Hash: throw exceptions if hash isn't explicitly supported 2016-05-05 14:20:24 -05:00
terrafrost
8fb4c3363d undo merging of master to 2.0 branch 2016-04-28 15:34:10 -05:00
terrafrost
e40d6cc1cc Hash: small tweaks per Joey3000 2016-04-12 11:32:40 -05:00
terrafrost
b4cf10fc94 Revert "Merge branch '2.0'" 
This reverts commit be5f4ef6b19c82f6c898708cc8e1828b05e3d4e8, reversing
changes made to 638fe6971c.
 2016-04-10 11:30:59 -05:00
terrafrost
2cc5dcdc89 Merge branch '2.0' 2016-04-10 11:30:34 -05:00
terrafrost
4b69dcb1ca Revert "Merge remote-tracking branch 'bantu/bootstrap'" 
This reverts commit ef04c870e9, reversing
changes made to cd57bf31ae.
 2016-04-10 11:25:31 -05:00
terrafrost
638fe6971c Merge branch 'master' of https://github.com/phpseclib/phpseclib 2016-04-10 10:18:49 -05:00
terrafrost
7dffbfde04 RSA/OpenSSH: savePublicKey() method should have been static 2016-04-10 10:18:15 -05:00
terrafrost
263564a2ee Merge branch 'master' of https://github.com/phpseclib/phpseclib 2016-04-09 13:00:51 -05:00
terrafrost
272d447b65 Merge branch 'sha512/x' 2016-04-09 12:57:34 -05:00
terrafrost
86646fdf40 RSA: PKCS1 v2.2 also added sha224 2016-04-09 12:57:23 -05:00
terrafrost
9cf93a02b3 Merge branch '2.0' 2016-04-03 21:37:52 -05:00
terrafrost
a7f2a5d9c9 Merge branch '1.0' into 2.0 2016-04-03 21:34:45 -05:00
terrafrost
ac97ce5d69 RSA: backport macdabby's changes 2016-04-03 21:34:11 -05:00
terrafrost
3b37619279 Tests/RSA: add unit test for setPrivateKey 2016-04-03 21:16:37 -05:00
terrafrost
2a1ee1107a Merge remote-tracking branch 'macdabby/master' 2016-04-03 21:10:42 -05:00
Scott
b7218aee28 Update Random.php 2016-03-27 10:54:39 -04:00
Scott
827e42222e Update Random.php 2016-03-27 10:49:03 -04:00
DAB
89a73161cb set publicExponent to false instead of unsetting 2016-03-25 22:10:36 -05:00
Paragon Initiative Enterprises
1ca62c2c33 Use random_compat 2016-03-24 16:44:56 -04:00
terrafrost
be0aed43cf RSA: bring PKCS1 compliancy to v2.2 2016-03-24 13:38:51 -05:00
terrafrost
a757584630 Hash: add sha512/224 and sha512/256 2016-03-24 12:49:27 -05:00
terrafrost
23f237a743 Merge branch '2.0' 2016-03-18 16:37:02 -05:00
terrafrost
75dee927b9 Merge branch '1.0' into 2.0 2016-03-18 16:34:58 -05:00
terrafrost
d74bfb73e4 RC2: getKeyLength didn't always return key length 2016-03-18 16:34:22 -05:00
terrafrost
a4cb29ee97 Merge branch '1.0' into 2.0 2016-03-18 12:00:46 -05:00
terrafrost
123eee7150 RC4: key wasn't being truncated correctly 2016-03-18 12:00:41 -05:00
terrafrost
574d36fb7d Merge branch 'cipher-revamp' 2016-03-14 23:00:21 -05:00
terrafrost
fa88ed5ff4 Merge branch 'cipher-revamp' of https://github.com/terrafrost/phpseclib into cipher-revamp 2016-03-14 23:00:08 -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
698efd030a RSA: fix namespacing for caught exceptions 2016-02-20 23:54:19 -06:00
terrafrost
ae1e5c13f9 Merge branch 'master' into cipher-revamp 2016-02-20 21:44:00 -06:00
terrafrost
abed3b4c28 AES/Twofish: updates based on feedback 2016-02-20 20:01:52 -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
1e93192721 Merge branch 'continuous-buffer-1.0' into 1.0 2016-02-19 15:14:12 -06:00
terrafrost
554dea27dd Merge branch '2.0' 2016-02-19 06:33:48 -06:00
terrafrost
4f0d3e4128 Merge branch '1.0' into 2.0 2016-02-19 06:33:34 -06:00
Joey3000
94b669d7ed Reorder array checks 
Make sure that `if (isset($arr['__phpseclib_marker']))` is done on an array only.
 2016-02-16 20:45:05 +01:00
Joey3000
062aa41ba0 Fixing Uncaught Error: Cannot use object of type test as array 
Refs https://github.com/phpseclib/phpseclib/pull/934/files#r53035721
 2016-02-16 19:41:41 +01:00
terrafrost
6eb35eb42c Random: a few more tweaks 2016-02-16 09:45:04 -06:00
Joey3000
047f2617f1 Circular reference handling improvement 
Refs https://github.com/phpseclib/phpseclib/pull/934/files#r52838650

This does the following:

* Addresses the comments to 102d53bd27

* Fixes an "Allowed memory size of ... bytes exhausted" issue and simplifies the implementation, bringing it closer to the example in https://stackoverflow.com/questions/9042142/detecting-infinite-array-recursion-in-php/9293146#9293146
 2016-02-14 13:40:58 +01:00
terrafrost
102d53bd27 Random: fix for issues with serialize() 2016-02-14 00:44:03 -06:00
terrafrost
bfd467532b Crypt/Base: fix continuous mode in CBC / decryption / OpenSSL 2016-02-06 08:59:05 -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
terrafrost
750f7652c7 Merge remote-tracking branch 'joey3000/use_cleanup' 2016-01-25 17:00:30 -06:00
terrafrost
cd700ce8b3 Merge branch '2.0' 2016-01-25 16:58:48 -06:00
Joey3000
bdc28b9453 Cherry-picking cleanup of use operator usage 
Picked c9a80ff748 to the 2.0 branch and resolved conflicts.
 2016-01-21 19:41:41 +01: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
cea059e9dd Crypt/Base: updates to IV handling per Joey3000 2016-01-20 10:09:06 -06:00
Joey3000
c9a80ff748 Cleanup of use operator usage 
This does the following:

1. Removes superfluous usage of the `use` operator. Specifically, that operator is not needed to use classes in the same `namespace` as the object (see https://secure.php.net/manual/en/language.namespaces.rules.php).

2. While at it, also sorted the `use` operators alphabetically, for a better overview.
 2016-01-18 05:05:31 +01: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
6abbbfdfe3 RSA: change default key size to 2048 2016-01-08 13:58:06 -06:00
terrafrost
f7efbcbc8e BigInteger: updates per Joey3000 2016-01-08 10:19:48 -06:00
terrafrost
c85b356b18 RSA: more updates per Joey3000 2016-01-07 22:26:10 -06:00
terrafrost
d5a359b41e RSA: updates per Joey3000 2016-01-03 13:03:58 -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
1c9ee4ef28 RSA: fix PKCS8 key handling (again) 2015-12-07 23:53:09 -06:00
Andreas Fischer
466ad666b8 Merge branch '1.0' into 2.0 
* 1.0:
 2015-11-10 10:05:06 +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
7339112e10 RSA: fix issue with loading PKCS8 specific keys 2015-11-09 22:53:50 -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
a9705fdba7 Merge branch 'master' into rsa-plugins 
Conflicts:
	phpseclib/Crypt/RSA.php
 2015-10-16 10:01:18 -05:00
terrafrost
31c14063fa RSA: updates to raw plugin 2015-10-16 09:36:49 -05:00
terrafrost
04a8d784a5 Merge branch 'paragonie' 2015-10-14 10:11:38 -05:00
Scott
d899b7988d Update random_bytes() to conform to PHP7.0.0-RC3 
Fixes #843
 2015-10-14 10:07:11 -05:00
terrafrost
0e0bdf6210 Merge branch 'phpdoc-master' 
Conflicts:
	phpseclib/Crypt/Base.php
	phpseclib/Crypt/DES.php
	phpseclib/Crypt/Rijndael.php
 2015-10-13 09:31:21 -05:00
terrafrost
a9d353d391 Merge branch 'phpdoc-2.0' into 2.0 
Conflicts:
	phpseclib/Crypt/Base.php
	phpseclib/Crypt/DES.php
	phpseclib/Crypt/Rijndael.php
 2015-10-13 09:16:39 -05: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
177b52088d Merge branch '2.0' 2015-10-12 23:10:15 -05:00
terrafrost
0e3fdec56b Merge branch 'getkeylength' into getkeylength-2.0-2 2015-10-12 22:53:59 -05:00
terrafrost
5f1ff099da Crypt/Base: one more cs update 2015-10-12 22:52:56 -05:00
terrafrost
8686ced6d3 Merge branch 'phpdoc-2.0' into phpdoc-master 
Conflicts:
	phpseclib/Crypt/Hash.php
	phpseclib/Crypt/RSA.php
 2015-10-12 21:37:44 -05:00
terrafrost
2b427eb02a fix merge issues 2015-10-12 14:21:22 -05:00
terrafrost
33ea01f1ac Merge branch 'phpdoc-1.0' into phpdoc-2.0 
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/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-10-12 14:10:26 -05:00
terrafrost
2048a49aac use self:: in phpdoc comments to reduce merge conflicts 2015-10-11 12:22:07 -05:00
Scott
29b1bb7a58 Update random_bytes() to conform to PHP7.0.0-RC3 
Fixes #843
 2015-10-09 15:19:59 -04:00
terrafrost
19229ed224 phpDoc changes 2015-10-05 13:22:51 -05:00
terrafrost
829ce9a3ec RSA: make it so plugin names are not case sensitive 2015-10-04 23:18:13 -05:00
terrafrost
49393d1b3a Merge branch 'getkeylength' into getkeylength-2.0-2 
Conflicts:
	phpseclib/Crypt/Base.php
	phpseclib/Crypt/Blowfish.php
	phpseclib/Crypt/DES.php
	phpseclib/Crypt/Rijndael.php
 2015-10-04 21:38:47 -05:00
terrafrost
d91158f6ef rename key_size -> key_length 2015-10-04 21:06:17 -05:00
terrafrost
26a0a0890c Merge branch 'getkeylength' into getkeylength-2.0-2 
Conflicts:
	phpseclib/Crypt/RC2.php
	phpseclib/Crypt/TripleDES.php
 2015-10-04 16:40:15 -05:00
terrafrost
27034825f3 cs changes per bantu 2015-10-04 16:29:48 -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
fd99814e79 RSA: CS adjustments 2015-10-01 16:11:23 -05:00
terrafrost
5bddb49c62 RSA: clean up merge 2015-10-01 16:02:28 -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
Andreas Fischer
70f55bd156 Merge pull request #825 from terrafrost/rsa-revamp 
RSA: make createKey static and make it return RSA objects

* terrafrost/rsa-revamp:
  RSA: make createKey static and make it return RSA objects
 2015-09-25 13:16:56 +02:00
terrafrost
fab5a66fe5 RSA: make createKey static and make it return RSA objects 2015-09-24 09:43:19 -05:00
terrafrost
1f47daede7 Merge branch 'getkeylength' into getkeylength-2.0-2 2015-09-24 09:29:56 -05:00
terrafrost
8691035228 Crypt/Base: add getBlockLength() method 2015-09-24 09:29:00 -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
ccd18552e5 Merge branch '2.0' 
* 2.0:
  Fixed phpdoc

Conflicts:
	phpseclib/Crypt/Hash.php
 2015-09-16 13:36:04 +02: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
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