From 49edbe184bd05ce5ed0372cd2f1ebf3942d19e78 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Wed, 11 Sep 2019 20:18:26 -0700 Subject: [PATCH] Avoid narrowing errors C++ with -Wnarrowing complains about these. --- src/modules/module_06400.c | 2 +- src/modules/module_06500.c | 2 +- src/modules/module_06700.c | 2 +- src/modules/module_14600.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/modules/module_06400.c b/src/modules/module_06400.c index ad4e7273a..51ed05522 100644 --- a/src/modules/module_06400.c +++ b/src/modules/module_06400.c @@ -311,7 +311,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE const u8 *iter_pos = token.buf[1]; - char salt_iter[3] = { iter_pos[0], iter_pos[1], 0 }; + u8 salt_iter[3] = { iter_pos[0], iter_pos[1], 0 }; salt->salt_sign[0] = hc_strtoul ((const char *) salt_iter, NULL, 10); diff --git a/src/modules/module_06500.c b/src/modules/module_06500.c index 011a3f5bf..a8c51fd28 100644 --- a/src/modules/module_06500.c +++ b/src/modules/module_06500.c @@ -462,7 +462,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE const u8 *iter_pos = token.buf[1]; - char salt_iter[3] = { iter_pos[0], iter_pos[1], 0 }; + u8 salt_iter[3] = { iter_pos[0], iter_pos[1], 0 }; salt->salt_sign[0] = hc_strtoul ((const char *) salt_iter, NULL, 10); diff --git a/src/modules/module_06700.c b/src/modules/module_06700.c index 25cf31f8c..2fc10a247 100644 --- a/src/modules/module_06700.c +++ b/src/modules/module_06700.c @@ -224,7 +224,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE const u8 *iter_pos = token.buf[1]; - char salt_iter[3] = { iter_pos[0], iter_pos[1], 0 }; + u8 salt_iter[3] = { iter_pos[0], iter_pos[1], 0 }; salt->salt_sign[0] = hc_strtoul ((const char *) salt_iter, NULL, 10); diff --git a/src/modules/module_14600.c b/src/modules/module_14600.c index 74c962be4..46d30eb20 100644 --- a/src/modules/module_14600.c +++ b/src/modules/module_14600.c @@ -61,7 +61,7 @@ const char *module_st_pass (MAYBE_UNUSED const hashconfig_t *hashconfig, #define LUKS_KEY_ENABLED 0x00AC71F3 #define LUKS_STRIPES 4000 // partition header starts with magic -#define LUKS_MAGIC {'L','U','K','S', 0xba, 0xbe}; +#define LUKS_MAGIC {'L','U','K','S', (char) 0xba, (char) 0xbe}; #define LUKS_MAGIC_L 6 /* Actually we need only 37, but we don't want struct autoaligning to kick in */ #define UUID_STRING_L 40