From e60adfc9da80e13d2fa125bd504bad599decf692 Mon Sep 17 00:00:00 2001 From: Jacob Barthelmeh Date: Tue, 29 Mar 2016 13:42:40 -0600 Subject: [PATCH] better naming of macro and alter misc.c check --- ctaocrypt/src/misc.c | 1 + src/internal.c | 2 +- src/ocsp.c | 2 +- src/sniffer.c | 2 +- src/ssl.c | 2 +- src/tls.c | 2 +- wolfcrypt/src/aes.c | 2 +- wolfcrypt/src/asn.c | 2 +- wolfcrypt/src/camellia.c | 2 +- wolfcrypt/src/chacha.c | 2 +- wolfcrypt/src/chacha20_poly1305.c | 2 +- wolfcrypt/src/compress.c | 2 +- wolfcrypt/src/curve25519.c | 2 +- wolfcrypt/src/des3.c | 2 +- wolfcrypt/src/ecc.c | 2 +- wolfcrypt/src/ed25519.c | 2 +- wolfcrypt/src/fe_low_mem.c | 2 +- wolfcrypt/src/fe_operations.c | 2 +- wolfcrypt/src/ge_low_mem.c | 2 +- wolfcrypt/src/ge_operations.c | 2 +- wolfcrypt/src/hc128.c | 2 +- wolfcrypt/src/idea.c | 2 +- wolfcrypt/src/md2.c | 2 +- wolfcrypt/src/md4.c | 2 +- wolfcrypt/src/md5.c | 2 +- wolfcrypt/src/misc.c | 7 ++----- wolfcrypt/src/pkcs7.c | 2 +- wolfcrypt/src/poly1305.c | 2 +- wolfcrypt/src/pwdbased.c | 2 +- wolfcrypt/src/rabbit.c | 2 +- wolfcrypt/src/random.c | 2 +- wolfcrypt/src/ripemd.c | 2 +- wolfcrypt/src/rsa.c | 2 +- wolfcrypt/src/sha.c | 2 +- wolfcrypt/src/sha256.c | 2 +- wolfcrypt/src/sha512.c | 2 +- wolfcrypt/src/srp.c | 2 +- wolfcrypt/src/tfm.c | 2 +- 38 files changed, 39 insertions(+), 41 deletions(-) diff --git a/ctaocrypt/src/misc.c b/ctaocrypt/src/misc.c index 40be5ebad..854e45a3d 100644 --- a/ctaocrypt/src/misc.c +++ b/ctaocrypt/src/misc.c @@ -24,5 +24,6 @@ #include #else /* for inline includes */ + #define WOLFSSL_MISC_INCLUDED #include #endif diff --git a/src/internal.c b/src/internal.c index c9c0d2031..951ce7384 100644 --- a/src/internal.c +++ b/src/internal.c @@ -36,7 +36,7 @@ #ifdef NO_INLINE #include #else - #define WOLFSSL_MISC_COMPILED + #define WOLFSSL_MISC_INCLUDED #include #endif diff --git a/src/ocsp.c b/src/ocsp.c index 16d560698..59a8cf057 100644 --- a/src/ocsp.c +++ b/src/ocsp.c @@ -38,7 +38,7 @@ #ifdef NO_INLINE #include #else - #define WOLFSSL_MISC_COMPILED + #define WOLFSSL_MISC_INCLUDED #include #endif diff --git a/src/sniffer.c b/src/sniffer.c index 010ad61b9..6d791377c 100644 --- a/src/sniffer.c +++ b/src/sniffer.c @@ -50,7 +50,7 @@ #ifdef NO_INLINE #include #else - #define WOLFSSL_MISC_COMPILED + #define WOLFSSL_MISC_INCLUDED #include #endif diff --git a/src/ssl.c b/src/ssl.c index e5234b2f6..dec4ed39e 100644 --- a/src/ssl.c +++ b/src/ssl.c @@ -38,7 +38,7 @@ #ifdef NO_INLINE #include #else - #define WOLFSSL_MISC_COMPILED + #define WOLFSSL_MISC_INCLUDED #include #endif diff --git a/src/tls.c b/src/tls.c index a655896a8..3b6e0a879 100644 --- a/src/tls.c +++ b/src/tls.c @@ -36,7 +36,7 @@ #ifdef NO_INLINE #include #else - #define WOLFSSL_MISC_COMPILED + #define WOLFSSL_MISC_INCLUDED #include #endif diff --git a/wolfcrypt/src/aes.c b/wolfcrypt/src/aes.c index ad8cb5213..9ec6ef0e4 100644 --- a/wolfcrypt/src/aes.c +++ b/wolfcrypt/src/aes.c @@ -187,7 +187,7 @@ void wc_AesFreeCavium(Aes* aes) #ifdef NO_INLINE #include #else - #define WOLFSSL_MISC_COMPILED + #define WOLFSSL_MISC_INCLUDED #include #endif #ifdef DEBUG_AESNI diff --git a/wolfcrypt/src/asn.c b/wolfcrypt/src/asn.c index d4eb4f8d4..d60053311 100644 --- a/wolfcrypt/src/asn.c +++ b/wolfcrypt/src/asn.c @@ -54,7 +54,7 @@ ASN Options: #ifdef NO_INLINE #include #else - #define WOLFSSL_MISC_COMPILED + #define WOLFSSL_MISC_INCLUDED #include #endif diff --git a/wolfcrypt/src/camellia.c b/wolfcrypt/src/camellia.c index bb2cfe8c2..95609371d 100644 --- a/wolfcrypt/src/camellia.c +++ b/wolfcrypt/src/camellia.c @@ -67,7 +67,7 @@ #ifdef NO_INLINE #include #else - #define WOLFSSL_MISC_COMPILED + #define WOLFSSL_MISC_INCLUDED #include #endif diff --git a/wolfcrypt/src/chacha.c b/wolfcrypt/src/chacha.c index eafc8e579..1402e49cf 100644 --- a/wolfcrypt/src/chacha.c +++ b/wolfcrypt/src/chacha.c @@ -40,7 +40,7 @@ #ifdef NO_INLINE #include #else - #define WOLFSSL_MISC_COMPILED + #define WOLFSSL_MISC_INCLUDED #include #endif diff --git a/wolfcrypt/src/chacha20_poly1305.c b/wolfcrypt/src/chacha20_poly1305.c index 3964b4ea8..104bb5737 100644 --- a/wolfcrypt/src/chacha20_poly1305.c +++ b/wolfcrypt/src/chacha20_poly1305.c @@ -38,7 +38,7 @@ #ifdef NO_INLINE #include #else -#define WOLFSSL_MISC_COMPILED +#define WOLFSSL_MISC_INCLUDED #include #endif diff --git a/wolfcrypt/src/compress.c b/wolfcrypt/src/compress.c index 346dcbc7d..2423a0402 100644 --- a/wolfcrypt/src/compress.c +++ b/wolfcrypt/src/compress.c @@ -36,7 +36,7 @@ #ifdef NO_INLINE #include #else - #define WOLFSSL_MISC_COMPILED + #define WOLFSSL_MISC_INCLUDED #include #endif diff --git a/wolfcrypt/src/curve25519.c b/wolfcrypt/src/curve25519.c index 1f7c012d9..3e7b0f52a 100644 --- a/wolfcrypt/src/curve25519.c +++ b/wolfcrypt/src/curve25519.c @@ -36,7 +36,7 @@ #ifdef NO_INLINE #include #else - #define WOLFSSL_MISC_COMPILED + #define WOLFSSL_MISC_INCLUDED #include #endif diff --git a/wolfcrypt/src/des3.c b/wolfcrypt/src/des3.c index f39bb6842..541a9843d 100644 --- a/wolfcrypt/src/des3.c +++ b/wolfcrypt/src/des3.c @@ -127,7 +127,7 @@ void wc_Des3_FreeCavium(Des3* des3) #ifdef NO_INLINE #include #else - #define WOLFSSL_MISC_COMPILED + #define WOLFSSL_MISC_INCLUDED #include #endif diff --git a/wolfcrypt/src/ecc.c b/wolfcrypt/src/ecc.c index 807c44fe8..f7b572af3 100644 --- a/wolfcrypt/src/ecc.c +++ b/wolfcrypt/src/ecc.c @@ -76,7 +76,7 @@ ECC Curves: #ifdef NO_INLINE #include #else - #define WOLFSSL_MISC_COMPILED + #define WOLFSSL_MISC_INCLUDED #include #endif diff --git a/wolfcrypt/src/ed25519.c b/wolfcrypt/src/ed25519.c index 959225015..9eb86da23 100644 --- a/wolfcrypt/src/ed25519.c +++ b/wolfcrypt/src/ed25519.c @@ -37,7 +37,7 @@ #ifdef NO_INLINE #include #else - #define WOLFSSL_MISC_COMPILED + #define WOLFSSL_MISC_INCLUDED #include #endif diff --git a/wolfcrypt/src/fe_low_mem.c b/wolfcrypt/src/fe_low_mem.c index e7b793ca9..0fe6158a0 100644 --- a/wolfcrypt/src/fe_low_mem.c +++ b/wolfcrypt/src/fe_low_mem.c @@ -36,7 +36,7 @@ #ifdef NO_INLINE #include #else - #define WOLFSSL_MISC_COMPILED + #define WOLFSSL_MISC_INCLUDED #include #endif diff --git a/wolfcrypt/src/fe_operations.c b/wolfcrypt/src/fe_operations.c index 7f7f388fe..1a387ce37 100644 --- a/wolfcrypt/src/fe_operations.c +++ b/wolfcrypt/src/fe_operations.c @@ -37,7 +37,7 @@ #ifdef NO_INLINE #include #else - #define WOLFSSL_MISC_COMPILED + #define WOLFSSL_MISC_INCLUDED #include #endif diff --git a/wolfcrypt/src/ge_low_mem.c b/wolfcrypt/src/ge_low_mem.c index 9f17e5e1f..9b6b26206 100644 --- a/wolfcrypt/src/ge_low_mem.c +++ b/wolfcrypt/src/ge_low_mem.c @@ -36,7 +36,7 @@ #ifdef NO_INLINE #include #else - #define WOLFSSL_MISC_COMPILED + #define WOLFSSL_MISC_INCLUDED #include #endif diff --git a/wolfcrypt/src/ge_operations.c b/wolfcrypt/src/ge_operations.c index a7970b51d..40dd4c7b1 100644 --- a/wolfcrypt/src/ge_operations.c +++ b/wolfcrypt/src/ge_operations.c @@ -38,7 +38,7 @@ #ifdef NO_INLINE #include #else - #define WOLFSSL_MISC_COMPILED + #define WOLFSSL_MISC_INCLUDED #include #endif diff --git a/wolfcrypt/src/hc128.c b/wolfcrypt/src/hc128.c index 4e365244d..e6344ae10 100644 --- a/wolfcrypt/src/hc128.c +++ b/wolfcrypt/src/hc128.c @@ -35,7 +35,7 @@ #include #include #else - #define WOLFSSL_MISC_COMPILED + #define WOLFSSL_MISC_INCLUDED #include #endif diff --git a/wolfcrypt/src/idea.c b/wolfcrypt/src/idea.c index 5d7550a5f..04f1fb319 100644 --- a/wolfcrypt/src/idea.c +++ b/wolfcrypt/src/idea.c @@ -36,7 +36,7 @@ #ifdef NO_INLINE #include #else - #define WOLFSSL_MISC_COMPILED + #define WOLFSSL_MISC_INCLUDED #include #endif diff --git a/wolfcrypt/src/md2.c b/wolfcrypt/src/md2.c index 02f3e4936..01f8f48aa 100644 --- a/wolfcrypt/src/md2.c +++ b/wolfcrypt/src/md2.c @@ -35,7 +35,7 @@ #ifdef NO_INLINE #include #else - #define WOLFSSL_MISC_COMPILED + #define WOLFSSL_MISC_INCLUDED #include #endif diff --git a/wolfcrypt/src/md4.c b/wolfcrypt/src/md4.c index 126077f3c..3b3ae9555 100644 --- a/wolfcrypt/src/md4.c +++ b/wolfcrypt/src/md4.c @@ -32,7 +32,7 @@ #ifdef NO_INLINE #include #else - #define WOLFSSL_MISC_COMPILED + #define WOLFSSL_MISC_INCLUDED #include #endif diff --git a/wolfcrypt/src/md5.c b/wolfcrypt/src/md5.c index 0a6c3f617..48eab1bdf 100644 --- a/wolfcrypt/src/md5.c +++ b/wolfcrypt/src/md5.c @@ -45,7 +45,7 @@ #ifdef NO_INLINE #include #else - #define WOLFSSL_MISC_COMPILED + #define WOLFSSL_MISC_INCLUDED #include #endif diff --git a/wolfcrypt/src/misc.c b/wolfcrypt/src/misc.c index 3498deb53..3b7360665 100644 --- a/wolfcrypt/src/misc.c +++ b/wolfcrypt/src/misc.c @@ -39,16 +39,13 @@ */ #ifdef NO_INLINE - #undef WOLFSSL_MISC_COMPILED - #define WOLFSSL_MISC_COMPILED #define STATIC #else #define STATIC static #endif -/* Check for if compiling misc.c when not needed. FIPS build has source code - without preprocessor flag so the warning is not used in a FIPS build. */ -#if !defined(WOLFSSL_MISC_COMPILED) && !defined(HAVE_FIPS) +/* Check for if compiling misc.c when not needed. */ +#if !defined(WOLFSSL_MISC_INCLUDED) && !defined(NO_INLINE) #error misc.c does not need to be compiled when not defined NO_INLINE #endif diff --git a/wolfcrypt/src/pkcs7.c b/wolfcrypt/src/pkcs7.c index a8bce24f2..390c93615 100644 --- a/wolfcrypt/src/pkcs7.c +++ b/wolfcrypt/src/pkcs7.c @@ -34,7 +34,7 @@ #ifdef NO_INLINE #include #else - #define WOLFSSL_MISC_COMPILED + #define WOLFSSL_MISC_INCLUDED #include #endif diff --git a/wolfcrypt/src/poly1305.c b/wolfcrypt/src/poly1305.c index 1e76c707c..09f88c707 100644 --- a/wolfcrypt/src/poly1305.c +++ b/wolfcrypt/src/poly1305.c @@ -37,7 +37,7 @@ #ifdef NO_INLINE #include #else - #define WOLFSSL_MISC_COMPILED + #define WOLFSSL_MISC_INCLUDED #include #endif #ifdef CHACHA_AEAD_TEST diff --git a/wolfcrypt/src/pwdbased.c b/wolfcrypt/src/pwdbased.c index 7f3e50759..c20ea1f18 100644 --- a/wolfcrypt/src/pwdbased.c +++ b/wolfcrypt/src/pwdbased.c @@ -55,7 +55,7 @@ #ifdef NO_INLINE #include #else - #define WOLFSSL_MISC_COMPILED + #define WOLFSSL_MISC_INCLUDED #include #endif diff --git a/wolfcrypt/src/rabbit.c b/wolfcrypt/src/rabbit.c index 53a31b91e..4e51d3095 100644 --- a/wolfcrypt/src/rabbit.c +++ b/wolfcrypt/src/rabbit.c @@ -34,7 +34,7 @@ #ifdef NO_INLINE #include #else - #define WOLFSSL_MISC_COMPILED + #define WOLFSSL_MISC_INCLUDED #include #endif diff --git a/wolfcrypt/src/random.c b/wolfcrypt/src/random.c index 65f900f0e..235dce133 100644 --- a/wolfcrypt/src/random.c +++ b/wolfcrypt/src/random.c @@ -131,7 +131,7 @@ int wc_FreeRng(WC_RNG* rng) #ifdef NO_INLINE #include #else - #define WOLFSSL_MISC_COMPILED + #define WOLFSSL_MISC_INCLUDED #include #endif #endif /* HAVE_HASHDRBG || NO_RC4 */ diff --git a/wolfcrypt/src/ripemd.c b/wolfcrypt/src/ripemd.c index 55a483162..9da179e4e 100644 --- a/wolfcrypt/src/ripemd.c +++ b/wolfcrypt/src/ripemd.c @@ -33,7 +33,7 @@ #ifdef NO_INLINE #include #else - #define WOLFSSL_MISC_COMPILED + #define WOLFSSL_MISC_INCLUDED #include #endif diff --git a/wolfcrypt/src/rsa.c b/wolfcrypt/src/rsa.c index 630de3fa3..ea5bf381f 100644 --- a/wolfcrypt/src/rsa.c +++ b/wolfcrypt/src/rsa.c @@ -129,7 +129,7 @@ int wc_RsaFlattenPublicKey(RsaKey* key, byte* a, word32* aSz, byte* b, #ifdef NO_INLINE #include #else - #define WOLFSSL_MISC_COMPILED + #define WOLFSSL_MISC_INCLUDED #include #endif diff --git a/wolfcrypt/src/sha.c b/wolfcrypt/src/sha.c index cd3e6f161..b09b00c4d 100644 --- a/wolfcrypt/src/sha.c +++ b/wolfcrypt/src/sha.c @@ -36,7 +36,7 @@ #ifdef NO_INLINE #include #else - #define WOLFSSL_MISC_COMPILED + #define WOLFSSL_MISC_INCLUDED #include #endif diff --git a/wolfcrypt/src/sha256.c b/wolfcrypt/src/sha256.c index 09c2d0c36..e546a7c24 100644 --- a/wolfcrypt/src/sha256.c +++ b/wolfcrypt/src/sha256.c @@ -282,7 +282,7 @@ static void set_Transform(void) { #ifdef NO_INLINE #include #else - #define WOLFSSL_MISC_COMPILED + #define WOLFSSL_MISC_INCLUDED #include #endif diff --git a/wolfcrypt/src/sha512.c b/wolfcrypt/src/sha512.c index 162a7ff8c..d06bc0880 100644 --- a/wolfcrypt/src/sha512.c +++ b/wolfcrypt/src/sha512.c @@ -76,7 +76,7 @@ int wc_Sha384Final(Sha384* sha, byte* out) #ifdef NO_INLINE #include #else - #define WOLFSSL_MISC_COMPILED + #define WOLFSSL_MISC_INCLUDED #include #endif diff --git a/wolfcrypt/src/srp.c b/wolfcrypt/src/srp.c index 05393e140..e00af4bb7 100644 --- a/wolfcrypt/src/srp.c +++ b/wolfcrypt/src/srp.c @@ -35,7 +35,7 @@ #ifdef NO_INLINE #include #else - #define WOLFSSL_MISC_COMPILED + #define WOLFSSL_MISC_INCLUDED #include #endif diff --git a/wolfcrypt/src/tfm.c b/wolfcrypt/src/tfm.c index 00c6ec97b..81372ab8c 100644 --- a/wolfcrypt/src/tfm.c +++ b/wolfcrypt/src/tfm.c @@ -40,7 +40,7 @@ #ifdef NO_INLINE #include #else - #define WOLFSSL_MISC_COMPILED + #define WOLFSSL_MISC_INCLUDED #include #endif