diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-17 08:37:18 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-17 08:37:18 +0000 |
| commit | 82adb3ced76821078f4cd08f73fa8271d225a9a5 (patch) | |
| tree | a70950ee1ddd4c9623896b14e4e44f61cfec7d3a /src/utils_luks.c | |
| parent | Releasing progress-linux version 2:2.7.0-1~progress7.99u1. (diff) | |
| download | cryptsetup-82adb3ced76821078f4cd08f73fa8271d225a9a5.tar.xz cryptsetup-82adb3ced76821078f4cd08f73fa8271d225a9a5.zip | |
Merging upstream version 2:2.7.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'src/utils_luks.c')
| -rw-r--r-- | src/utils_luks.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/utils_luks.c b/src/utils_luks.c index 5007b3f..5c51a5a 100644 --- a/src/utils_luks.c +++ b/src/utils_luks.c @@ -104,6 +104,9 @@ void set_activation_flags(uint32_t *flags) (ARG_SET(OPT_KEY_SLOT_ID) || ARG_SET(OPT_UNBOUND_ID))) *flags |= CRYPT_ACTIVATE_ALLOW_UNBOUND_KEY; + if (ARG_SET(OPT_LINK_VK_TO_KEYRING_ID)) + *flags |= CRYPT_ACTIVATE_KEYRING_KEY; + if (ARG_SET(OPT_SERIALIZE_MEMORY_HARD_PBKDF_ID)) *flags |= CRYPT_ACTIVATE_SERIALIZE_MEMORY_HARD_PBKDF; |