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

Introduce crypt_keyslot_get_key_size()

Browse Source 
This function allows to get key size even for unboud keyslots.
This commit is contained in:
Milan Broz
2018-04-26 14:24:10 +02:00
parent daba04d54b
commit a387557970
4 changed files with 37 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/libcryptsetup.h
View File

@@ -1525,6 +1525,18 @@ int crypt_keyslot_area(struct crypt_device *cd,
uint64_t *offset, uint64_t *offset,
uint64_t *length); uint64_t *length);
/**
* Get size (in bytes) of key for particular keyslot.
* Use for LUKS2 unbound keyslots, for other keyslots it is the same as @ref crypt_get_volume_key_size
*
* @param cd crypt device handle
* @param keyslot keyslot number
*
* @return volume key size or negative errno value otherwise.
*
*/
int crypt_keyslot_get_key_size(struct crypt_device *cd, int keyslot);
/** /**
* Get directory where mapped crypt devices are created * Get directory where mapped crypt devices are created
* *

1
lib/libcryptsetup.sym
View File

@@ -90,6 +90,7 @@ CRYPTSETUP_2.0 {
crypt_keyslot_max; crypt_keyslot_max;
crypt_keyslot_area; crypt_keyslot_area;
crypt_keyslot_status; crypt_keyslot_status;
crypt_keyslot_get_key_size;
crypt_get_dir; crypt_get_dir;
crypt_set_debug_level; crypt_set_debug_level;
crypt_log; crypt_log;

17
lib/setup.c
View File

@@ -3782,6 +3782,23 @@ int crypt_get_volume_key_size(struct crypt_device *cd)
return 0; return 0;
} }
int crypt_keyslot_get_key_size(struct crypt_device *cd, int keyslot)
{
if (!cd || !isLUKS(cd->type))
return -EINVAL;
if (keyslot < 0 || keyslot >= crypt_keyslot_max(cd->type))
return -EINVAL;
if (isLUKS1(cd->type))
return cd->u.luks1.hdr.keyBytes;
if (isLUKS2(cd->type))
return LUKS2_get_keyslot_key_size(&cd->u.luks2.hdr, keyslot);
return -EINVAL;
}
uint64_t crypt_get_data_offset(struct crypt_device *cd) uint64_t crypt_get_data_offset(struct crypt_device *cd)
{ {
if (!cd) if (!cd)

7
tests/api-test-2.c
View File

@@ -2332,6 +2332,13 @@ static void Luks2KeyslotAdd(void)
EQ_(crypt_keyslot_add_by_key(cd, 2, key2, key_size-1, PASSPHRASE1, strlen(PASSPHRASE1), CRYPT_VOLUME_KEY_NO_SEGMENT), 2); EQ_(crypt_keyslot_add_by_key(cd, 2, key2, key_size-1, PASSPHRASE1, strlen(PASSPHRASE1), CRYPT_VOLUME_KEY_NO_SEGMENT), 2);
EQ_(crypt_keyslot_add_by_key(cd, 3, key2, 13, PASSPHRASE1, strlen(PASSPHRASE1), CRYPT_VOLUME_KEY_NO_SEGMENT), 3); EQ_(crypt_keyslot_add_by_key(cd, 3, key2, 13, PASSPHRASE1, strlen(PASSPHRASE1), CRYPT_VOLUME_KEY_NO_SEGMENT), 3);
FAIL_(crypt_keyslot_get_key_size(cd, CRYPT_ANY_SLOT), "Bad keyslot specification.");
EQ_(crypt_get_volume_key_size(cd), key_size);
EQ_(crypt_keyslot_get_key_size(cd, 0), key_size);
EQ_(crypt_keyslot_get_key_size(cd, 1), key_size);
EQ_(crypt_keyslot_get_key_size(cd, 2), key_size-1);
EQ_(crypt_keyslot_get_key_size(cd, 3), 13);
key_ret_len = key_size - 1; key_ret_len = key_size - 1;
FAIL_(crypt_volume_key_get(cd, CRYPT_ANY_SLOT, key_ret, &key_ret_len, PASSPHRASE1, strlen(PASSPHRASE1)), "Wrong size or fips"); FAIL_(crypt_volume_key_get(cd, CRYPT_ANY_SLOT, key_ret, &key_ret_len, PASSPHRASE1, strlen(PASSPHRASE1)), "Wrong size or fips");