97902d4bd3
Upgrade to PHP 7.0
2022-07-02 16:26:15 -05:00
8855351cbb
Remove_@access
2022-05-04 01:35:56 -05:00
ea9f6540f3
PSR12 fixes
...
PSR12 fixes
2022-02-19 17:06:13 -06:00
03e9060cbb
cipher_name_openssl_ecb shouldn't be static because of AES
2021-04-14 05:24:03 -05:00
a18b86ae26
add mode to all block cipher examples
2021-02-04 01:06:14 -06:00
a19b5b4ca8
update how @internal phpdoc attributes are used
2020-12-30 05:05:54 -06:00
653dbd7f94
rename phpseclib/phpseclib to phpseclib/phpseclib3 for 3.0 branch
2019-11-21 19:38:03 -06:00
23ffa6452e
revisions to gocom's code changes
2019-08-28 07:16:24 -05:00
488433e10f
Fix mode mapping order and param type
2019-08-24 02:06:45 +03:00
a8d07e3dcb
SymmetricKey: make $cipher_name_openssl_ecb static
2018-12-29 23:21:18 -06:00
4679cb7bf7
Blowfish: make sboxes static
2018-12-02 12:42:53 -06:00
9bcd851e97
Blowfish: CS adjustments (" -> ')
2018-12-02 12:21:56 -06:00
19a46748a2
Merge branch '2.0'
2017-12-17 16:25:30 -06:00
37922e5b4c
Merge branch '1.0' into 2.0
2017-12-17 15:05:15 -06:00
6930560ae6
more adjustments for ARM CPU's
2017-12-17 14:52:43 -06:00
4f9e92b380
Merge branch '2.0'
2017-12-09 18:59:25 -06:00
87dd553517
Merge branch '1.0' into 2.0
2017-12-09 18:39:27 -06:00
b25681beeb
fix float to int conversions on ARM CPU's
2017-12-09 18:16:48 -06:00
9d8f014748
SymmetricKey: isValidKey took ints instead of strings
2017-08-07 23:57:02 -05:00
085d5ed495
Merge branch '2.0-crypt-fix-old-openssl'
2017-05-13 23:24:53 -05:00
9fc9d2fa19
Merge branch 'crypt-fix-old-openssl' into 2.0
2017-05-13 23:21:14 -05:00
a983412ea9
Crypt: fix OpenSSL engine on <= PHP 5.3.6
2017-05-13 23:18:42 -05:00
ab1da5ac1f
Merge pull request #1084 from terrafrost/php5-updates
...
PHP5 updates for master branch
2017-02-02 21:03:07 -05:00
7d2e44b430
Merge branch '2.0'
2017-01-27 12:40:23 -06:00
ac2b7ef76c
Merge branch '1.0' into 2.0
2017-01-27 12:17:04 -06:00
1bde98fc42
Crypt: OpenSSL apparently supports variable size keys
2017-01-27 11:20:22 -06:00
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
2a1177b256
SymmetricCiphers: add public / private / protected as appropriate
2016-12-07 22:19:20 -06:00
c852bae3c8
use short array syntax for arrays
2016-11-30 21:29:38 -06:00
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
7ae4ea3e71
Merge branch '1.0' into 2.0
2016-10-02 21:56:59 -05:00
42fb96db16
fix float to int conversions on 32-bit linux PHP < 5.3 installs
2016-10-02 03:37:23 -05:00
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
c784d9e1e5
reapply PR #931
2016-05-08 01:34:37 -05:00
398a795e1f
Revert "undo merging of master to 2.0 branch"
...
This reverts commit 8fb4c3363d
2016-04-30 16:23:35 -05:00
8fb4c3363d
undo merging of master to 2.0 branch
2016-04-28 15:34:10 -05:00
b4cf10fc94
Revert "Merge branch '2.0'"
...
This reverts commit be5f4ef6b19c82f6c898708cc8e1828b05e3d4e8, reversing
changes made to 638fe6971c
2016-04-10 11:30:59 -05:00
4b69dcb1ca
Revert "Merge remote-tracking branch 'bantu/bootstrap'"
...
This reverts commit ef04c870e9cd57bf31ae
2016-04-10 11:25:31 -05:00
ea7d647612
Merge branch 'cipher-revamp'
2016-03-14 22:42:51 -05:00
73a4221988
Crypt: become a lot less tolerant of bad parameters
2016-01-31 12:37:38 -06:00
bdc28b9453
Cherry-picking cleanup of `use` operator usage
...
Picked c9a80ff748
2016-01-21 19:41:41 +01:00
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
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
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
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
2048a49aac
use self:: in phpdoc comments to reduce merge conflicts
2015-10-11 12:22:07 -05:00
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
d91158f6ef
rename key_size -> key_length
2015-10-04 21:06:17 -05:00
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
27034825f3
cs changes per bantu
2015-10-04 16:29:48 -05:00
Jack Worman
terrafrost
terrafrost
Jukka Svahn
Joey3000