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

Bypass keyring activation flag if cipher is null.

Browse Source
This commit is contained in:
Ondrej Kozina
2021-02-18 14:22:51 +01:00
committed by Milan Broz
parent c8c28cf6dd
commit 7825e0d4a6
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/libdevmapper.c
View File

@@ -654,11 +654,13 @@ static char *get_dm_crypt_params(const struct dm_target *tgt, uint32_t flags)
if (crypt_is_cipher_null(cipher_dm)) if (crypt_is_cipher_null(cipher_dm))
null_cipher = 1; null_cipher = 1;
if (flags & CRYPT_ACTIVATE_KEYRING_KEY) { if (null_cipher)
hexkey = crypt_safe_alloc(2);
else if (flags & CRYPT_ACTIVATE_KEYRING_KEY) {
keystr_len = strlen(tgt->u.crypt.vk->key_description) + int_log10(tgt->u.crypt.vk->keylength) + 10; keystr_len = strlen(tgt->u.crypt.vk->key_description) + int_log10(tgt->u.crypt.vk->keylength) + 10;
hexkey = crypt_safe_alloc(keystr_len); hexkey = crypt_safe_alloc(keystr_len);
} else } else
hexkey = crypt_safe_alloc(null_cipher ? 2 : (tgt->u.crypt.vk->keylength * 2 + 1)); hexkey = crypt_safe_alloc(tgt->u.crypt.vk->keylength * 2 + 1);
if (!hexkey) if (!hexkey)
return NULL; return NULL;