From 235f9329304ab9e75e43dc5a409901fc3b3de9ca Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Mon, 18 Apr 2016 15:12:58 +0100 Subject: Unsigned chars can't be negative Fix a problem where an unsigned char was being checked to see if it was negative. Reviewed-by: Richard Levitte --- crypto/o_str.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/crypto/o_str.c b/crypto/o_str.c index 9811e2df2b..660226fcec 100644 --- a/crypto/o_str.c +++ b/crypto/o_str.c @@ -243,6 +243,7 @@ unsigned char *OPENSSL_hexstr2buf(const char *str, long *len) { unsigned char *hexbuf, *q; unsigned char ch, cl; + int chi, cli; const unsigned char *p; size_t s; @@ -262,14 +263,14 @@ unsigned char *OPENSSL_hexstr2buf(const char *str, long *len) OPENSSL_free(hexbuf); return NULL; } - cl = OPENSSL_hexchar2int(cl); - ch = OPENSSL_hexchar2int(ch); - if (cl < 0 || ch < 0) { + cli = OPENSSL_hexchar2int(cl); + chi = OPENSSL_hexchar2int(ch); + if (cli < 0 || chi < 0) { OPENSSL_free(hexbuf); CRYPTOerr(CRYPTO_F_OPENSSL_HEXSTR2BUF, CRYPTO_R_ILLEGAL_HEX_DIGIT); return NULL; } - *q++ = (ch << 4) | cl; + *q++ = (unsigned char)((chi << 4) | cli); } if (len) -- cgit v1.2.3