better naming of macro and alter misc.c check

2016-03-29 13:42:40 -06:00 · 2016-03-29 13:42:40 -06:00 · e60adfc9da
commit e60adfc9da
parent 7e90e2e540
38 changed files with 39 additions and 41 deletions
--- a/ctaocrypt/src/misc.c
+++ b/ctaocrypt/src/misc.c
@ -24,5 +24,6 @@
    #include <wolfssl/wolfcrypt/misc.h>
 #else
    /* for inline includes */
+    #define WOLFSSL_MISC_INCLUDED
    #include <wolfcrypt/src/misc.c>
 #endif
--- a/src/internal.c
+++ b/src/internal.c
@ -36,7 +36,7 @@
 #ifdef NO_INLINE
    #include <wolfssl/wolfcrypt/misc.h>
 #else
-    #define WOLFSSL_MISC_COMPILED
+    #define WOLFSSL_MISC_INCLUDED
    #include <wolfcrypt/src/misc.c>
 #endif

--- a/src/ocsp.c
+++ b/src/ocsp.c
@ -38,7 +38,7 @@
 #ifdef NO_INLINE
    #include <wolfssl/wolfcrypt/misc.h>
 #else
-    #define WOLFSSL_MISC_COMPILED
+    #define WOLFSSL_MISC_INCLUDED
    #include <wolfcrypt/src/misc.c>
 #endif

--- a/src/sniffer.c
+++ b/src/sniffer.c
@ -50,7 +50,7 @@
 #ifdef NO_INLINE
    #include <wolfssl/wolfcrypt/misc.h>
 #else
-    #define WOLFSSL_MISC_COMPILED
+    #define WOLFSSL_MISC_INCLUDED
    #include <wolfcrypt/src/misc.c>
 #endif

--- a/src/ssl.c
+++ b/src/ssl.c
@ -38,7 +38,7 @@
 #ifdef NO_INLINE
    #include <wolfssl/wolfcrypt/misc.h>
 #else
-    #define WOLFSSL_MISC_COMPILED
+    #define WOLFSSL_MISC_INCLUDED
    #include <wolfcrypt/src/misc.c>
 #endif

--- a/src/tls.c
+++ b/src/tls.c
@ -36,7 +36,7 @@
 #ifdef NO_INLINE
    #include <wolfssl/wolfcrypt/misc.h>
 #else
-    #define WOLFSSL_MISC_COMPILED
+    #define WOLFSSL_MISC_INCLUDED
    #include <wolfcrypt/src/misc.c>
 #endif

--- a/wolfcrypt/src/aes.c
+++ b/wolfcrypt/src/aes.c
@ -187,7 +187,7 @@ void wc_AesFreeCavium(Aes* aes)
 #ifdef NO_INLINE
    #include <wolfssl/wolfcrypt/misc.h>
 #else
-    #define WOLFSSL_MISC_COMPILED
+    #define WOLFSSL_MISC_INCLUDED
    #include <wolfcrypt/src/misc.c>
 #endif
 #ifdef DEBUG_AESNI
--- a/wolfcrypt/src/asn.c
+++ b/wolfcrypt/src/asn.c
@ -54,7 +54,7 @@ ASN Options:
 #ifdef NO_INLINE
    #include <wolfssl/wolfcrypt/misc.h>
 #else
-    #define WOLFSSL_MISC_COMPILED
+    #define WOLFSSL_MISC_INCLUDED
    #include <wolfcrypt/src/misc.c>
 #endif

--- a/wolfcrypt/src/camellia.c
+++ b/wolfcrypt/src/camellia.c
@ -67,7 +67,7 @@
 #ifdef NO_INLINE
    #include <wolfssl/wolfcrypt/misc.h>
 #else
-    #define WOLFSSL_MISC_COMPILED
+    #define WOLFSSL_MISC_INCLUDED
    #include <wolfcrypt/src/misc.c>
 #endif

