summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2017-11-23 16:50:42 +0000
committerMatt Caswell <matt@openssl.org>2018-02-20 12:59:30 +0000
commit6207b1398327720a94d706e6e35bd7dc7eb8351a (patch)
treec729943297ac7469d1d8db1050895a58a2b8d938
parentca42a316a80d661752618cf3ec5143c2b92f3125 (diff)
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)
-rw-r--r--crypto/ec/curve448/arch_x86_64/arch_intrinsics.h2
-rw-r--r--crypto/ec/curve448/curve448utils.h2
-rw-r--r--crypto/ec/curve448/word.h4
3 files changed, 2 insertions, 6 deletions
diff --git a/crypto/ec/curve448/arch_x86_64/arch_intrinsics.h b/crypto/ec/curve448/arch_x86_64/arch_intrinsics.h
index 8fcf2c8dd4..9ecaefc73a 100644
--- 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
-#include <stdint.h>
+#include <openssl/e_os2.h>
/* 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 2487068856..a76754a012 100644
--- 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
-#include <stdint.h>
-#include <sys/types.h>
#include <openssl/e_os2.h>
#ifdef __cplusplus
diff --git a/crypto/ec/curve448/word.h b/crypto/ec/curve448/word.h
index 39ea949861..a73e910933 100644
--- a/crypto/ec/curve448/word.h
+++ b/crypto/ec/curve448/word.h
@@ -8,7 +8,7 @@
#include <string.h>
#include <assert.h>
-#include <stdint.h>
+#include <openssl/e_os2.h>
#include "arch_intrinsics.h"
#include "curve448utils.h"
@@ -24,8 +24,6 @@
#include "portable_endian.h"
#include <stdlib.h>
-#include <sys/types.h>
-#include <inttypes.h>
#if defined(__ARM_NEON__)
#include <arm_neon.h>