Merge pull request #2190 from neheb/narrow

Avoid narrowing errors
pull/2216/head
Jens Steube 5 years ago committed by GitHub
commit 30f0745252
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -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);

@ -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);

@ -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);

@ -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

Loading…
Cancel
Save