eessppeelllloo/cryptsetup
1
0
Fork 0
mirror of https://gitlab.com/cryptsetup/cryptsetup.git synced 2025-12-05 16:00:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Tweak kdf benchmark log..

Browse Source
This commit is contained in:
Milan Broz
2017-08-10 15:56:36 +02:00
parent 15b4f64b91
commit f4bb2ad613
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/utils_benchmark.c
View File

@@ -242,16 +242,15 @@ int crypt_benchmark_pbkdf(struct crypt_device *cd,
void *usrptr) void *usrptr)
{ {
int r; int r;
const char *kdf_opt;
r = init_crypto(cd); r = init_crypto(cd);
if (r < 0) if (r < 0)
return r; return r;
/* Hack to not print hash for argon, it is used also for AF later.*/ kdf_opt = !strcmp(pbkdf->type, CRYPT_KDF_PBKDF2) ? pbkdf->hash : "";
if (!strcmp(pbkdf->type, CRYPT_KDF_PBKDF2))
log_dbg("Running %s-%s benchmark.", pbkdf->type, pbkdf->hash); log_dbg("Running %s(%s) benchmark.", pbkdf->type, kdf_opt);
else
log_dbg("Running %s benchmark.", pbkdf->type);
r = crypt_pbkdf_perf(pbkdf->type, pbkdf->hash, password, password_size, r = crypt_pbkdf_perf(pbkdf->type, pbkdf->hash, password, password_size,
salt, salt_size, volume_key_size, pbkdf->time_ms, salt, salt_size, volume_key_size, pbkdf->time_ms,
@@ -259,8 +258,8 @@ int crypt_benchmark_pbkdf(struct crypt_device *cd,
&pbkdf->time_ms, &pbkdf->max_memory_kb, progress, usrptr); &pbkdf->time_ms, &pbkdf->max_memory_kb, progress, usrptr);
if (!r) if (!r)
log_dbg(" %u iterations, %u memory (for %zu-bits key).", log_dbg("Benchmark returns %s(%s) %u iterations, %u memory, %u threads (for %zu-bits key).",
pbkdf->time_ms, pbkdf->max_memory_kb, pbkdf->type, kdf_opt, pbkdf->time_ms, pbkdf->max_memory_kb,
volume_key_size * 8); pbkdf->parallel_threads, volume_key_size * 8);
return r; return r;
} }