From ab22910191bfbc2bd450e4e168254cae61c473d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= Date: Wed, 15 Apr 2015 11:53:16 +0200 Subject: [PATCH] Just use stdint.h even with MSVC --- ChangeLog | 1 + include/mbedtls/aes.h | 8 +------- include/mbedtls/bignum.h | 11 +---------- include/mbedtls/blowfish.h | 8 +------- include/mbedtls/camellia.h | 8 +------- include/mbedtls/des.h | 8 +------- include/mbedtls/gcm.h | 6 ------ include/mbedtls/md4.h | 8 +------- include/mbedtls/md5.h | 8 +------- include/mbedtls/net.h | 10 +--------- include/mbedtls/padlock.h | 7 +------ include/mbedtls/pkcs5.h | 8 +------- include/mbedtls/ripemd160.h | 8 +------- include/mbedtls/sha1.h | 8 +------- include/mbedtls/sha256.h | 8 +------- include/mbedtls/sha512.h | 7 +------ include/mbedtls/xtea.h | 8 +------- 17 files changed, 16 insertions(+), 114 deletions(-) diff --git a/ChangeLog b/ChangeLog index d3ce7e4b1..81bb3b6b4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -61,6 +61,7 @@ Default behavior changes custom config.h Changes + * The minimum MSVC version required is now 2010 (better C99 support). * The NET layer now unconditionnaly relies on getaddrinfo(). * Remove test program o_p_test, the script compat.sh does more. * Remove test program ssl_test, superseded by ssl-opt.sh. diff --git a/include/mbedtls/aes.h b/include/mbedtls/aes.h index a773c75e9..ffd6d3b6f 100644 --- a/include/mbedtls/aes.h +++ b/include/mbedtls/aes.h @@ -31,13 +31,7 @@ #endif #include - -#if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32) -#include -typedef UINT32 uint32_t; -#else -#include -#endif +#include /* padlock.c and aesni.c rely on these values! */ #define MBEDTLS_AES_ENCRYPT 1 diff --git a/include/mbedtls/bignum.h b/include/mbedtls/bignum.h index 88fc86ec2..84f47e113 100644 --- a/include/mbedtls/bignum.h +++ b/include/mbedtls/bignum.h @@ -31,21 +31,12 @@ #endif #include +#include #if defined(MBEDTLS_FS_IO) #include #endif -#if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32) -#include -typedef INT32 int32_t; -typedef INT64 int64_t; -typedef UINT32 uint32_t; -typedef UINT64 uint64_t; -#else -#include -#endif /* _MSC_VER && !EFIX64 && !EFI32 */ - #define MBEDTLS_ERR_MPI_FILE_IO_ERROR -0x0002 /**< An error occurred while reading from or writing to a file. */ #define MBEDTLS_ERR_MPI_BAD_INPUT_DATA -0x0004 /**< Bad input parameters to function. */ #define MBEDTLS_ERR_MPI_INVALID_CHARACTER -0x0006 /**< There is an invalid character in the digit string. */ diff --git a/include/mbedtls/blowfish.h b/include/mbedtls/blowfish.h index 0b7ee06d5..d69205866 100644 --- a/include/mbedtls/blowfish.h +++ b/include/mbedtls/blowfish.h @@ -31,13 +31,7 @@ #endif #include - -#if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32) -#include -typedef UINT32 uint32_t; -#else -#include -#endif +#include #define MBEDTLS_BLOWFISH_ENCRYPT 1 #define MBEDTLS_BLOWFISH_DECRYPT 0 diff --git a/include/mbedtls/camellia.h b/include/mbedtls/camellia.h index b724ed5db..c160341bb 100644 --- a/include/mbedtls/camellia.h +++ b/include/mbedtls/camellia.h @@ -31,13 +31,7 @@ #endif #include - -#if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32) -#include -typedef UINT32 uint32_t; -#else -#include -#endif +#include #define MBEDTLS_CAMELLIA_ENCRYPT 1 #define MBEDTLS_CAMELLIA_DECRYPT 0 diff --git a/include/mbedtls/des.h b/include/mbedtls/des.h index bee0921cd..753b3e01c 100644 --- a/include/mbedtls/des.h +++ b/include/mbedtls/des.h @@ -31,13 +31,7 @@ #endif #include - -#if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32) -#include -typedef UINT32 uint32_t; -#else -#include -#endif +#include #define MBEDTLS_DES_ENCRYPT 1 #define MBEDTLS_DES_DECRYPT 0 diff --git a/include/mbedtls/gcm.h b/include/mbedtls/gcm.h index b193e66b1..1e153f281 100644 --- a/include/mbedtls/gcm.h +++ b/include/mbedtls/gcm.h @@ -26,13 +26,7 @@ #include "cipher.h" -#if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32) -#include -typedef UINT32 uint32_t; -typedef UINT64 uint64_t; -#else #include -#endif #define MBEDTLS_GCM_ENCRYPT 1 #define MBEDTLS_GCM_DECRYPT 0 diff --git a/include/mbedtls/md4.h b/include/mbedtls/md4.h index d54b4c723..880c81d21 100644 --- a/include/mbedtls/md4.h +++ b/include/mbedtls/md4.h @@ -31,13 +31,7 @@ #endif #include - -#if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32) -#include -typedef UINT32 uint32_t; -#else -#include -#endif +#include #define MBEDTLS_ERR_MD4_FILE_IO_ERROR -0x0072 /**< Read/write error in file. */ diff --git a/include/mbedtls/md5.h b/include/mbedtls/md5.h index aeed2791f..0e2657027 100644 --- a/include/mbedtls/md5.h +++ b/include/mbedtls/md5.h @@ -31,13 +31,7 @@ #endif #include - -#if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32) -#include -typedef UINT32 uint32_t; -#else -#include -#endif +#include #define MBEDTLS_ERR_MD5_FILE_IO_ERROR -0x0074 /**< Read/write error in file. */ diff --git a/include/mbedtls/net.h b/include/mbedtls/net.h index f632958a5..85fa3e74a 100644 --- a/include/mbedtls/net.h +++ b/include/mbedtls/net.h @@ -31,15 +31,7 @@ #endif #include - -#if defined(MBEDTLS_HAVE_TIME) -#if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32) -#include -typedef UINT32 uint32_t; -#else -#include -#endif -#endif /* MBEDTLS_HAVE_TIME */ +#include #define MBEDTLS_ERR_NET_SOCKET_FAILED -0x0042 /**< Failed to open a socket. */ #define MBEDTLS_ERR_NET_CONNECT_FAILED -0x0044 /**< The connection to the given server / port failed. */ diff --git a/include/mbedtls/padlock.h b/include/mbedtls/padlock.h index 4d3134c9b..c3815832b 100644 --- a/include/mbedtls/padlock.h +++ b/include/mbedtls/padlock.h @@ -35,12 +35,7 @@ #define MBEDTLS_HAVE_X86 #endif -#if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32) -#include -typedef INT32 int32_t; -#else -#include -#endif +#include #define MBEDTLS_PADLOCK_RNG 0x000C #define MBEDTLS_PADLOCK_ACE 0x00C0 diff --git a/include/mbedtls/pkcs5.h b/include/mbedtls/pkcs5.h index f820d2258..9bbdde639 100644 --- a/include/mbedtls/pkcs5.h +++ b/include/mbedtls/pkcs5.h @@ -30,13 +30,7 @@ #include "md.h" #include - -#if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32) -#include -typedef UINT32 uint32_t; -#else -#include -#endif +#include #define MBEDTLS_ERR_PKCS5_BAD_INPUT_DATA -0x2f80 /**< Bad input parameters to function. */ #define MBEDTLS_ERR_PKCS5_INVALID_FORMAT -0x2f00 /**< Unexpected ASN.1 data. */ diff --git a/include/mbedtls/ripemd160.h b/include/mbedtls/ripemd160.h index 7a7726566..390584b6c 100644 --- a/include/mbedtls/ripemd160.h +++ b/include/mbedtls/ripemd160.h @@ -31,13 +31,7 @@ #endif #include - -#if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32) -#include -typedef UINT32 uint32_t; -#else -#include -#endif +#include #define MBEDTLS_ERR_RIPEMD160_FILE_IO_ERROR -0x007E /**< Read/write error in file. */ diff --git a/include/mbedtls/sha1.h b/include/mbedtls/sha1.h index 448c272b7..efaf90772 100644 --- a/include/mbedtls/sha1.h +++ b/include/mbedtls/sha1.h @@ -31,13 +31,7 @@ #endif #include - -#if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32) -#include -typedef UINT32 uint32_t; -#else -#include -#endif +#include #define MBEDTLS_ERR_SHA1_FILE_IO_ERROR -0x0076 /**< Read/write error in file. */ diff --git a/include/mbedtls/sha256.h b/include/mbedtls/sha256.h index eef07c553..e4a991fd3 100644 --- a/include/mbedtls/sha256.h +++ b/include/mbedtls/sha256.h @@ -31,13 +31,7 @@ #endif #include - -#if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32) -#include -typedef UINT32 uint32_t; -#else -#include -#endif +#include #define MBEDTLS_ERR_SHA256_FILE_IO_ERROR -0x0078 /**< Read/write error in file. */ diff --git a/include/mbedtls/sha512.h b/include/mbedtls/sha512.h index 55112ddb2..6c61cc36e 100644 --- a/include/mbedtls/sha512.h +++ b/include/mbedtls/sha512.h @@ -31,12 +31,7 @@ #endif #include - -#if defined(_MSC_VER) || defined(__WATCOMC__) - typedef unsigned __int64 uint64_t; -#else - #include -#endif +#include #define MBEDTLS_ERR_SHA512_FILE_IO_ERROR -0x007A /**< Read/write error in file. */ diff --git a/include/mbedtls/xtea.h b/include/mbedtls/xtea.h index 8adadafc0..1417eca03 100644 --- a/include/mbedtls/xtea.h +++ b/include/mbedtls/xtea.h @@ -31,13 +31,7 @@ #endif #include - -#if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32) -#include -typedef UINT32 uint32_t; -#else -#include -#endif +#include #define MBEDTLS_XTEA_ENCRYPT 1 #define MBEDTLS_XTEA_DECRYPT 0