Skip to content

Commit c3414b8

Browse files
mbrozmbroz
committed
tests: detect failure of crypt_decode_key
1 parent 9f86679 commit c3414b8

2 files changed

Lines changed: 39 additions & 39 deletions

File tree

‎tests/api-test-2.c‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -865,8 +865,8 @@ static void AddDeviceLuks2(void)
865865
pbkdf.max_memory_kb = 0;
866866
}
867867

868-
crypt_decode_key(key, vk_hex, key_size);
869-
crypt_decode_key(key3, vk_hex2, key_size);
868+
OK_(crypt_decode_key(key, vk_hex, key_size));
869+
OK_(crypt_decode_key(key3, vk_hex2, key_size));
870870

871871
// init test devices
872872
OK_(get_luks2_offsets(0, 0, 0, &r_header_size, &r_payload_offset));
@@ -1212,7 +1212,7 @@ static void Luks2MetadataSize(void)
12121212
pbkdf.iterations = 1000;
12131213
}
12141214

1215-
crypt_decode_key(key, vk_hex, key_size);
1215+
OK_(crypt_decode_key(key, vk_hex, key_size));
12161216

12171217
// init test devices
12181218
OK_(get_luks2_offsets(0, 0, 0, &r_header_size, NULL));
@@ -1404,7 +1404,7 @@ static void Luks2HeaderRestore(void)
14041404
pbkdf.max_memory_kb = 0;
14051405
}
14061406

1407-
crypt_decode_key(key, vk_hex, key_size);
1407+
OK_(crypt_decode_key(key, vk_hex, key_size));
14081408

14091409
OK_(get_luks2_offsets(0, params.data_alignment, 0, NULL, &r_payload_offset));
14101410
OK_(create_dmdevice_over_loop(L_DEVICE_OK, r_payload_offset + 5000));
@@ -1506,7 +1506,7 @@ static void Luks2HeaderLoad(void)
15061506
pbkdf.max_memory_kb = 0;
15071507
}
15081508

1509-
crypt_decode_key(key, vk_hex, key_size);
1509+
OK_(crypt_decode_key(key, vk_hex, key_size));
15101510

15111511
// hardcoded values for existing image IMAGE1
15121512
img_size = 8192;
@@ -1641,7 +1641,7 @@ static void Luks2HeaderBackup(void)
16411641
pbkdf.max_memory_kb = 0;
16421642
}
16431643

1644-
crypt_decode_key(key, vk_hex, key_size);
1644+
OK_(crypt_decode_key(key, vk_hex, key_size));
16451645

16461646
OK_(get_luks2_offsets(1, params.data_alignment, 0, NULL, &r_payload_offset));
16471647
OK_(create_dmdevice_over_loop(L_DEVICE_OK, r_payload_offset + 1));
@@ -1736,7 +1736,7 @@ static void ResizeDeviceLuks2(void)
17361736
pbkdf.max_memory_kb = 0;
17371737
}
17381738

1739-
crypt_decode_key(key, vk_hex, key_size);
1739+
OK_(crypt_decode_key(key, vk_hex, key_size));
17401740

17411741
// prepare env
17421742
OK_(get_luks2_offsets(0, params.data_alignment, 0, NULL, &r_payload_offset));
@@ -3180,8 +3180,8 @@ static void Luks2KeyslotAdd(void)
31803180
.sector_size = TST_SECTOR_SIZE
31813181
};
31823182

3183-
crypt_decode_key(key, vk_hex, key_size);
3184-
crypt_decode_key(key2, vk_hex2, key_size);
3183+
OK_(crypt_decode_key(key, vk_hex, key_size));
3184+
OK_(crypt_decode_key(key2, vk_hex2, key_size));
31853185

31863186
/* Cannot use Argon2 in FIPS */
31873187
if (_fips_mode) {
@@ -3315,8 +3315,8 @@ static void Luks2KeyslotParams(void)
33153315
size_t key_size_ret, key_size = strlen(vk_hex) / 2, keyslot_key_size = 16;
33163316
uint64_t r_payload_offset;
33173317

3318-
crypt_decode_key(key, vk_hex, key_size);
3319-
crypt_decode_key(key2, vk_hex2, key_size);
3318+
OK_(crypt_decode_key(key, vk_hex, key_size));
3319+
OK_(crypt_decode_key(key2, vk_hex2, key_size));
33203320

33213321
OK_(prepare_keyfile(KEYFILE1, PASSPHRASE, strlen(PASSPHRASE)));
33223322
OK_(prepare_keyfile(KEYFILE2, PASSPHRASE1, strlen(PASSPHRASE1)));
@@ -3916,8 +3916,8 @@ static void Luks2Refresh(void)
39163916
};
39173917
struct crypt_active_device cad = {};
39183918

