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

Fix integrity api-test.

Browse Source 
The journal crypt is in wrong format (this never worked! :),
here it takes kernel syntax.
Also use CBC a CTR mode could be missing here.

Fox typo in key length caclulation.

Clear temporary dm devices after test, loop devices are reused.

If the first device format is ok, all subsequent cals should
be treated as an error.
This commit is contained in:
Milan Broz
2022-04-17 19:48:26 +02:00
committed by Daniel Zaťovič
parent ed13852899
commit 1d6a445e43
1 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tests/api-test.c
View File

@@ -1881,12 +1881,7 @@ static void ResizeIntegrity(void)
OK_(crypt_init(&cd, DEVICE_2));
OK_(create_dmdevice_over_loop(H_DEVICE, 1024 * 1024 / 512));
OK_(crypt_init_data_device(&cd, DMDIR H_DEVICE, DEVICE_2));
ret = crypt_format(cd,CRYPT_INTEGRITY,NULL,NULL,NULL,NULL,0,&params);
if (ret < 0) {
printf("WARNING: cannot format integrity device, skipping test.\n");
CRYPT_FREE(cd);
return;
}
OK_(crypt_format(cd,CRYPT_INTEGRITY,NULL,NULL,NULL,NULL,0,&params));
OK_(crypt_activate_by_volume_key(cd, CDEVICE_1, NULL, 0, 0));
if (!t_device_size(DMDIR CDEVICE_1, &whole_device_size))
EQ_(10 * 1024 * 1024 / 512, whole_device_size >> TST_SECTOR_SHIFT);
@@ -1903,6 +1898,7 @@ static void ResizeIntegrity(void)
OK_(crypt_deactivate(cd, CDEVICE_1));
CRYPT_FREE(cd);
_cleanup_dmdevices();
}
static void ResizeIntegrityWithKey(void)
@@ -1911,7 +1907,7 @@ static void ResizeIntegrityWithKey(void)
.tag_size = 4,
.integrity = "hmac(sha256)",
.journal_integrity = "hmac(sha256)",
.journal_crypt = "ctr-aes",
.journal_crypt = "cbc(aes)",
.sector_size = 4096,
};
int ret;
@@ -1924,7 +1920,7 @@ static void ResizeIntegrityWithKey(void)
char integrity_key[128], journal_integrity_key[128], journal_crypt_key[128];
size_t integrity_key_size = strlen(key_integrity_hex) / 2;
size_t journal_integrity_key_size = strlen(key_journal_crypt_hex) / 2;
size_t journal_integrity_key_size = strlen(key_journal_integrity_hex) / 2;
size_t journal_crypt_key_size = strlen(key_journal_crypt_hex) / 2;
crypt_decode_key(integrity_key, key_integrity_hex, integrity_key_size);
@@ -1964,12 +1960,7 @@ static void ResizeIntegrityWithKey(void)
OK_(crypt_init(&cd, DEVICE_2));
OK_(create_dmdevice_over_loop(H_DEVICE, 1024 * 1024 / 512));
OK_(crypt_init_data_device(&cd, DMDIR H_DEVICE, DEVICE_2));
ret = crypt_format(cd,CRYPT_INTEGRITY,NULL,NULL,NULL,NULL,0,&params);
if (ret < 0) {
printf("WARNING: cannot format integrity device, skipping test.\n");
CRYPT_FREE(cd);
return;
}
OK_(crypt_format(cd,CRYPT_INTEGRITY,NULL,NULL,NULL,NULL,0,&params));
OK_(crypt_activate_by_volume_key(cd, CDEVICE_1, integrity_key, integrity_key_size, 0));
if (!t_device_size(DMDIR CDEVICE_1, &whole_device_size))
EQ_(10*1024*1024/512, whole_device_size >> TST_SECTOR_SHIFT);
@@ -1986,6 +1977,7 @@ static void ResizeIntegrityWithKey(void)
OK_(crypt_deactivate(cd, CDEVICE_1));
CRYPT_FREE(cd);
_cleanup_dmdevices();
}
static void IntegrityTest(void)