--- a/wolfcrypt/src/chacha.c
+++ b/wolfcrypt/src/chacha.c
@ -40,7 +40,7 @@
 #ifdef NO_INLINE
    #include <wolfssl/wolfcrypt/misc.h>
 #else
-    #define WOLFSSL_MISC_COMPILED
+    #define WOLFSSL_MISC_INCLUDED
    #include <wolfcrypt/src/misc.c>
 #endif

--- a/wolfcrypt/src/chacha20_poly1305.c
+++ b/wolfcrypt/src/chacha20_poly1305.c
@ -38,7 +38,7 @@
 #ifdef NO_INLINE
 #include <wolfssl/wolfcrypt/misc.h>
 #else
-#define WOLFSSL_MISC_COMPILED
+#define WOLFSSL_MISC_INCLUDED
 #include <wolfcrypt/src/misc.c>
 #endif

--- a/wolfcrypt/src/compress.c
+++ b/wolfcrypt/src/compress.c
@ -36,7 +36,7 @@
 #ifdef NO_INLINE
    #include <wolfssl/wolfcrypt/misc.h>
 #else
-    #define WOLFSSL_MISC_COMPILED
+    #define WOLFSSL_MISC_INCLUDED
    #include <wolfcrypt/src/misc.c>
 #endif

--- a/wolfcrypt/src/curve25519.c
+++ b/wolfcrypt/src/curve25519.c
@ -36,7 +36,7 @@
 #ifdef NO_INLINE
    #include <wolfssl/wolfcrypt/misc.h>
 #else
-    #define WOLFSSL_MISC_COMPILED
+    #define WOLFSSL_MISC_INCLUDED
    #include <wolfcrypt/src/misc.c>
 #endif

--- a/wolfcrypt/src/des3.c
+++ b/wolfcrypt/src/des3.c
@ -127,7 +127,7 @@ void wc_Des3_FreeCavium(Des3* des3)
 #ifdef NO_INLINE
    #include <wolfssl/wolfcrypt/misc.h>
 #else
-    #define WOLFSSL_MISC_COMPILED
+    #define WOLFSSL_MISC_INCLUDED
    #include <wolfcrypt/src/misc.c>
 #endif

--- a/wolfcrypt/src/ecc.c
+++ b/wolfcrypt/src/ecc.c
@ -76,7 +76,7 @@ ECC Curves:
 #ifdef NO_INLINE
    #include <wolfssl/wolfcrypt/misc.h>
 #else
-    #define WOLFSSL_MISC_COMPILED
+    #define WOLFSSL_MISC_INCLUDED
    #include <wolfcrypt/src/misc.c>
 #endif

--- a/wolfcrypt/src/ed25519.c
+++ b/wolfcrypt/src/ed25519.c
@ -37,7 +37,7 @@
 #ifdef NO_INLINE
    #include <wolfssl/wolfcrypt/misc.h>
 #else
-    #define WOLFSSL_MISC_COMPILED
+    #define WOLFSSL_MISC_INCLUDED
    #include <wolfcrypt/src/misc.c>
 #endif

--- a/wolfcrypt/src/fe_low_mem.c
+++ b/wolfcrypt/src/fe_low_mem.c
@ -36,7 +36,7 @@
 #ifdef NO_INLINE
    #include <wolfssl/wolfcrypt/misc.h>
 #else
-    #define WOLFSSL_MISC_COMPILED
+    #define WOLFSSL_MISC_INCLUDED
    #include <wolfcrypt/src/misc.c>
 #endif

--- a/wolfcrypt/src/fe_operations.c
+++ b/wolfcrypt/src/fe_operations.c
@ -37,7 +37,7 @@
 #ifdef NO_INLINE
    #include <wolfssl/wolfcrypt/misc.h>
 #else
-    #define WOLFSSL_MISC_COMPILED
+    #define WOLFSSL_MISC_INCLUDED
    #include <wolfcrypt/src/misc.c>
 #endif