3919-
crypt_decode_key(key, vk_hex, key_size);
3920-
crypt_decode_key(key1, vk_hex2, key_size);
3919+
OK_(crypt_decode_key(key, vk_hex, key_size));
3920+
OK_(crypt_decode_key(key1, vk_hex2, key_size));
39213921

39223922
OK_(get_luks2_offsets(0, 0, 0, NULL, &r_payload_offset));
39233923
OK_(create_dmdevice_over_loop(L_DEVICE_OK, r_payload_offset + 1000));
@@ -4139,8 +4139,8 @@ static void Luks2Reencryption(void)
41394139
key_size2 = strlen(vk_hex2) / 2;
41404140
char key[128], key2[64];
41414141

4142-
crypt_decode_key(key, vk_hex, key_size);
4143-
crypt_decode_key(key2, vk_hex2, key_size2);
4142+
OK_(crypt_decode_key(key, vk_hex, key_size));
4143+
OK_(crypt_decode_key(key2, vk_hex2, key_size2));
41444144

41454145
/* reencryption currently depends on kernel keyring support in dm-crypt */
41464146
if (!t_dm_crypt_keyring_support())
@@ -5286,8 +5286,8 @@ static void LuksKeyslotAdd(void)
52865286
uint64_t r_payload_offset;
52875287
struct crypt_keyslot_context *um1, *um2;
52885288

5289-
crypt_decode_key(key, vk_hex, key_size);
5290-
crypt_decode_key(key3, vk_hex2, key_size);
5289+
OK_(crypt_decode_key(key, vk_hex, key_size));
5290+
OK_(crypt_decode_key(key3, vk_hex2, key_size));
52915291

52925292
// init test devices
52935293
OK_(get_luks2_offsets(0, 0, 0, NULL, &r_payload_offset));
@@ -5430,8 +5430,8 @@ static void VolumeKeyGet(void)
54305430
uint64_t r_payload_offset;
54315431
struct crypt_keyslot_context *um1, *um2;
54325432

5433-
crypt_decode_key(key, vk_hex, key_size);
5434-
crypt_decode_key(key3, vk2_hex, key_size);
5433+
OK_(crypt_decode_key(key, vk_hex, key_size));
5434+
OK_(crypt_decode_key(key3, vk2_hex, key_size));
54355435

54365436
OK_(prepare_keyfile(KEYFILE1, PASSPHRASE1, strlen(PASSPHRASE1)));
54375437

‎tests/api-test.c‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ static void AddDevicePlain(void)
323323

324324
uint64_t size, r_size;
325325

326-
crypt_decode_key(key, vk_hex, key_size);
326+
OK_(crypt_decode_key(key, vk_hex, key_size));
327327
FAIL_(crypt_init(&cd, ""), "empty device string");
328328
FAIL_(crypt_init(&cd, DEVICE_WRONG), "nonexistent device name ");
329329
FAIL_(crypt_init(&cd, DEVICE_CHAR), "character device as backing device");
@@ -806,8 +806,8 @@ static void AddDeviceLuks(void)
806806
uint64_t r_payload_offset, r_header_size, r_size_1;
807807
struct crypt_pbkdf_type pbkdf;
808808

809-
crypt_decode_key(key, vk_hex, key_size);
810-
crypt_decode_key(key3, vk_hex2, key_size);
809+
OK_(crypt_decode_key(key, vk_hex, key_size));
810+
OK_(crypt_decode_key(key3, vk_hex2, key_size));
811811

812812
// init test devices
813813
OK_(get_luks_offsets(1, key_size, 0, 0, &r_header_size, &r_payload_offset));
@@ -1139,7 +1139,7 @@ static void LuksHeaderRestore(void)
11391139
const char *cipher_mode = "cbc-essiv:sha256";
11401140
uint64_t r_payload_offset;
11411141

