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

Simplify bitlk activation by volume key.

Browse Source 
Let's not copy volume key again when not necessary.
This commit is contained in:
Ondrej Kozina
2024-10-29 15:20:16 +01:00
parent 5b83ae8ec2
commit f85c31677c
3 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/bitlk/bitlk.c
View File

@@ -1431,24 +1431,15 @@ out:
int BITLK_activate_by_volume_key(struct crypt_device *cd,
const char *name,
const char *volume_key,
size_t volume_key_size,
struct volume_key *vk,
const struct bitlk_metadata *params,
uint32_t flags)
{
int r = 0;
struct volume_key *open_fvek_key = NULL;
int r;
r = _activate_check(cd, params);
if (r)
return r;
open_fvek_key = crypt_alloc_volume_key(volume_key_size, volume_key);
if (!open_fvek_key)
return -ENOMEM;
r = _activate(cd, name, open_fvek_key, params, flags);
crypt_free_volume_key(open_fvek_key);
return r;
return _activate(cd, name, vk, params, flags);
}

3
lib/bitlk/bitlk.h
View File

@@ -124,8 +124,7 @@ int BITLK_activate_by_passphrase(struct crypt_device *cd,
int BITLK_activate_by_volume_key(struct crypt_device *cd,
const char *name,
const char *volume_key,
size_t volume_key_size,
struct volume_key *vk,
const struct bitlk_metadata *params,
uint32_t flags);