dotya.ml/ mkproof
2
0
Fork 0
mirror of https://git.sr.ht/~sircmpwn/mkproof synced 2024-06-09 05:06:06 +02:00
Code Releases Activity

Fixed compiler warnings about potential dangerous casts 

Casting unsigned long to uint32_t is not guaranteed to be a safe operation as a long int can also be 64 bit wide and very often it is 64 bit wide. This change silences a couple of compiler warnings I got while building the code.
This commit is contained in:
CodingMarkus 2017-03-21 19:21:00 +01:00 committed by GitHub
parent 6f5427fb67
commit 25d33df2e2
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/encoding.c
View File

@ -288,6 +288,19 @@ int decode_string(argon2_context *ctx, const char *str, argon2_type type) {
(x) = dec_x; \
} while ((void)0, 0)
/* Decoding prefix into uint32_t decimal */
#define DECIMAL_U32(x) \
do { \
unsigned long dec_x; \
str = decode_decimal(str, &dec_x); \
if (str == NULL || dec_x > UINT32_MAX) { \
return ARGON2_DECODING_FAIL; \
} \
(x) = (uint32_t)dec_x; \
} while ((void)0, 0)
/* Decoding base64 into a binary buffer */
#define BIN(buf, max_len, len) \
do { \
@ -315,14 +328,14 @@ int decode_string(argon2_context *ctx, const char *str, argon2_type type) {
/* Reading the version number if the default is suppressed */
ctx->version = ARGON2_VERSION_10;
CC_opt("$v=", DECIMAL(ctx->version));
CC_opt("$v=", DECIMAL_U32(ctx->version));
CC("$m=");
DECIMAL(ctx->m_cost);
DECIMAL_U32(ctx->m_cost);
CC(",t=");
DECIMAL(ctx->t_cost);
DECIMAL_U32(ctx->t_cost);
CC(",p=");
DECIMAL(ctx->lanes);
DECIMAL_U32(ctx->lanes);
ctx->threads = ctx->lanes;
CC("$");