--- a/wolfcrypt/src/ge_low_mem.c
+++ b/wolfcrypt/src/ge_low_mem.c
@ -36,7 +36,7 @@
 #ifdef NO_INLINE
    #include <wolfssl/wolfcrypt/misc.h>
 #else
-    #define WOLFSSL_MISC_COMPILED
+    #define WOLFSSL_MISC_INCLUDED
    #include <wolfcrypt/src/misc.c>
 #endif

--- a/wolfcrypt/src/ge_operations.c
+++ b/wolfcrypt/src/ge_operations.c
@ -38,7 +38,7 @@
 #ifdef NO_INLINE
    #include <wolfssl/wolfcrypt/misc.h>
 #else
-    #define WOLFSSL_MISC_COMPILED
+    #define WOLFSSL_MISC_INCLUDED
    #include <wolfcrypt/src/misc.c>
 #endif

--- a/wolfcrypt/src/hc128.c
+++ b/wolfcrypt/src/hc128.c
@ -35,7 +35,7 @@
    #include <wolfssl/wolfcrypt/hc128.h>
 		#include <wolfssl/wolfcrypt/misc.h>
 #else
-    #define WOLFSSL_MISC_COMPILED
+    #define WOLFSSL_MISC_INCLUDED
    #include <wolfcrypt/src/misc.c>
 #endif

--- a/wolfcrypt/src/idea.c
+++ b/wolfcrypt/src/idea.c
@ -36,7 +36,7 @@
 #ifdef NO_INLINE
    #include <wolfssl/wolfcrypt/misc.h>
 #else
-    #define WOLFSSL_MISC_COMPILED
+    #define WOLFSSL_MISC_INCLUDED
    #include <wolfcrypt/src/misc.c>
 #endif

--- a/wolfcrypt/src/md2.c
+++ b/wolfcrypt/src/md2.c
@ -35,7 +35,7 @@
 #ifdef NO_INLINE
    #include <wolfssl/wolfcrypt/misc.h>
 #else
-    #define WOLFSSL_MISC_COMPILED
+    #define WOLFSSL_MISC_INCLUDED
    #include <wolfcrypt/src/misc.c>
 #endif

--- a/wolfcrypt/src/md4.c
+++ b/wolfcrypt/src/md4.c
@ -32,7 +32,7 @@
 #ifdef NO_INLINE
    #include <wolfssl/wolfcrypt/misc.h>
 #else
-    #define WOLFSSL_MISC_COMPILED
+    #define WOLFSSL_MISC_INCLUDED
    #include <wolfcrypt/src/misc.c>
 #endif

--- a/wolfcrypt/src/md5.c
+++ b/wolfcrypt/src/md5.c
@ -45,7 +45,7 @@
 #ifdef NO_INLINE
    #include <wolfssl/wolfcrypt/misc.h>
 #else
-    #define WOLFSSL_MISC_COMPILED
+    #define WOLFSSL_MISC_INCLUDED
    #include <wolfcrypt/src/misc.c>
 #endif

--- 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

--- a/wolfcrypt/src/pkcs7.c
+++ b/wolfcrypt/src/pkcs7.c
@ -34,7 +34,7 @@
 #ifdef NO_INLINE
    #include <wolfssl/wolfcrypt/misc.h>
 #else
-    #define WOLFSSL_MISC_COMPILED
+    #define WOLFSSL_MISC_INCLUDED
    #include <wolfcrypt/src/misc.c>
 #endif

--- a/wolfcrypt/src/poly1305.c
+++ b/wolfcrypt/src/poly1305.c
@ -37,7 +37,7 @@
 #ifdef NO_INLINE
    #include <wolfssl/wolfcrypt/misc.h>
 #else
-    #define WOLFSSL_MISC_COMPILED
+    #define WOLFSSL_MISC_INCLUDED
    #include <wolfcrypt/src/misc.c>
 #endif
 #ifdef CHACHA_AEAD_TEST
