From 1963dd341280ac25174b8a9aac10430c44273674 Mon Sep 17 00:00:00 2001 From: abalfoort Date: Wed, 31 May 2023 18:23:00 +0200 Subject: [PATCH] Optional luks2Hash with enum --- src/modules/luksbootkeyfile/luksbootkeyfile.conf | 9 ++++++--- src/modules/luksbootkeyfile/luksbootkeyfile.schema.yaml | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/modules/luksbootkeyfile/luksbootkeyfile.conf b/src/modules/luksbootkeyfile/luksbootkeyfile.conf index 62875181a..04ffbac6b 100644 --- a/src/modules/luksbootkeyfile/luksbootkeyfile.conf +++ b/src/modules/luksbootkeyfile/luksbootkeyfile.conf @@ -5,6 +5,9 @@ # LUKS encrypted devices. --- # Set Password-Based Key Derivation Function (PBKDF) algorithm -# for LUKS keyslot. The PBKDF can be: pbkdf2, argon2i or argon2id. -# Default: pbkdf2 -luks2Hash: pbkdf2 +# for LUKS keyslot. +# +# There are three usable values: pbkdf2, argon2i or argon2id. +# +# When not set, the cryptsetup default is used +#luks2Hash: argon2id diff --git a/src/modules/luksbootkeyfile/luksbootkeyfile.schema.yaml b/src/modules/luksbootkeyfile/luksbootkeyfile.schema.yaml index 8f505fbdc..6c0917646 100644 --- a/src/modules/luksbootkeyfile/luksbootkeyfile.schema.yaml +++ b/src/modules/luksbootkeyfile/luksbootkeyfile.schema.yaml @@ -6,4 +6,4 @@ $id: https://calamares.io/schemas/luksbootkeyfile additionalProperties: false type: object properties: - luks2Hash: { type: string } + luks2Hash: { type: string, enum: [ pbkdf2, argon2i, argon2id ] }