diff options
| author | nobody <nobody@zotlabs.com> | 2021-02-17 16:37:19 -0800 |
|---|---|---|
| committer | nobody <nobody@zotlabs.com> | 2021-02-17 16:37:19 -0800 |
| commit | e7c7f91a3fec224ca32459b950caaa25f73c3b1f (patch) | |
| tree | abd6c740ed7d2d89cbcd048fa79fe5d4566e1f70 /Zotlabs/Lib | |
| parent | 8a65fc8a43116fcdce12bcbccd452b82a70d8da1 (diff) | |
| parent | c3ec5d4d6ac48988b70d17b0b08b35da92cfa24f (diff) | |
| download | volse-hubzilla-e7c7f91a3fec224ca32459b950caaa25f73c3b1f.tar.gz volse-hubzilla-e7c7f91a3fec224ca32459b950caaa25f73c3b1f.tar.bz2 volse-hubzilla-e7c7f91a3fec224ca32459b950caaa25f73c3b1f.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
Diffstat (limited to 'Zotlabs/Lib')
| -rw-r--r-- | Zotlabs/Lib/Crypto.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Zotlabs/Lib/Crypto.php b/Zotlabs/Lib/Crypto.php index 7c4654ec0..f1794ae64 100644 --- a/Zotlabs/Lib/Crypto.php +++ b/Zotlabs/Lib/Crypto.php @@ -12,7 +12,8 @@ class Crypto { ['aes256ctr', 'aes-256-ctr', 32, 16], ['camellia256cfb', 'camellia-256-cfb', 32, 16], - ['cast5cfb', 'cast5-cfb', 16, 8] + ['cast5cfb', 'cast5-cfb', 16, 8], + ['aes256cbc', 'aes-256-cbc', 32, 16] // remove after legacy zot has been sunset ]; |