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

Fix sector_size display for non-LUKS2 crypt devices.

Browse Source
This commit is contained in:
Milan Broz
2023-02-16 14:58:49 +01:00
parent 1d109a114c
commit 9d5327c37b
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/setup.c
View File

@@ -125,6 +125,7 @@ struct crypt_device {
char integrity_spec[MAX_INTEGRITY_LEN]; char integrity_spec[MAX_INTEGRITY_LEN];
const char *cipher_mode; const char *cipher_mode;
unsigned int key_size; unsigned int key_size;
uint32_t sector_size;
} none; } none;
} u; } u;
@@ -1198,6 +1199,8 @@ static int _init_by_name_crypt_none(struct crypt_device *cd)
r = 0; r = 0;
} }
cd->u.none.sector_size = tgt->u.crypt.sector_size;
dm_targets_free(cd, &dmd); dm_targets_free(cd, &dmd);
return r; return r;
} }
@@ -5321,6 +5324,9 @@ int crypt_get_sector_size(struct crypt_device *cd)
if (isLUKS2(cd->type)) if (isLUKS2(cd->type))
return LUKS2_get_sector_size(&cd->u.luks2.hdr); return LUKS2_get_sector_size(&cd->u.luks2.hdr);
if (!cd->type && cd->u.none.sector_size)
return cd->u.none.sector_size;
return SECTOR_SIZE; return SECTOR_SIZE;
} }

2
tests/luks2-integrity-test
View File

@@ -154,6 +154,7 @@ intformat() # alg integrity integrity_out key_size int_key_size sector_size csum
int_check_sum $1 $7 int_check_sum $1 $7
# check status returns values even if no --header is set # check status returns values even if no --header is set
status_check "cipher" $1 status_check "cipher" $1
status_check "sector size" $6
status_check "integrity:" $3 status_check "integrity:" $3
status_check "keysize:" $(($4 + $5)) status_check "keysize:" $(($4 + $5))
[ -n "$LO_DEV" ] && status_check "device:" $LO_DEV [ -n "$LO_DEV" ] && status_check "device:" $LO_DEV
@@ -184,6 +185,7 @@ intformat aes-xts-plain64 hmac-sha256 hmac\(sha256\) 512 256 512 ee501705a
intformat aes-xts-random hmac-sha256 hmac\(sha256\) 512 256 512 492c2d1cc9e222a850c399bfef4ed5a86bf5afc59e54f0f0c7ba8e2a64548323 intformat aes-xts-random hmac-sha256 hmac\(sha256\) 512 256 512 492c2d1cc9e222a850c399bfef4ed5a86bf5afc59e54f0f0c7ba8e2a64548323
intformat aes-cbc-essiv:sha256 hmac-sha256 hmac\(sha256\) 128 256 4096 358d6beceddf593aff6b22c31684e0df9c226330aff5812e060950215217d21b intformat aes-cbc-essiv:sha256 hmac-sha256 hmac\(sha256\) 128 256 4096 358d6beceddf593aff6b22c31684e0df9c226330aff5812e060950215217d21b
intformat aes-xts-plain64 hmac-sha256 hmac\(sha256\) 256 256 4096 358d6beceddf593aff6b22c31684e0df9c226330aff5812e060950215217d21b intformat aes-xts-plain64 hmac-sha256 hmac\(sha256\) 256 256 4096 358d6beceddf593aff6b22c31684e0df9c226330aff5812e060950215217d21b
intformat aes-xts-plain64 hmac-sha256 hmac\(sha256\) 256 256 4096 358d6beceddf593aff6b22c31684e0df9c226330aff5812e060950215217d21b 1
intformat aes-xts-random hmac-sha256 hmac\(sha256\) 256 256 4096 8c0463f5ac09613674bdf40b0ff6f985edbc3de04e51fdc688873cb333ef3cda intformat aes-xts-random hmac-sha256 hmac\(sha256\) 256 256 4096 8c0463f5ac09613674bdf40b0ff6f985edbc3de04e51fdc688873cb333ef3cda
intformat aes-cbc-essiv:sha256 hmac-sha256 hmac\(sha256\) 256 256 4096 358d6beceddf593aff6b22c31684e0df9c226330aff5812e060950215217d21b intformat aes-cbc-essiv:sha256 hmac-sha256 hmac\(sha256\) 256 256 4096 358d6beceddf593aff6b22c31684e0df9c226330aff5812e060950215217d21b
intformat aes-xts-plain64 hmac-sha256 hmac\(sha256\) 512 256 4096 358d6beceddf593aff6b22c31684e0df9c226330aff5812e060950215217d21b intformat aes-xts-plain64 hmac-sha256 hmac\(sha256\) 512 256 4096 358d6beceddf593aff6b22c31684e0df9c226330aff5812e060950215217d21b