From 788d8d01786292e1fbe7791cf859b005bbd8513b Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Tue, 10 Feb 2015 19:34:11 +0100 Subject: [PATCH] Make bin2hex() code consistent with hex2bin() --- src/libsodium/sodium/utils.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libsodium/sodium/utils.c b/src/libsodium/sodium/utils.c index 9c844c6e..0ef05abd 100644 --- a/src/libsodium/sodium/utils.c +++ b/src/libsodium/sodium/utils.c @@ -108,14 +108,14 @@ sodium_bin2hex(char * const hex, const size_t hex_maxlen, while (i < bin_len) { c = bin[i] & 0xf; b = bin[i] >> 4; - x = (unsigned char) (87 + c + (((c - 10) >> 31) & -39)) << 8 | - (unsigned char) (87 + b + (((b - 10) >> 31) & -39)); + x = (unsigned char) (87U + c + (((c - 10U) >> 8) & ~38U)) << 8 | + (unsigned char) (87U + b + (((b - 10U) >> 8) & ~38U)); hex[i * 2U] = (char) x; x >>= 8; hex[i * 2U + 1U] = (char) x; i++; } - hex[i * 2U] = 0; + hex[i * 2U] = 0U; return hex; }