From ab5185239e71723945f9c9ffdf613c5c3fff59a4 Mon Sep 17 00:00:00 2001 From: Vlad Gheorghiu Date: Tue, 30 Jan 2018 16:44:25 -0500 Subject: [PATCH] refactored if defined WINDOWS to if defined _WIN32 --- src/common/common.c | 4 ++-- src/common/common.h | 2 +- src/common/oqs.h | 2 +- src/crypto/rand/rand.c | 10 +++++----- src/crypto/rand_urandom_aesctr/rand_urandom_aesctr.c | 4 ++-- .../rand_urandom_chacha20/rand_urandom_chacha20.c | 6 +++--- src/crypto/sha3/sha3.c | 2 +- src/ds_benchmark.h | 6 +++--- src/kex/kex.h | 2 +- src/kex/test_kex.c | 2 +- src/kex_code_mcbits/kex_code_mcbits.c | 4 ++-- src/kex_lwe_frodo/kex_lwe_frodo.c | 2 +- src/kex_lwe_frodo/kex_lwe_frodo_macrify.c | 2 +- src/kex_lwe_frodo/lwe_noise.c | 2 +- src/kex_ntru/kex_ntru.c | 4 ++-- src/kex_rlwe_bcns15/kex_rlwe_bcns15.c | 4 ++-- src/kex_rlwe_bcns15/rlwe.c | 2 +- src/kex_rlwe_msrln16/kex_rlwe_msrln16.c | 4 ++-- src/kex_rlwe_newhope/kex_rlwe_newhope.c | 4 ++-- src/kex_rlwe_newhope/params.h | 2 +- src/kex_rlwe_newhope/poly.c | 2 +- src/kex_sidh_msr/P503/P503_api.h | 2 +- src/kex_sidh_msr/P751/P751_api.h | 2 +- src/kex_sidh_msr/config.h | 2 +- src/kex_sidh_msr/kex_sidh_msr.c | 8 ++++---- src/kex_sidh_msr/windows_undef.h | 2 +- src/sig/test_sig.c | 2 +- 27 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/common/common.c b/src/common/common.c index 7b3219cfd..24a53b305 100644 --- a/src/common/common.c +++ b/src/common/common.c @@ -4,12 +4,12 @@ #include #include -#if defined(WINDOWS) +#if defined(_WIN32) #include #endif void OQS_MEM_cleanse(void *ptr, size_t len) { -#if defined(WINDOWS) +#if defined(_WIN32) SecureZeroMemory(ptr, len); #elif defined(HAVE_MEMSET_S) if (0U < len && memset_s(ptr, (rsize_t) len, 0, (rsize_t) len) != 0) { diff --git a/src/common/common.h b/src/common/common.h index f2a1d7ebe..307c29c3b 100644 --- a/src/common/common.h +++ b/src/common/common.h @@ -24,7 +24,7 @@ void OQS_MEM_secure_free(void *ptr, size_t len); #define eprintf(...) fprintf(stderr, __VA_ARGS__); #endif -#if defined(WINDOWS) +#if defined(_WIN32) #define UNUSED // __attribute__ not supported in VS #else diff --git a/src/common/oqs.h b/src/common/oqs.h index 46933fcc3..fd35eef82 100644 --- a/src/common/oqs.h +++ b/src/common/oqs.h @@ -8,7 +8,7 @@ #include #include -#if !defined(WINDOWS) +#if !defined(_WIN32) #include #endif diff --git a/src/crypto/rand/rand.c b/src/crypto/rand/rand.c index ca058936c..5e0bd6e7e 100644 --- a/src/crypto/rand/rand.c +++ b/src/crypto/rand/rand.c @@ -1,7 +1,7 @@ #include #include #include -#if defined(WINDOWS) +#if defined(_WIN32) #include #include #else @@ -50,7 +50,7 @@ void OQS_RAND_free(OQS_RAND *r) { } } -#if !defined(WINDOWS) +#if !defined(_WIN32) /* For some reason specifying inline results in a build error */ inline #endif @@ -147,7 +147,7 @@ void OQS_RAND_report_statistics(const unsigned long occurrences[256], const char OQS_STATUS OQS_RAND_get_system_entropy(uint8_t *buf, size_t n) { OQS_STATUS result = OQS_ERROR; -#if !defined(WINDOWS) +#if !defined(_WIN32) int fd = 0; #endif @@ -155,7 +155,7 @@ OQS_STATUS OQS_RAND_get_system_entropy(uint8_t *buf, size_t n) { goto err; } -#if defined(WINDOWS) +#if defined(_WIN32) HCRYPTPROV hCryptProv; if (!CryptAcquireContext(&hCryptProv, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT) || !CryptGenRandom(hCryptProv, (DWORD) n, buf)) { @@ -174,7 +174,7 @@ OQS_STATUS OQS_RAND_get_system_entropy(uint8_t *buf, size_t n) { result = OQS_SUCCESS; err: -#if !defined(WINDOWS) +#if !defined(_WIN32) if (fd > 0) { close(fd); } diff --git a/src/crypto/rand_urandom_aesctr/rand_urandom_aesctr.c b/src/crypto/rand_urandom_aesctr/rand_urandom_aesctr.c index 68d980ef2..7e0bee675 100644 --- a/src/crypto/rand_urandom_aesctr/rand_urandom_aesctr.c +++ b/src/crypto/rand_urandom_aesctr/rand_urandom_aesctr.c @@ -1,5 +1,5 @@ #include -#if defined(WINDOWS) +#if defined(_WIN32) #include #include #else @@ -18,7 +18,7 @@ #include #include -#if defined(WINDOWS) +#if defined(_WIN32) #define strdup _strdup // for strdup deprecation warning #endif diff --git a/src/crypto/rand_urandom_chacha20/rand_urandom_chacha20.c b/src/crypto/rand_urandom_chacha20/rand_urandom_chacha20.c index 0d1b4402f..9867f5aa4 100644 --- a/src/crypto/rand_urandom_chacha20/rand_urandom_chacha20.c +++ b/src/crypto/rand_urandom_chacha20/rand_urandom_chacha20.c @@ -1,9 +1,9 @@ -#if defined(WINDOWS) +#if defined(_WIN32) #pragma warning(disable : 4267) #endif #include -#if defined(WINDOWS) +#if defined(_WIN32) #include #include #else @@ -21,7 +21,7 @@ #include "external/chacha20.c" -#if defined(WINDOWS) +#if defined(_WIN32) #define strdup _strdup // for strdup deprecation warning #endif diff --git a/src/crypto/sha3/sha3.c b/src/crypto/sha3/sha3.c index 1c229e6bc..beb5790a9 100644 --- a/src/crypto/sha3/sha3.c +++ b/src/crypto/sha3/sha3.c @@ -5,7 +5,7 @@ * from https://twitter.com/tweetfips202 * by Gilles Van Assche, Daniel J. Bernstein, and Peter Schwabe */ -#if defined(WINDOWS) +#if defined(_WIN32) #pragma warning(disable : 4244) #endif diff --git a/src/ds_benchmark.h b/src/ds_benchmark.h index fc9efb02b..ad26b2ed8 100644 --- a/src/ds_benchmark.h +++ b/src/ds_benchmark.h @@ -86,13 +86,13 @@ PRINT_TIMER_FOOTER #include #include #include -#if !defined(WINDOWS) +#if !defined(_WIN32) #include #endif #include #include -#if defined(WINDOWS) +#if defined(_WIN32) #include int gettimeofday(struct timeval *tp, struct timezone *tzp) { @@ -114,7 +114,7 @@ int gettimeofday(struct timeval *tp, struct timezone *tzp) { #endif static uint64_t rdtsc(void) { -#if defined(WINDOWS) +#if defined(_WIN32) return __rdtsc(); #elif defined(__aarch64__) uint64_t x; diff --git a/src/kex/kex.h b/src/kex/kex.h index 69d0a0e61..d110a10d7 100644 --- a/src/kex/kex.h +++ b/src/kex/kex.h @@ -12,7 +12,7 @@ #include #include -#if !defined(WINDOWS) +#if !defined(_WIN32) #include #endif diff --git a/src/kex/test_kex.c b/src/kex/test_kex.c index b2aeab732..456e181af 100644 --- a/src/kex/test_kex.c +++ b/src/kex/test_kex.c @@ -1,4 +1,4 @@ -#if defined(WINDOWS) +#if defined(_WIN32) #pragma warning(disable : 4244 4293) #endif diff --git a/src/kex_code_mcbits/kex_code_mcbits.c b/src/kex_code_mcbits/kex_code_mcbits.c index 5dcb03517..8743d8d69 100644 --- a/src/kex_code_mcbits/kex_code_mcbits.c +++ b/src/kex_code_mcbits/kex_code_mcbits.c @@ -2,7 +2,7 @@ #include #include -#if !defined(WINDOWS) +#if !defined(_WIN32) #include #include #endif @@ -14,7 +14,7 @@ #include "kex_code_mcbits.h" #include "mcbits.h" -#if defined(WINDOWS) +#if defined(_WIN32) #define strdup _strdup // for strdup deprecation warning #endif diff --git a/src/kex_lwe_frodo/kex_lwe_frodo.c b/src/kex_lwe_frodo/kex_lwe_frodo.c index bfcf24920..d06ea4761 100644 --- a/src/kex_lwe_frodo/kex_lwe_frodo.c +++ b/src/kex_lwe_frodo/kex_lwe_frodo.c @@ -1,6 +1,6 @@ #include #include -#if !defined(WINDOWS) +#if !defined(_WIN32) #include #include #endif diff --git a/src/kex_lwe_frodo/kex_lwe_frodo_macrify.c b/src/kex_lwe_frodo/kex_lwe_frodo_macrify.c index 712c7bfc4..3f683c107 100644 --- a/src/kex_lwe_frodo/kex_lwe_frodo_macrify.c +++ b/src/kex_lwe_frodo/kex_lwe_frodo_macrify.c @@ -1,4 +1,4 @@ -#if defined(WINDOWS) +#if defined(_WIN32) #define strdup _strdup // for strdup deprecation warning #endif diff --git a/src/kex_lwe_frodo/lwe_noise.c b/src/kex_lwe_frodo/lwe_noise.c index 4dc4dc4ce..e2f82eb7f 100644 --- a/src/kex_lwe_frodo/lwe_noise.c +++ b/src/kex_lwe_frodo/lwe_noise.c @@ -11,7 +11,7 @@ #define RECOMMENDED_N_ARRAY_SIZE (752 * 8) #define RECOMMENDED_CDF_TABLE_LEN 6 -#if defined(WINDOWS) +#if defined(_WIN32) // VS complains about arrays initialized with const param. On Windows, // we use directly the recommended value passed down from calling functions. // Currently there is only one set of params, so that works. Need to fix this diff --git a/src/kex_ntru/kex_ntru.c b/src/kex_ntru/kex_ntru.c index 04083ecc0..9f741abea 100644 --- a/src/kex_ntru/kex_ntru.c +++ b/src/kex_ntru/kex_ntru.c @@ -1,7 +1,7 @@ #ifndef DISABLE_NTRU_ON_WINDOWS_BY_DEFAULT #include -#if defined(WINDOWS) +#if defined(_WIN32) #include #include #else @@ -15,7 +15,7 @@ #include -#if defined(WINDOWS) +#if defined(_WIN32) #define strdup _strdup // for strdup deprecation warning #endif diff --git a/src/kex_rlwe_bcns15/kex_rlwe_bcns15.c b/src/kex_rlwe_bcns15/kex_rlwe_bcns15.c index ed606ba18..18b828801 100644 --- a/src/kex_rlwe_bcns15/kex_rlwe_bcns15.c +++ b/src/kex_rlwe_bcns15/kex_rlwe_bcns15.c @@ -1,6 +1,6 @@ #include #include -#if !defined(WINDOWS) +#if !defined(_WIN32) #include #include #endif @@ -14,7 +14,7 @@ #include "rlwe_a.h" -#if defined(WINDOWS) +#if defined(_WIN32) #define strdup _strdup // for strdup deprecation warning #endif diff --git a/src/kex_rlwe_bcns15/rlwe.c b/src/kex_rlwe_bcns15/rlwe.c index f6fc5ac4c..51970207c 100644 --- a/src/kex_rlwe_bcns15/rlwe.c +++ b/src/kex_rlwe_bcns15/rlwe.c @@ -8,7 +8,7 @@ * See LICENSE for complete information. */ -#if defined(WINDOWS) +#if defined(_WIN32) #pragma warning(disable : 4146 4244 4267) #endif diff --git a/src/kex_rlwe_msrln16/kex_rlwe_msrln16.c b/src/kex_rlwe_msrln16/kex_rlwe_msrln16.c index 325d26310..28de31c7b 100644 --- a/src/kex_rlwe_msrln16/kex_rlwe_msrln16.c +++ b/src/kex_rlwe_msrln16/kex_rlwe_msrln16.c @@ -1,6 +1,6 @@ #include #include -#if !defined(WINDOWS) +#if !defined(_WIN32) #include #include #endif @@ -13,7 +13,7 @@ #include "LatticeCrypto_priv.h" #include "kex_rlwe_msrln16.h" -#if defined(WINDOWS) +#if defined(_WIN32) #define strdup _strdup // for strdup deprecation warning #endif diff --git a/src/kex_rlwe_newhope/kex_rlwe_newhope.c b/src/kex_rlwe_newhope/kex_rlwe_newhope.c index 41785878f..02df03585 100644 --- a/src/kex_rlwe_newhope/kex_rlwe_newhope.c +++ b/src/kex_rlwe_newhope/kex_rlwe_newhope.c @@ -1,6 +1,6 @@ #include #include -#if !defined(WINDOWS) +#if !defined(_WIN32) #include #include #endif @@ -13,7 +13,7 @@ #include "newhope.c" #include "params.h" -#if defined(WINDOWS) +#if defined(_WIN32) #define strdup _strdup // for strdup deprecation warning #endif diff --git a/src/kex_rlwe_newhope/params.h b/src/kex_rlwe_newhope/params.h index 932770e4d..47023ccbd 100644 --- a/src/kex_rlwe_newhope/params.h +++ b/src/kex_rlwe_newhope/params.h @@ -21,7 +21,7 @@ extern uint16_t omegas_inv_montgomery[]; extern uint16_t psis_inv_montgomery[]; extern uint16_t psis_bitrev_montgomery[]; -#if defined(WINDOWS) +#if defined(_WIN32) typedef unsigned __int16 uint16_t; #endif diff --git a/src/kex_rlwe_newhope/poly.c b/src/kex_rlwe_newhope/poly.c index ca5014e96..761ccd8d2 100644 --- a/src/kex_rlwe_newhope/poly.c +++ b/src/kex_rlwe_newhope/poly.c @@ -4,7 +4,7 @@ typedef struct { uint16_t coeffs[PARAM_N]; -#if defined(WINDOWS) +#if defined(_WIN32) } poly; #else } poly __attribute__((aligned(32))); diff --git a/src/kex_sidh_msr/P503/P503_api.h b/src/kex_sidh_msr/P503/P503_api.h index 21162e4ac..a7caa193e 100644 --- a/src/kex_sidh_msr/P503/P503_api.h +++ b/src/kex_sidh_msr/P503/P503_api.h @@ -9,7 +9,7 @@ #include -#if defined(WINDOWS) +#if defined(_WIN32) #include "../windows_undef.h" #endif diff --git a/src/kex_sidh_msr/P751/P751_api.h b/src/kex_sidh_msr/P751/P751_api.h index a56463d1b..65b6c397e 100644 --- a/src/kex_sidh_msr/P751/P751_api.h +++ b/src/kex_sidh_msr/P751/P751_api.h @@ -9,7 +9,7 @@ #include -#if defined(WINDOWS) +#if defined(_WIN32) #include "../windows_undef.h" #endif diff --git a/src/kex_sidh_msr/config.h b/src/kex_sidh_msr/config.h index a0c86d13b..8098611da 100644 --- a/src/kex_sidh_msr/config.h +++ b/src/kex_sidh_msr/config.h @@ -22,7 +22,7 @@ #define OS_WIN 1 #define OS_LINUX 2 /* -#if defined(__WINDOWS__) // Microsoft Windows OS +#if defined(_WIN32) // Microsoft Windows OS #define OS_TARGET OS_WIN #elif defined(__LINUX__) // Linux OS #define OS_TARGET OS_LINUX diff --git a/src/kex_sidh_msr/kex_sidh_msr.c b/src/kex_sidh_msr/kex_sidh_msr.c index a2d5d971f..cd287fcb6 100644 --- a/src/kex_sidh_msr/kex_sidh_msr.c +++ b/src/kex_sidh_msr/kex_sidh_msr.c @@ -1,8 +1,8 @@ -#if defined(WINDOWS) +#if defined(_WIN32) #pragma warning(disable : 4047 4090) #endif -#if defined(WINDOWS) +#if defined(_WIN32) #define UNUSED #else #define UNUSED __attribute__((unused)) @@ -10,7 +10,7 @@ #include #include -#if !defined(WINDOWS) +#if !defined(_WIN32) #include #include #endif @@ -22,7 +22,7 @@ #include "P751/P751_api.h" #include "kex_sidh_msr.h" -#if defined(WINDOWS) +#if defined(_WIN32) #define strdup _strdup // for strdup deprecation warning #endif diff --git a/src/kex_sidh_msr/windows_undef.h b/src/kex_sidh_msr/windows_undef.h index ac69b315b..b5ec6825d 100644 --- a/src/kex_sidh_msr/windows_undef.h +++ b/src/kex_sidh_msr/windows_undef.h @@ -3,7 +3,7 @@ * to avoid Visual Studio errors */ -#if defined(WINDOWS) +#if defined(_WIN32) #undef OQS_SIDH_MSR_CRYPTO_SECRETKEYBYTES #undef OQS_SIDH_MSR_CRYPTO_PUBLICKEYBYTES #undef OQS_SIDH_MSR_CRYPTO_BYTES diff --git a/src/sig/test_sig.c b/src/sig/test_sig.c index be918c08f..831b3ffd5 100644 --- a/src/sig/test_sig.c +++ b/src/sig/test_sig.c @@ -1,4 +1,4 @@ -#if defined(WINDOWS) +#if defined(_WIN32) #pragma warning(disable : 4244 4293) #endif