aboutsummaryrefslogtreecommitdiffstats
path: root/src/libutil/util.c
diff options
context:
space:
mode:
authorVsevolod Stakhov <vsevolod@highsecure.ru>2016-04-21 12:34:03 +0100
committerVsevolod Stakhov <vsevolod@highsecure.ru>2016-04-21 12:34:03 +0100
commitb5391a29c27486a6c50636952e7e92a77e5ac18a (patch)
treec87a9d488d1193d7bd23e20b71f5e8d86e962d3c /src/libutil/util.c
parentb212e765ad521f685bb6817e9b65b19a51d9a933 (diff)
downloadrspamd-b5391a29c27486a6c50636952e7e92a77e5ac18a.tar.gz
rspamd-b5391a29c27486a6c50636952e7e92a77e5ac18a.zip
[Feature] Allow multiple PBKDF types in `rspamadm pw`
Diffstat (limited to 'src/libutil/util.c')
-rw-r--r--src/libutil/util.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/libutil/util.c b/src/libutil/util.c
index 4120849a3..87395c568 100644
--- a/src/libutil/util.c
+++ b/src/libutil/util.c
@@ -77,6 +77,9 @@
const struct rspamd_controller_pbkdf pbkdf_list[] = {
{
+ .name = "PBKDF2-blake2b",
+ .alias = "pbkdf2",
+ .description = "standard CPU intensive \"slow\" KDF using blake2b hash function",
.type = RSPAMD_CRYPTOBOX_PBKDF2,
.id = RSPAMD_PBKDF_ID_V1,
.complexity = 16000,
@@ -84,6 +87,9 @@ const struct rspamd_controller_pbkdf pbkdf_list[] = {
.key_len = rspamd_cryptobox_HASHBYTES / 2
},
{
+ .name = "Catena-Butterfly",
+ .alias = "catena",
+ .description = "modern CPU and memory intensive KDF",
.type = RSPAMD_CRYPTOBOX_CATENA,
.id = RSPAMD_PBKDF_ID_V2,
.complexity = 10,