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

Fix various gcc compiler warnings in tests.

Browse Source
This commit is contained in:
Milan Broz
2018-12-03 13:47:43 +01:00
parent 0f5c3e107e
commit 9cbd36163c
3 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1495,6 +1495,8 @@ static void Tokens(void)
const char *dummy; const char *dummy;
const char *cipher = "aes"; const char *cipher = "aes";
const char *cipher_mode = "xts-plain64"; const char *cipher_mode = "xts-plain64";
char passptr[] = PASSPHRASE;
char passptr1[] = PASSPHRASE1;
static const crypt_token_handler th = { static const crypt_token_handler th = {
.name = "test_token", .name = "test_token",
@@ -1534,8 +1536,8 @@ static void Tokens(void)
FAIL_(crypt_token_json_set(cd, CRYPT_ANY_TOKEN, TEST_TOKEN_JSON_INVALID("\"0\"")), "Token validation failed"); FAIL_(crypt_token_json_set(cd, CRYPT_ANY_TOKEN, TEST_TOKEN_JSON_INVALID("\"0\"")), "Token validation failed");
EQ_(crypt_token_json_set(cd, CRYPT_ANY_TOKEN, TEST_TOKEN_JSON("\"0\"")), 0); EQ_(crypt_token_json_set(cd, CRYPT_ANY_TOKEN, TEST_TOKEN_JSON("\"0\"")), 0);
EQ_(crypt_token_status(cd, 0, NULL), CRYPT_TOKEN_EXTERNAL); EQ_(crypt_token_status(cd, 0, NULL), CRYPT_TOKEN_EXTERNAL);
EQ_(crypt_activate_by_token(cd, CDEVICE_1, 0, PASSPHRASE, 0), 0); EQ_(crypt_activate_by_token(cd, CDEVICE_1, 0, passptr, 0), 0);
FAIL_(crypt_activate_by_token(cd, CDEVICE_1, 0, PASSPHRASE, 0), "already active"); FAIL_(crypt_activate_by_token(cd, CDEVICE_1, 0, passptr, 0), "already active");
OK_(crypt_deactivate(cd, CDEVICE_1)); OK_(crypt_deactivate(cd, CDEVICE_1));
// write invalid token and verify that validate() can detect it after handler being registered // write invalid token and verify that validate() can detect it after handler being registered
@@ -1544,11 +1546,11 @@ static void Tokens(void)
EQ_(crypt_token_json_set(cd, CRYPT_ANY_TOKEN, TEST_TOKEN1_JSON("\"1\"")), 2); EQ_(crypt_token_json_set(cd, CRYPT_ANY_TOKEN, TEST_TOKEN1_JSON("\"1\"")), 2);
EQ_(crypt_token_status(cd, 2, &dummy), CRYPT_TOKEN_EXTERNAL_UNKNOWN); EQ_(crypt_token_status(cd, 2, &dummy), CRYPT_TOKEN_EXTERNAL_UNKNOWN);
OK_(strcmp(dummy, "test_token1")); OK_(strcmp(dummy, "test_token1"));
FAIL_(crypt_activate_by_token(cd, CDEVICE_1, 1, PASSPHRASE1, 0), "Unknown token handler"); FAIL_(crypt_activate_by_token(cd, CDEVICE_1, 1, passptr1, 0), "Unknown token handler");
FAIL_(crypt_activate_by_token(cd, CDEVICE_1, 2, PASSPHRASE1, 0), "Unknown token handler"); FAIL_(crypt_activate_by_token(cd, CDEVICE_1, 2, passptr1, 0), "Unknown token handler");
OK_(crypt_token_register(&th3)); OK_(crypt_token_register(&th3));
FAIL_(crypt_activate_by_token(cd, CDEVICE_1, 1, PASSPHRASE1, 0), "Token validation failed"); FAIL_(crypt_activate_by_token(cd, CDEVICE_1, 1, passptr1, 0), "Token validation failed");
EQ_(crypt_activate_by_token(cd, CDEVICE_1, 2, PASSPHRASE1, 0), 1); EQ_(crypt_activate_by_token(cd, CDEVICE_1, 2, passptr1, 0), 1);
OK_(crypt_deactivate(cd, CDEVICE_1)); OK_(crypt_deactivate(cd, CDEVICE_1));
// test crypt_token_json_get returns correct token id // test crypt_token_json_get returns correct token id
@@ -1556,10 +1558,10 @@ static void Tokens(void)
// exercise assign/unassign keyslots API // exercise assign/unassign keyslots API
EQ_(crypt_token_unassign_keyslot(cd, 2, 1), 2); EQ_(crypt_token_unassign_keyslot(cd, 2, 1), 2);
FAIL_(crypt_activate_by_token(cd, CDEVICE_1, 2, PASSPHRASE1, 0), "Token assigned to no keyslot"); FAIL_(crypt_activate_by_token(cd, CDEVICE_1, 2, passptr1, 0), "Token assigned to no keyslot");
EQ_(crypt_token_assign_keyslot(cd, 2, 0), 2); EQ_(crypt_token_assign_keyslot(cd, 2, 0), 2);
FAIL_(crypt_activate_by_token(cd, CDEVICE_1, 2, PASSPHRASE1, 0), "Wrong passphrase"); FAIL_(crypt_activate_by_token(cd, CDEVICE_1, 2, passptr1, 0), "Wrong passphrase");
EQ_(crypt_activate_by_token(cd, CDEVICE_1, 2, PASSPHRASE, 0), 0); EQ_(crypt_activate_by_token(cd, CDEVICE_1, 2, passptr, 0), 0);
OK_(crypt_deactivate(cd, CDEVICE_1)); OK_(crypt_deactivate(cd, CDEVICE_1));
EQ_(crypt_token_json_set(cd, 1, NULL), 1); EQ_(crypt_token_json_set(cd, 1, NULL), 1);
FAIL_(crypt_token_json_get(cd, 1, &dummy), "Token is not there"); FAIL_(crypt_token_json_get(cd, 1, &dummy), "Token is not there");
@@ -1571,31 +1573,31 @@ static void Tokens(void)
EQ_(crypt_token_assign_keyslot(cd, 2, 0), 2); EQ_(crypt_token_assign_keyslot(cd, 2, 0), 2);
EQ_(crypt_token_assign_keyslot(cd, 0, 3), 0); EQ_(crypt_token_assign_keyslot(cd, 0, 3), 0);
EQ_(crypt_activate_by_token(cd, NULL, 2, PASSPHRASE, 0), 0); EQ_(crypt_activate_by_token(cd, NULL, 2, passptr, 0), 0);
EQ_(crypt_activate_by_token(cd, NULL, 0, PASSPHRASE1, CRYPT_ACTIVATE_ALLOW_UNBOUND_KEY), 3); EQ_(crypt_activate_by_token(cd, NULL, 0, passptr1, CRYPT_ACTIVATE_ALLOW_UNBOUND_KEY), 3);
// FIXME: useless error message here (or missing one to be specific) // FIXME: useless error message here (or missing one to be specific)
FAIL_(crypt_activate_by_token(cd, CDEVICE_1, 0, PASSPHRASE1, 0), "No volume key available in token keyslots"); FAIL_(crypt_activate_by_token(cd, CDEVICE_1, 0, passptr1, 0), "No volume key available in token keyslots");
EQ_(crypt_activate_by_token(cd, CDEVICE_1, 2, PASSPHRASE, 0), 0); EQ_(crypt_activate_by_token(cd, CDEVICE_1, 2, passptr, 0), 0);
OK_(crypt_deactivate(cd, CDEVICE_1)); OK_(crypt_deactivate(cd, CDEVICE_1));
EQ_(crypt_token_assign_keyslot(cd, 0, 1), 0); EQ_(crypt_token_assign_keyslot(cd, 0, 1), 0);
OK_(crypt_token_is_assigned(cd, 0, 1)); OK_(crypt_token_is_assigned(cd, 0, 1));
EQ_(crypt_activate_by_token(cd, CDEVICE_1, 0, PASSPHRASE1, 0), 1); EQ_(crypt_activate_by_token(cd, CDEVICE_1, 0, passptr1, 0), 1);
OK_(crypt_deactivate(cd, CDEVICE_1)); OK_(crypt_deactivate(cd, CDEVICE_1));
EQ_(crypt_token_assign_keyslot(cd, 2, 3), 2); EQ_(crypt_token_assign_keyslot(cd, 2, 3), 2);
OK_(crypt_token_is_assigned(cd, 2, 3)); OK_(crypt_token_is_assigned(cd, 2, 3));
EQ_(crypt_activate_by_token(cd, NULL, 2, PASSPHRASE, 0), 0); EQ_(crypt_activate_by_token(cd, NULL, 2, passptr, 0), 0);
EQ_(crypt_activate_by_token(cd, CDEVICE_1, 2, PASSPHRASE, 0), 0); EQ_(crypt_activate_by_token(cd, CDEVICE_1, 2, passptr, 0), 0);
OK_(crypt_deactivate(cd, CDEVICE_1)); OK_(crypt_deactivate(cd, CDEVICE_1));
#ifdef KERNEL_KEYRING #ifdef KERNEL_KEYRING
if (t_dm_crypt_keyring_support()) { if (t_dm_crypt_keyring_support()) {
EQ_(crypt_activate_by_token(cd, NULL, 2, PASSPHRASE, CRYPT_ACTIVATE_KEYRING_KEY), 0); EQ_(crypt_activate_by_token(cd, NULL, 2, passptr, CRYPT_ACTIVATE_KEYRING_KEY), 0);
OK_(_volume_key_in_keyring(cd, 0)); OK_(_volume_key_in_keyring(cd, 0));
} }
OK_(crypt_volume_key_keyring(cd, 0)); OK_(crypt_volume_key_keyring(cd, 0));
#endif #endif
FAIL_(crypt_activate_by_token(cd, NULL, 2, PASSPHRASE, CRYPT_ACTIVATE_KEYRING_KEY), "Can't use keyring when disabled in library"); FAIL_(crypt_activate_by_token(cd, NULL, 2, passptr, CRYPT_ACTIVATE_KEYRING_KEY), "Can't use keyring when disabled in library");
OK_(crypt_volume_key_keyring(cd, 1)); OK_(crypt_volume_key_keyring(cd, 1));
EQ_(crypt_token_luks2_keyring_set(cd, 5, &params), 5); EQ_(crypt_token_luks2_keyring_set(cd, 5, &params), 5);

10
tests/crypto-vectors.c
View File

@@ -432,7 +432,7 @@ static int pbkdf_test_vectors(void)
} }
const char* get_vec(struct hash_out* out, int i) static const char* get_vec(struct hash_out* out, int i)
{ {
switch (i) { switch (i) {
case 0: case 0:
@@ -467,7 +467,7 @@ static int hash_test(void)
// CRC32 vector test // CRC32 vector test
printf("Hash vector %02d: [CRC32]", i); printf("Hash vector %02d: [CRC32]", i);
crc32 = crypt_crc32(~0, in_vec->buffer, in_vec->length) ^ ~0; crc32 = crypt_crc32(~0, (const unsigned char*)in_vec->buffer, in_vec->length) ^ ~0;
if (crc32 != out_vec->crc32_out) { if (crc32 != out_vec->crc32_out) {
printf("expected output [FAILED].\n"); printf("expected output [FAILED].\n");
printf(" got: %x\n", crc32); printf(" got: %x\n", crc32);
@@ -516,7 +516,7 @@ static int hash_test(void)
return 0; return 0;
} }
const char* get_hmac_res(struct hmac_test_vector* out, int i) static const char* get_hmac_res(struct hmac_test_vector* out, int i)
{ {
switch (i) { switch (i) {
case 0: case 0:
@@ -536,8 +536,8 @@ static int hmac_test(void)
struct crypt_hmac *hmac; struct crypt_hmac *hmac;
struct hmac_test_vector *vector; struct hmac_test_vector *vector;
struct crypt_hash *h; struct crypt_hash *h;
unsigned int hmac_length; unsigned int i, j;
int i, j, r; int hmac_length, r;
char result[64]; char result[64];
char key[MAX_BLOCK_SIZE]; char key[MAX_BLOCK_SIZE];

2
tests/test_utils.c
View File

@@ -254,7 +254,7 @@ int crypt_decode_key(char *key, const char *hex, unsigned int size)
void global_log_callback(int level, const char *msg, void *usrptr) void global_log_callback(int level, const char *msg, void *usrptr)
{ {
int len; size_t len;
if (_debug) { if (_debug) {
if (level == CRYPT_LOG_DEBUG) if (level == CRYPT_LOG_DEBUG)