From: Jiasheng Jiang Date: Thu, 21 Mar 2024 19:55:34 +0000 (+0000) Subject: Replace unsigned with int X-Git-Tag: openssl-3.1.6~81 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a65986818682120092440b04405c90ead9c30e08;p=thirdparty%2Fopenssl.git Replace unsigned with int Replace the type of "digest_length" with int to avoid implicit conversion when it is assigned by EVP_MD_get_size(). Otherwise, it may pass the following check and cause the integer overflow error when EVP_MD_get_size() returns negative numbers. Signed-off-by: Jiasheng Jiang Reviewed-by: Matt Caswell Reviewed-by: Tom Cosgrove Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/23922) (cherry picked from commit f13ddaab69def0b453b75a8f2deb80e1f1634f42) --- diff --git a/demos/digest/EVP_MD_demo.c b/demos/digest/EVP_MD_demo.c index c7484e5665b..73838c01abc 100644 --- a/demos/digest/EVP_MD_demo.c +++ b/demos/digest/EVP_MD_demo.c @@ -83,7 +83,7 @@ int demonstrate_digest(void) const char *option_properties = NULL; EVP_MD *message_digest = NULL; EVP_MD_CTX *digest_context = NULL; - unsigned int digest_length; + int digest_length; unsigned char *digest_value = NULL; int j; diff --git a/demos/digest/EVP_MD_stdin.c b/demos/digest/EVP_MD_stdin.c index 099a7d2f69a..0e3a49edcbc 100644 --- a/demos/digest/EVP_MD_stdin.c +++ b/demos/digest/EVP_MD_stdin.c @@ -38,7 +38,7 @@ int demonstrate_digest(BIO *input) const char * option_properties = NULL; EVP_MD *message_digest = NULL; EVP_MD_CTX *digest_context = NULL; - unsigned int digest_length; + int digest_length; unsigned char *digest_value = NULL; unsigned char buffer[512]; int ii;