diff options
| author | Mario Vavti <mario@mariovavti.com> | 2020-08-21 10:55:55 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2020-08-21 10:55:55 +0200 |
| commit | 49df57df45f82e2e0f1b10f2508f61b78d6d3ac0 (patch) | |
| tree | da108b3e816419354814b143b675a8a933364f51 /Zotlabs | |
| parent | 374c30999acb19fd9ec828a266106e11367c7584 (diff) | |
| download | volse-hubzilla-49df57df45f82e2e0f1b10f2508f61b78d6d3ac0.tar.gz volse-hubzilla-49df57df45f82e2e0f1b10f2508f61b78d6d3ac0.tar.bz2 volse-hubzilla-49df57df45f82e2e0f1b10f2508f61b78d6d3ac0.zip | |
use the default setting and also add the mode to the cipher. aes-128 is to be preferred over aes-256 according to bruce schneier https://www.schneier.com/blog/archives/2009/07/another_new_aes.html#c386957
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Lib/ThreadStream.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/Chat.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Lib/ThreadStream.php b/Zotlabs/Lib/ThreadStream.php index f54b3f6c2..68b2c70dd 100644 --- a/Zotlabs/Lib/ThreadStream.php +++ b/Zotlabs/Lib/ThreadStream.php @@ -23,7 +23,7 @@ class ThreadStream { private $preview = false; private $prepared_item = ''; public $reload = ''; - private $cipher = 'AES-256'; + private $cipher = 'AES-128-CCM'; // $prepared_item is for use by alternate conversation structures such as photos // wherein we've already prepared a top level item which doesn't look anything like diff --git a/Zotlabs/Module/Chat.php b/Zotlabs/Module/Chat.php index 66ba42d33..28e775f9d 100644 --- a/Zotlabs/Module/Chat.php +++ b/Zotlabs/Module/Chat.php @@ -197,7 +197,7 @@ class Chat extends Controller { $cipher = get_pconfig(local_channel(),'system','default_cipher'); if(! $cipher) - $cipher = 'AES-256'; + $cipher = 'AES-128-CCM'; $o = replace_macros(get_markup_template('chat.tpl'),array( |