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

Do not upload VK in keyring when data cipher is null.

Browse Source
This commit is contained in:
Ondrej Kozina
2021-02-19 13:10:09 +01:00
committed by Milan Broz
parent 91e8f5ffd9
commit b2135a75e2
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/setup.c
View File

@@ -3137,7 +3137,7 @@ int crypt_resume_by_passphrase(struct crypt_device *cd,
keyslot = r; keyslot = r;
if (crypt_use_keyring_for_vk(cd)) { if (crypt_use_keyring_for_vk(cd) && !crypt_cipher_is_null(crypt_get_cipher_spec(cd))) {
r = LUKS2_volume_key_load_in_keyring_by_keyslot(cd, r = LUKS2_volume_key_load_in_keyring_by_keyslot(cd,
&cd->u.luks2.hdr, vk, keyslot); &cd->u.luks2.hdr, vk, keyslot);
if (r < 0) if (r < 0)
@@ -3204,7 +3204,7 @@ int crypt_resume_by_keyfile_device_offset(struct crypt_device *cd,
goto out; goto out;
keyslot = r; keyslot = r;
if (crypt_use_keyring_for_vk(cd)) { if (crypt_use_keyring_for_vk(cd) && !crypt_cipher_is_null(crypt_get_cipher_spec(cd))) {
r = LUKS2_volume_key_load_in_keyring_by_keyslot(cd, r = LUKS2_volume_key_load_in_keyring_by_keyslot(cd,
&cd->u.luks2.hdr, vk, keyslot); &cd->u.luks2.hdr, vk, keyslot);
if (r < 0) if (r < 0)
@@ -3284,7 +3284,7 @@ int crypt_resume_by_volume_key(struct crypt_device *cd,
goto out; goto out;
r = 0; r = 0;
if (crypt_use_keyring_for_vk(cd)) { if (crypt_use_keyring_for_vk(cd) && !crypt_cipher_is_null(crypt_get_cipher_spec(cd))) {
r = LUKS2_key_description_by_segment(cd, &cd->u.luks2.hdr, vk, CRYPT_DEFAULT_SEGMENT); r = LUKS2_key_description_by_segment(cd, &cd->u.luks2.hdr, vk, CRYPT_DEFAULT_SEGMENT);
if (!r) if (!r)
r = crypt_volume_key_load_in_keyring(cd, vk); r = crypt_volume_key_load_in_keyring(cd, vk);