From: Richard Levitte <levitte@openssl.org>
Date: Fri, 17 Mar 2023 15:56:11 +0000 (+0100)
Subject: providers/implementations/kdfs/argon2.c: Include openssl/e_os2.h instead of stdint.h
X-Git-Tag: openssl-3.2.0-alpha1~1143
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=46ce0854db51e373ab6ed4982431349107cd9b6d;p=thirdparty%2Fopenssl.git

providers/implementations/kdfs/argon2.c: Include openssl/e_os2.h instead of stdint.h

<stdint.h> may not exist with pre-C99 compilers.  <openssl/e_os2.h> deals
with that, so include it instead.

Similarly, include "internal/numbers.h" rather than <limits.h>, to deal
with things that may be lacking in the latter.

Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/20537)
---

diff --git a/providers/implementations/kdfs/argon2.c b/providers/implementations/kdfs/argon2.c
index 034c7e3003a..89947472c05 100644
--- a/providers/implementations/kdfs/argon2.c
+++ b/providers/implementations/kdfs/argon2.c
@@ -12,11 +12,9 @@
 
 #include <stdlib.h>
 #include <stddef.h>
-#include <stdint.h>
 #include <stdarg.h>
-#include <limits.h>
 #include <string.h>
-#include <crypto/evp.h>
+#include <openssl/e_os2.h>
 #include <openssl/evp.h>
 #include <openssl/objects.h>
 #include <openssl/crypto.h>
@@ -25,11 +23,12 @@
 #include <openssl/core_names.h>
 #include <openssl/params.h>
 #include <openssl/thread.h>
+#include <openssl/proverr.h>
 #include "internal/thread.h"
 #include "internal/numbers.h"
 #include "internal/endian.h"
+#include "crypto/evp.h"
 #include "prov/implementations.h"
-#include <openssl/proverr.h>
 #include "prov/provider_ctx.h"
 #include "prov/providercommon.h"
 #include "prov/blake2.h"