Remove inclusion of header files that we can't rely on due to portability

Some non-portable includes are left because they are already suitably
guarded.

Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
(Merged from https://github.com/openssl/openssl/pull/5105)

diff --git a/crypto/ec/curve448/arch_x86_64/arch_intrinsics.h b/crypto/ec/curve448/arch_x86_64/arch_intrinsics.h
index 8fcf2c8dd4a5c5602d99c6b45755e3940eaf185c..9ecaefc73abaae2ae467a4ac4b4dc56d0c57daf8 100644 (file)
--- a/crypto/ec/curve448/arch_x86_64/arch_intrinsics.h
+++ b/crypto/ec/curve448/arch_x86_64/arch_intrinsics.h
@@ -7,7 +7,7 @@
 
 #define ARCH_WORD_BITS 64
 
 
 #define ARCH_WORD_BITS 64
 

-#include <stdint.h>
+#include <openssl/e_os2.h>

 
 /* FUTURE: autogenerate */
 static __inline__ __uint128_t widemul(const uint64_t *a, const uint64_t *b) {
 
 /* FUTURE: autogenerate */
 static __inline__ __uint128_t widemul(const uint64_t *a, const uint64_t *b) {

diff --git a/crypto/ec/curve448/curve448utils.h b/crypto/ec/curve448/curve448utils.h
index 2487068856bed1b0095505843d197af7342c11b4..a76754a012046c23c865b451bf00ebeba8245e27 100644 (file)
--- a/crypto/ec/curve448/curve448utils.h
+++ b/crypto/ec/curve448/curve448utils.h
@@ -12,8 +12,6 @@
 #ifndef __DECAF_COMMON_H__
 #define __DECAF_COMMON_H__ 1
 
 #ifndef __DECAF_COMMON_H__
 #define __DECAF_COMMON_H__ 1
 

-#include <stdint.h>
-#include <sys/types.h>

 #include <openssl/e_os2.h>
 
 #ifdef __cplusplus
 #include <openssl/e_os2.h>
 
 #ifdef __cplusplus

diff --git a/crypto/ec/curve448/word.h b/crypto/ec/curve448/word.h
index 39ea949861d1ddc2982c48b83b7fa2f0371995fa..a73e910933ab6a7e4700ec526823b6849a68741f 100644 (file)
--- a/crypto/ec/curve448/word.h
+++ b/crypto/ec/curve448/word.h
@@ -8,7 +8,7 @@
 #include <string.h>
 
 #include <assert.h>
 #include <string.h>
 
 #include <assert.h>

-#include <stdint.h>
+#include <openssl/e_os2.h>

 #include "arch_intrinsics.h"
 
 #include "curve448utils.h"
 #include "arch_intrinsics.h"
 
 #include "curve448utils.h"


@@ -24,8 +24,6 @@
 #include "portable_endian.h"
 
 #include <stdlib.h>
 #include "portable_endian.h"
 
 #include <stdlib.h>

-#include <sys/types.h>
-#include <inttypes.h>

 
 #if defined(__ARM_NEON__)
 #include <arm_neon.h>
 
 #if defined(__ARM_NEON__)
 #include <arm_neon.h>