--- a/wolfcrypt/src/pwdbased.c
+++ b/wolfcrypt/src/pwdbased.c
@ -55,7 +55,7 @@
 #ifdef NO_INLINE
    #include <wolfssl/wolfcrypt/misc.h>
 #else
-    #define WOLFSSL_MISC_COMPILED
+    #define WOLFSSL_MISC_INCLUDED
    #include <wolfcrypt/src/misc.c>
 #endif

--- a/wolfcrypt/src/rabbit.c
+++ b/wolfcrypt/src/rabbit.c
@ -34,7 +34,7 @@
 #ifdef NO_INLINE
    #include <wolfssl/wolfcrypt/misc.h>
 #else
-    #define WOLFSSL_MISC_COMPILED
+    #define WOLFSSL_MISC_INCLUDED
    #include <wolfcrypt/src/misc.c>
 #endif

--- a/wolfcrypt/src/random.c
+++ b/wolfcrypt/src/random.c
@ -131,7 +131,7 @@ int wc_FreeRng(WC_RNG* rng)
    #ifdef NO_INLINE
        #include <wolfssl/wolfcrypt/misc.h>
    #else
-        #define WOLFSSL_MISC_COMPILED
+        #define WOLFSSL_MISC_INCLUDED
        #include <wolfcrypt/src/misc.c>
    #endif
 #endif /* HAVE_HASHDRBG || NO_RC4 */
--- a/wolfcrypt/src/ripemd.c
+++ b/wolfcrypt/src/ripemd.c
@ -33,7 +33,7 @@
 #ifdef NO_INLINE
    #include <wolfssl/wolfcrypt/misc.h>
 #else
-    #define WOLFSSL_MISC_COMPILED
+    #define WOLFSSL_MISC_INCLUDED
    #include <wolfcrypt/src/misc.c>
 #endif

--- 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 <wolfssl/wolfcrypt/misc.h>
 #else
-    #define WOLFSSL_MISC_COMPILED
+    #define WOLFSSL_MISC_INCLUDED
    #include <wolfcrypt/src/misc.c>
 #endif

--- a/wolfcrypt/src/sha.c
+++ b/wolfcrypt/src/sha.c
@ -36,7 +36,7 @@
 #ifdef NO_INLINE
    #include <wolfssl/wolfcrypt/misc.h>
 #else
-    #define WOLFSSL_MISC_COMPILED
+    #define WOLFSSL_MISC_INCLUDED
    #include <wolfcrypt/src/misc.c>
 #endif

--- a/wolfcrypt/src/sha256.c
+++ b/wolfcrypt/src/sha256.c
@ -282,7 +282,7 @@ static void set_Transform(void) {
 #ifdef NO_INLINE
    #include <wolfssl/wolfcrypt/misc.h>
 #else
-    #define WOLFSSL_MISC_COMPILED
+    #define WOLFSSL_MISC_INCLUDED
    #include <wolfcrypt/src/misc.c>
 #endif

--- 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 <wolfssl/wolfcrypt/misc.h>
 #else
-    #define WOLFSSL_MISC_COMPILED
+    #define WOLFSSL_MISC_INCLUDED
    #include <wolfcrypt/src/misc.c>
 #endif

--- a/wolfcrypt/src/srp.c
+++ b/wolfcrypt/src/srp.c
@ -35,7 +35,7 @@
 #ifdef NO_INLINE
    #include <wolfssl/wolfcrypt/misc.h>
 #else
-    #define WOLFSSL_MISC_COMPILED
+    #define WOLFSSL_MISC_INCLUDED
    #include <wolfcrypt/src/misc.c>
 #endif

--- a/wolfcrypt/src/tfm.c
+++ b/wolfcrypt/src/tfm.c
@ -40,7 +40,7 @@
 #ifdef NO_INLINE
    #include <wolfssl/wolfcrypt/misc.h>
 #else
-    #define WOLFSSL_MISC_COMPILED
+    #define WOLFSSL_MISC_INCLUDED
    #include <wolfcrypt/src/misc.c>
 #endif