1142-
crypt_decode_key(key, vk_hex, key_size);
1142+
OK_(crypt_decode_key(key, vk_hex, key_size));
11431143

11441144
OK_(get_luks_offsets(0, key_size, params.data_alignment, 0, NULL, &r_payload_offset));
11451145
OK_(create_dmdevice_over_loop(L_DEVICE_OK, r_payload_offset + 5000));
@@ -1227,7 +1227,7 @@ static void LuksHeaderLoad(void)
12271227
uint64_t r_payload_offset, r_header_size;
12281228
uint64_t mdata_size, keyslots_size;
12291229

1230-
crypt_decode_key(key, vk_hex, key_size);
1230+
OK_(crypt_decode_key(key, vk_hex, key_size));
12311231

12321232
// prepare test env
12331233
OK_(get_luks_offsets(0, key_size, params.data_alignment, 0, &r_header_size, &r_payload_offset));
@@ -1340,7 +1340,7 @@ static void LuksHeaderBackup(void)
13401340

13411341
const char *passphrase = PASSPHRASE;
13421342

1343-
crypt_decode_key(key, vk_hex, key_size);
1343+
OK_(crypt_decode_key(key, vk_hex, key_size));
13441344

13451345
OK_(get_luks_offsets(0, key_size, params.data_alignment, 0, NULL, &r_payload_offset));
13461346
OK_(create_dmdevice_over_loop(L_DEVICE_OK, r_payload_offset + 1));
@@ -1420,7 +1420,7 @@ static void ResizeDeviceLuks(void)
14201420
const char *cipher_mode = "cbc-essiv:sha256";
14211421
uint64_t r_payload_offset, r_header_size, r_size;
14221422

1423-
crypt_decode_key(key, vk_hex, key_size);
1423+
OK_(crypt_decode_key(key, vk_hex, key_size));
14241424

14251425
// prepare env
14261426
OK_(get_luks_offsets(0, key_size, params.data_alignment, 0, NULL, &r_payload_offset));
@@ -1517,7 +1517,7 @@ static void HashDevicePlain(void)
15171517
// 0 1 2 3 4 5 6 7 8 9 a b c d e f
15181518
vk_hex = "caffeecaffeecaffeecaffeecaffee88";
15191519
key_size = 16;
1520-
crypt_decode_key(key, vk_hex, key_size);
1520+
OK_(crypt_decode_key(key, vk_hex, key_size));
15211521
OK_(prepare_keyfile(KEYFILE1, key, key_size));
15221522
OK_(crypt_activate_by_keyfile(cd, CDEVICE_1, CRYPT_ANY_SLOT, KEYFILE1, key_size, 0));
15231523
OK_(get_key_dm(CDEVICE_1, key, sizeof(key)));
@@ -1537,7 +1537,7 @@ static void HashDevicePlain(void)
15371537
// 0 1 2 3 4 5 6 7 8 9 a b c d e f
15381538
vk_hex = "caffeecaffeecaffeecaffeecaffee88babebabe";
15391539
key_size = 16;
1540-
crypt_decode_key(key, vk_hex, strlen(vk_hex) / 2);
1540+
OK_(crypt_decode_key(key, vk_hex, strlen(vk_hex) / 2));
15411541
OK_(prepare_keyfile(KEYFILE1, key, strlen(vk_hex) / 2));
15421542
OK_(crypt_activate_by_keyfile(cd, CDEVICE_1, CRYPT_ANY_SLOT, KEYFILE1, key_size, 0));
15431543
OK_(get_key_dm(CDEVICE_1, key, sizeof(key)));
@@ -1560,7 +1560,7 @@ static void HashDevicePlain(void)
15601560
// 0 1 2 3 4 5 6 7 8 9 a b c d e f
15611561
vk_hex = "aabbcaffeecaffeecaffeecaffeecaff";
15621562
key_size = 16;
1563-
crypt_decode_key(key, vk_hex, key_size);
1563+
OK_(crypt_decode_key(key, vk_hex, key_size));
15641564
OK_(prepare_keyfile(KEYFILE1, key, strlen(vk_hex) / 2));
15651565
OK_(crypt_init(&cd, DEVICE_1));
15661566
OK_(crypt_format(cd, CRYPT_PLAIN, "aes", "cbc-essiv:sha256", NULL, NULL, 16, &params));
@@ -1631,8 +1631,8 @@ static void VerityTest(void)
16311631
.flags = CRYPT_VERITY_CREATE_HASH,
16321632
};
16331633

