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

Switch isLUKS() testing order to avoid static analysis scan confusion.

Browse Source 
There is no functional change in this patch except it avoids
strange confusion during some static tests.

The cd->type must be set in this function anyway.
This commit is contained in:
Milan Broz
2024-11-28 10:41:18 +01:00
parent 9f1aee46d5
commit 690c22ac7b
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/setup.c
View File

@@ -4552,7 +4552,13 @@ int crypt_keyslot_change_by_passphrase(struct crypt_device *cd,
}
keyslot_old = r;
if (isLUKS2(cd->type)) {
if (isLUKS1(cd->type)) {
if (keyslot_new == CRYPT_ANY_SLOT) {
keyslot_new = LUKS_keyslot_find_empty(&cd->u.luks1.hdr);
if (keyslot_new < 0)
keyslot_new = keyslot_old;
}
} else if (isLUKS2(cd->type)) {
/* If there is a free keyslot (both id and binary area) avoid in-place keyslot area overwrite */
if (keyslot_new == CRYPT_ANY_SLOT || keyslot_new == keyslot_old) {
keyslot_new = LUKS2_keyslot_find_empty(cd, &cd->u.luks2.hdr, vk->keylength);
@@ -4561,12 +4567,6 @@ int crypt_keyslot_change_by_passphrase(struct crypt_device *cd,
else
keyslot_swap = true;
}
} else if (isLUKS1(cd->type)) {
if (keyslot_new == CRYPT_ANY_SLOT) {
keyslot_new = LUKS_keyslot_find_empty(&cd->u.luks1.hdr);
if (keyslot_new < 0)
keyslot_new = keyslot_old;
}
}
log_dbg(cd, "Key change, old slot %d, new slot %d.", keyslot_old, keyslot_new);