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

Add libLUKS2.

Browse Source
This commit is contained in:
Milan Broz
2017-08-25 20:26:20 +02:00
parent 00b103c85c
commit 9f2727bb77
27 changed files with 9281 additions and 404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/utils_pbkdf.c
View File

@@ -24,6 +24,14 @@
#include "internal.h"
const struct crypt_pbkdf_type default_luks2 = {
.type = DEFAULT_LUKS2_PBKDF,
.hash = DEFAULT_LUKS1_HASH,
.time_ms = DEFAULT_LUKS2_ITER_TIME,
.max_memory_kb = DEFAULT_LUKS2_MEMORY_KB,
.parallel_threads = DEFAULT_LUKS2_PARALLEL_THREADS
};
const struct crypt_pbkdf_type default_luks1 = {
.type = CRYPT_KDF_PBKDF2,
.hash = DEFAULT_LUKS1_HASH,
@@ -95,7 +103,9 @@ int init_pbkdf_type(struct crypt_device *cd,
uint32_t old_flags;
int r;
if (!pbkdf)
if (!pbkdf && dev_type && !strcmp(dev_type, CRYPT_LUKS2))
pbkdf = &default_luks2;
else if (!pbkdf)
pbkdf = &default_luks1;
r = verify_pbkdf_params(cd, pbkdf);