1634-
crypt_decode_key(salt, salt_hex, strlen(salt_hex) / 2);
1635-
crypt_decode_key(root_hash, root_hex, strlen(root_hex) / 2);
1634+
OK_(crypt_decode_key(salt, salt_hex, strlen(salt_hex) / 2));
1635+
OK_(crypt_decode_key(root_hash, root_hex, strlen(root_hex) / 2));
16361636

16371637
/* Format */
16381638
OK_(crypt_init(&cd, DEVICE_2));
@@ -1762,7 +1762,7 @@ static void TcryptTest(void)
17621762
"3979531d1cdc18af62757cf22286f16f8583d848524f128d7594ac2082668c73";
17631763
int r;
17641764

1765-
crypt_decode_key(key_def, key_hex, strlen(key_hex) / 2);
1765+
OK_(crypt_decode_key(key_def, key_hex, strlen(key_hex) / 2));
17661766

17671767
// First ensure we can use af_alg skcipher interface
17681768
r = crypt_benchmark(NULL, "aes", "xts", 512, 16, 1024, &enc_mbr, &dec_mbr);
@@ -1936,9 +1936,9 @@ static void ResizeIntegrityWithKey(void)
19361936
size_t journal_integrity_key_size = strlen(key_journal_integrity_hex) / 2;
19371937
size_t journal_crypt_key_size = strlen(key_journal_crypt_hex) / 2;
19381938

1939-
crypt_decode_key(integrity_key, key_integrity_hex, integrity_key_size);
1940-
crypt_decode_key(journal_integrity_key, key_journal_integrity_hex, journal_integrity_key_size);
1941-
crypt_decode_key(journal_crypt_key, key_journal_crypt_hex, journal_crypt_key_size);
1939+
OK_(crypt_decode_key(integrity_key, key_integrity_hex, integrity_key_size));
1940+
OK_(crypt_decode_key(journal_integrity_key, key_journal_integrity_hex, journal_integrity_key_size));
1941+
OK_(crypt_decode_key(journal_crypt_key, key_journal_crypt_hex, journal_crypt_key_size));
19421942

19431943
params.integrity_key_size = integrity_key_size;
19441944

@@ -2016,7 +2016,7 @@ static void IntegrityTest(void)
20162016
size_t integrity_key_size = strlen(key_integrity_hex) / 2;
20172017
char integrity_key[128];
20182018

2019-
crypt_decode_key(integrity_key, key_integrity_hex, integrity_key_size);
2019+
OK_(crypt_decode_key(integrity_key, key_integrity_hex, integrity_key_size));
20202020
params2.integrity_key_size = integrity_key_size;
20212021

20222022
OK_(crypt_init(&cd, DEVICE_1));
@@ -2139,8 +2139,8 @@ static void LuksKeyslotAdd(void)
21392139
uint64_t r_payload_offset;
21402140
struct crypt_keyslot_context *um1, *um2;
21412141

2142-
crypt_decode_key(key, vk_hex, key_size);
2143-
crypt_decode_key(key3, vk_hex2, key_size);
2142+
OK_(crypt_decode_key(key, vk_hex, key_size));
2143+
OK_(crypt_decode_key(key3, vk_hex2, key_size));
21442144

21452145
// init test devices
21462146
OK_(get_luks_offsets(0, key_size, params.data_alignment, 0, NULL, &r_payload_offset));
@@ -2245,7 +2245,7 @@ static void VolumeKeyGet(void)
22452245
uint64_t r_payload_offset;
22462246
struct crypt_keyslot_context *um1, *um2;
22472247

2248-
crypt_decode_key(key, vk_hex, key_size);
2248+
OK_(crypt_decode_key(key, vk_hex, key_size));
22492249

22502250
OK_(prepare_keyfile(KEYFILE1, PASSPHRASE1, strlen(PASSPHRASE1)));
22512251

0 commit comments

Comments
 (0)