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
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
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
87040bc518
Merge branch '1.0' into 2.0
2016-06-04 22:56:49 -05: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
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
8fb4c3363d
undo merging of master to 2.0 branch
2016-04-28 15:34:10 -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
4b69dcb1ca
Revert "Merge remote-tracking branch 'bantu/bootstrap'"
...
This reverts commit ef04c870e9cd57bf31ae
2016-04-10 11:25:31 -05:00
terrafrost
263564a2ee
Merge branch 'master' of https://github.com/phpseclib/phpseclib
2016-04-09 13:00:51 -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
DAB
89a73161cb
set publicExponent to false instead of unsetting
2016-03-25 22:10:36 -05:00
terrafrost
be0aed43cf
RSA: bring PKCS1 compliancy to v2.2
2016-03-24 13:38:51 -05:00
terrafrost
698efd030a
RSA: fix namespacing for caught exceptions
2016-02-20 23:54:19 -06:00
terrafrost
750f7652c7
Merge remote-tracking branch 'joey3000/use_cleanup'
2016-01-25 17:00:30 -06:00
Joey3000
bdc28b9453
Cherry-picking cleanup of use operator usage
...
Picked c9a80ff748
2016-01-21 19:41:41 +01: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
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
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
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
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
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
terrafrost
19229ed224
phpDoc changes
2015-10-05 13:22:51 -05:00
