From 97e0ec073f925f04922fda2d9c78c988ae107af5 Mon Sep 17 00:00:00 2001
From: toddouska <todd@wolfssl.com>
Date: Wed, 10 Apr 2013 11:04:29 -0700
Subject: [PATCH] make sure all lib proper *.c files have config.h then
 settings.h then checks for defines in case user using settings.h for lib
 config

---
 ctaocrypt/src/aes.c      | 2 ++
 ctaocrypt/src/arc4.c     | 2 ++
 ctaocrypt/src/asm.c      | 2 ++
 ctaocrypt/src/asn.c      | 2 ++
 ctaocrypt/src/blake2b.c  | 2 ++
 ctaocrypt/src/camellia.c | 2 ++
 ctaocrypt/src/coding.c   | 2 ++
 ctaocrypt/src/compress.c | 1 +
 ctaocrypt/src/des3.c     | 2 ++
 ctaocrypt/src/dh.c       | 2 ++
 ctaocrypt/src/dsa.c      | 2 ++
 ctaocrypt/src/error.c    | 2 ++
 ctaocrypt/src/hc128.c    | 2 ++
 ctaocrypt/src/hmac.c     | 2 ++
 ctaocrypt/src/logging.c  | 3 ++-
 ctaocrypt/src/md2.c      | 2 ++
 ctaocrypt/src/md4.c      | 1 +
 ctaocrypt/src/md5.c      | 2 ++
 ctaocrypt/src/memory.c   | 5 ++---
 ctaocrypt/src/misc.c     | 2 ++
 ctaocrypt/src/pwdbased.c | 2 ++
 ctaocrypt/src/rabbit.c   | 2 ++
 ctaocrypt/src/random.c   | 2 ++
 ctaocrypt/src/ripemd.c   | 2 ++
 ctaocrypt/src/rsa.c      | 2 ++
 ctaocrypt/src/sha.c      | 2 ++
 ctaocrypt/src/sha256.c   | 2 ++
 ctaocrypt/src/sha512.c   | 1 +
 src/crl.c                | 1 +
 src/internal.c           | 2 ++
 src/io.c                 | 2 ++
 src/keys.c               | 2 ++
 src/ocsp.c               | 2 ++
 src/sniffer.c            | 5 ++++-
 src/ssl.c                | 2 ++
 src/tls.c                | 2 ++
 36 files changed, 70 insertions(+), 5 deletions(-)

diff --git a/ctaocrypt/src/aes.c b/ctaocrypt/src/aes.c
index 84a82f6cf..e0fd66424 100644
--- a/ctaocrypt/src/aes.c
+++ b/ctaocrypt/src/aes.c
@@ -23,6 +23,8 @@
     #include <config.h>
 #endif
 
+#include <cyassl/ctaocrypt/settings.h>
+
 #ifndef NO_AES
 
 #include <cyassl/ctaocrypt/aes.h>
diff --git a/ctaocrypt/src/arc4.c b/ctaocrypt/src/arc4.c
index 9c77f7fc5..6c62e4ca1 100644
--- a/ctaocrypt/src/arc4.c
+++ b/ctaocrypt/src/arc4.c
@@ -23,6 +23,8 @@
     #include <config.h>
 #endif
 
+#include <cyassl/ctaocrypt/settings.h>
+
 #ifndef NO_RC4
 
 #include <cyassl/ctaocrypt/arc4.h>
diff --git a/ctaocrypt/src/asm.c b/ctaocrypt/src/asm.c
index cb8f4e315..9b05161ce 100644
--- a/ctaocrypt/src/asm.c
+++ b/ctaocrypt/src/asm.c
@@ -23,6 +23,8 @@
     #include <config.h>
 #endif
 
+#include <cyassl/ctaocrypt/settings.h>
+
 /*
  * Based on public domain TomsFastMath 0.10 by Tom St Denis, tomstdenis@iahu.ca,
  * http://math.libtomcrypt.com
diff --git a/ctaocrypt/src/asn.c b/ctaocrypt/src/asn.c
index 449e85a2e..3e8ad3d00 100644
--- a/ctaocrypt/src/asn.c
+++ b/ctaocrypt/src/asn.c
@@ -23,6 +23,8 @@
     #include <config.h>
 #endif
 
+#include <cyassl/ctaocrypt/settings.h>
+
 #ifndef NO_ASN
 
 #ifdef THREADX
diff --git a/ctaocrypt/src/blake2b.c b/ctaocrypt/src/blake2b.c
index 0f962a77a..b7d78812b 100644
--- a/ctaocrypt/src/blake2b.c
+++ b/ctaocrypt/src/blake2b.c
@@ -36,6 +36,8 @@
     #include <config.h>
 #endif
 
+#include <cyassl/ctaocrypt/settings.h>
+
 #ifdef HAVE_BLAKE2
 
 #include <cyassl/ctaocrypt/blake2.h>
diff --git a/ctaocrypt/src/camellia.c b/ctaocrypt/src/camellia.c
index a56487807..162625cfc 100644
--- a/ctaocrypt/src/camellia.c
+++ b/ctaocrypt/src/camellia.c
@@ -56,6 +56,8 @@
     #include <config.h>
 #endif
 
+#include <cyassl/ctaocrypt/settings.h>
+
 #ifdef HAVE_CAMELLIA
 
 #include <cyassl/ctaocrypt/camellia.h>
diff --git a/ctaocrypt/src/coding.c b/ctaocrypt/src/coding.c
index c914f9183..78286faae 100644
--- a/ctaocrypt/src/coding.c
+++ b/ctaocrypt/src/coding.c
@@ -23,6 +23,8 @@
     #include <config.h>
 #endif
 
+#include <cyassl/ctaocrypt/settings.h>
+
 #ifndef NO_CODING
 
 #include <cyassl/ctaocrypt/coding.h>
diff --git a/ctaocrypt/src/compress.c b/ctaocrypt/src/compress.c
index 6e6e05d08..80b612d1a 100644
--- a/ctaocrypt/src/compress.c
+++ b/ctaocrypt/src/compress.c
@@ -24,6 +24,7 @@
     #include <config.h>
 #endif
 
+#include <cyassl/ctaocrypt/settings.h>
 
 #ifdef HAVE_LIBZ
 
diff --git a/ctaocrypt/src/des3.c b/ctaocrypt/src/des3.c
index 12cf4692b..ea3034e0e 100644
--- a/ctaocrypt/src/des3.c
+++ b/ctaocrypt/src/des3.c
@@ -23,6 +23,8 @@
     #include <config.h>
 #endif
 
+#include <cyassl/ctaocrypt/settings.h>
+
 #ifndef NO_DES3
 
 #include <cyassl/ctaocrypt/des3.h>
diff --git a/ctaocrypt/src/dh.c b/ctaocrypt/src/dh.c
index d5ad83f4f..f1d156fd2 100644
--- a/ctaocrypt/src/dh.c
+++ b/ctaocrypt/src/dh.c
@@ -23,6 +23,8 @@
     #include <config.h>
 #endif
 
+#include <cyassl/ctaocrypt/settings.h>
+
 #ifndef NO_DH
 
 #include <cyassl/ctaocrypt/dh.h>
diff --git a/ctaocrypt/src/dsa.c b/ctaocrypt/src/dsa.c
index d9b0992ed..9bf031a66 100644
--- a/ctaocrypt/src/dsa.c
+++ b/ctaocrypt/src/dsa.c
@@ -23,6 +23,8 @@
     #include <config.h>
 #endif
 
+#include <cyassl/ctaocrypt/settings.h>
+
 #ifndef NO_DSA
 
 #include <cyassl/ctaocrypt/dsa.h>
diff --git a/ctaocrypt/src/error.c b/ctaocrypt/src/error.c
index 1df102213..c1f39c054 100644
--- a/ctaocrypt/src/error.c
+++ b/ctaocrypt/src/error.c
@@ -23,6 +23,8 @@
     #include <config.h>
 #endif
  
+#include <cyassl/ctaocrypt/settings.h>
+
 #include <cyassl/ctaocrypt/error.h>
 
 #ifdef _MSC_VER
diff --git a/ctaocrypt/src/hc128.c b/ctaocrypt/src/hc128.c
index cb13f7082..4913d6b49 100644
--- a/ctaocrypt/src/hc128.c
+++ b/ctaocrypt/src/hc128.c
@@ -23,6 +23,8 @@
     #include <config.h>
 #endif
 
+#include <cyassl/ctaocrypt/settings.h>
+
 #ifdef HAVE_HC128
 
 #include <cyassl/ctaocrypt/hc128.h>
diff --git a/ctaocrypt/src/hmac.c b/ctaocrypt/src/hmac.c
index 30b1badf6..532baefb2 100644
--- a/ctaocrypt/src/hmac.c
+++ b/ctaocrypt/src/hmac.c
@@ -23,6 +23,8 @@
     #include <config.h>
 #endif
 
+#include <cyassl/ctaocrypt/settings.h>
+
 #ifndef NO_HMAC
 
 #include <cyassl/ctaocrypt/hmac.h>
diff --git a/ctaocrypt/src/logging.c b/ctaocrypt/src/logging.c
index 2dfc551b7..c3df749bc 100644
--- a/ctaocrypt/src/logging.c
+++ b/ctaocrypt/src/logging.c
@@ -23,9 +23,10 @@
     #include <config.h>
 #endif
 
+#include <cyassl/ctaocrypt/settings.h>
+
 /* submitted by eof */
 
-#include <cyassl/ctaocrypt/settings.h>
 #include <cyassl/ctaocrypt/logging.h>
 #include <cyassl/ctaocrypt/error.h>
 
diff --git a/ctaocrypt/src/md2.c b/ctaocrypt/src/md2.c
index 125c0cd1a..b8e616542 100644
--- a/ctaocrypt/src/md2.c
+++ b/ctaocrypt/src/md2.c
@@ -24,6 +24,8 @@
     #include <config.h>
 #endif
 
+#include <cyassl/ctaocrypt/settings.h>
+
 #ifdef CYASSL_MD2
 
 #include <cyassl/ctaocrypt/md2.h>
diff --git a/ctaocrypt/src/md4.c b/ctaocrypt/src/md4.c
index d9a3dfc53..0126428a7 100644
--- a/ctaocrypt/src/md4.c
+++ b/ctaocrypt/src/md4.c
@@ -23,6 +23,7 @@
     #include <config.h>
 #endif
 
+#include <cyassl/ctaocrypt/settings.h>
 
 #ifndef NO_MD4
 
diff --git a/ctaocrypt/src/md5.c b/ctaocrypt/src/md5.c
index 88276d007..26099d4e4 100644
--- a/ctaocrypt/src/md5.c
+++ b/ctaocrypt/src/md5.c
@@ -24,6 +24,8 @@
     #include <config.h>
 #endif
 
+#include <cyassl/ctaocrypt/settings.h>
+
 #ifndef NO_MD5
 
 #include <cyassl/ctaocrypt/md5.h>
diff --git a/ctaocrypt/src/memory.c b/ctaocrypt/src/memory.c
index a2e5fa883..4e84e4858 100644
--- a/ctaocrypt/src/memory.c
+++ b/ctaocrypt/src/memory.c
@@ -23,11 +23,10 @@
     #include <config.h>
 #endif
 
-/* submitted by eof */
-
-
 #include <cyassl/ctaocrypt/settings.h>
 
+/* submitted by eof */
+
 #ifdef USE_CYASSL_MEMORY
 
 #include <cyassl/ctaocrypt/memory.h>
diff --git a/ctaocrypt/src/misc.c b/ctaocrypt/src/misc.c
index 1a31b2dca..4b01a4706 100644
--- a/ctaocrypt/src/misc.c
+++ b/ctaocrypt/src/misc.c
@@ -23,6 +23,8 @@
     #include <config.h>
 #endif
 
+#include <cyassl/ctaocrypt/settings.h>
+
 #include <cyassl/ctaocrypt/misc.h>
 
 /* inlining these functions is a huge speed increase and a small size decrease, 
diff --git a/ctaocrypt/src/pwdbased.c b/ctaocrypt/src/pwdbased.c
index 4a791ed14..f6acc282a 100644
--- a/ctaocrypt/src/pwdbased.c
+++ b/ctaocrypt/src/pwdbased.c
@@ -23,6 +23,8 @@
     #include <config.h>
 #endif
 
+#include <cyassl/ctaocrypt/settings.h>
+
 #ifndef NO_PWDBASED
 
 #include <cyassl/ctaocrypt/pwdbased.h>
diff --git a/ctaocrypt/src/rabbit.c b/ctaocrypt/src/rabbit.c
index e0f265866..dee504361 100644
--- a/ctaocrypt/src/rabbit.c
+++ b/ctaocrypt/src/rabbit.c
@@ -23,6 +23,8 @@
     #include <config.h>
 #endif
 
+#include <cyassl/ctaocrypt/settings.h>
+
 #ifndef NO_RABBIT
 
 #include <cyassl/ctaocrypt/rabbit.h>
diff --git a/ctaocrypt/src/random.c b/ctaocrypt/src/random.c
index 931ea753e..16904c93f 100644
--- a/ctaocrypt/src/random.c
+++ b/ctaocrypt/src/random.c
@@ -23,6 +23,8 @@
     #include <config.h>
 #endif
 
+#include <cyassl/ctaocrypt/settings.h>
+
 /* on HPUX 11 you may need to install /dev/random see
    http://h20293.www2.hp.com/portal/swdepot/displayProductInfo.do?productNumber=KRNG11I
 
diff --git a/ctaocrypt/src/ripemd.c b/ctaocrypt/src/ripemd.c
index 6501aac09..f32351d5c 100644
--- a/ctaocrypt/src/ripemd.c
+++ b/ctaocrypt/src/ripemd.c
@@ -24,6 +24,8 @@
     #include <config.h>
 #endif
 
+#include <cyassl/ctaocrypt/settings.h>
+
 #ifdef CYASSL_RIPEMD
 
 #include <cyassl/ctaocrypt/ripemd.h>
diff --git a/ctaocrypt/src/rsa.c b/ctaocrypt/src/rsa.c
index 9f93253fb..22b9094a2 100644
--- a/ctaocrypt/src/rsa.c
+++ b/ctaocrypt/src/rsa.c
@@ -24,6 +24,8 @@
     #include <config.h>
 #endif
 
+#include <cyassl/ctaocrypt/settings.h>
+
 #ifndef NO_RSA
 
 #include <cyassl/ctaocrypt/rsa.h>
diff --git a/ctaocrypt/src/sha.c b/ctaocrypt/src/sha.c
index 9a862b76c..9f22b7e44 100644
--- a/ctaocrypt/src/sha.c
+++ b/ctaocrypt/src/sha.c
@@ -24,6 +24,8 @@
     #include <config.h>
 #endif
 
+#include <cyassl/ctaocrypt/settings.h>
+
 #ifndef NO_SHA
 
 #include <cyassl/ctaocrypt/sha.h>
diff --git a/ctaocrypt/src/sha256.c b/ctaocrypt/src/sha256.c
index 4dd3e11ef..baa379059 100644
--- a/ctaocrypt/src/sha256.c
+++ b/ctaocrypt/src/sha256.c
@@ -26,6 +26,8 @@
     #include <config.h>
 #endif
 
+#include <cyassl/ctaocrypt/settings.h>
+
 #ifndef NO_SHA256
 
 #include <cyassl/ctaocrypt/sha256.h>
diff --git a/ctaocrypt/src/sha512.c b/ctaocrypt/src/sha512.c
index f0f10338b..b8d57085f 100644
--- a/ctaocrypt/src/sha512.c
+++ b/ctaocrypt/src/sha512.c
@@ -23,6 +23,7 @@
     #include <config.h>
 #endif
 
+#include <cyassl/ctaocrypt/settings.h>
 
 #ifdef CYASSL_SHA512
 
diff --git a/src/crl.c b/src/crl.c
index e65cc3236..5fba84fdb 100644
--- a/src/crl.c
+++ b/src/crl.c
@@ -23,6 +23,7 @@
     #include <config.h>
 #endif
 
+#include <cyassl/ctaocrypt/settings.h>
 
 #ifdef HAVE_CRL
 
diff --git a/src/internal.c b/src/internal.c
index 6dc90751a..fb9f9ea66 100644
--- a/src/internal.c
+++ b/src/internal.c
@@ -24,6 +24,8 @@
     #include <config.h>
 #endif
 
+#include <cyassl/ctaocrypt/settings.h>
+
 #include <cyassl/internal.h>
 #include <cyassl/error.h>
 #include <cyassl/ctaocrypt/asn.h>
diff --git a/src/io.c b/src/io.c
index 7fe4f0260..2a5dd850b 100644
--- a/src/io.c
+++ b/src/io.c
@@ -23,6 +23,8 @@
     #include <config.h>
 #endif
 
+#include <cyassl/ctaocrypt/settings.h>
+
 #ifdef _WIN32_WCE
     /* On WinCE winsock2.h must be included before windows.h for socket stuff */
     #include <winsock2.h>
diff --git a/src/keys.c b/src/keys.c
index 4e9fcd81c..0c86f3f6e 100644
--- a/src/keys.c
+++ b/src/keys.c
@@ -24,6 +24,8 @@
     #include <config.h>
 #endif
 
+#include <cyassl/ctaocrypt/settings.h>
+
 #include <cyassl/internal.h>
 #include <cyassl/error.h>
 #ifdef SHOW_SECRETS
diff --git a/src/ocsp.c b/src/ocsp.c
index 6fd3dbe13..dae9c914f 100644
--- a/src/ocsp.c
+++ b/src/ocsp.c
@@ -23,6 +23,8 @@
     #include <config.h>
 #endif
 
+#include <cyassl/ctaocrypt/settings.h>
+
 #ifdef HAVE_OCSP
 
 #ifdef EBSNET
diff --git a/src/sniffer.c b/src/sniffer.c
index 56aeac9d8..c66b519f0 100644
--- a/src/sniffer.c
+++ b/src/sniffer.c
@@ -20,12 +20,15 @@
  */
 
 
-#ifdef CYASSL_SNIFFER
 
 #ifdef HAVE_CONFIG_H
     #include <config.h>
 #endif
 
+#include <cyassl/ctaocrypt/settings.h>
+
+#ifdef CYASSL_SNIFFER
+
 #include <assert.h>
 #include <time.h>
 
diff --git a/src/ssl.c b/src/ssl.c
index 5babd86bd..e6615d477 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -23,6 +23,8 @@
     #include <config.h>
 #endif
 
+#include <cyassl/ctaocrypt/settings.h>
+
 #ifdef HAVE_ERRNO_H 
     #include <errno.h>
 #endif
diff --git a/src/tls.c b/src/tls.c
index f553dfd4c..2269825ca 100644
--- a/src/tls.c
+++ b/src/tls.c
@@ -23,6 +23,8 @@
     #include <config.h>
 #endif
 
+#include <cyassl/ctaocrypt/settings.h>
+
 #include <cyassl/ssl.h>
 #include <cyassl/internal.h>
 #include <cyassl/error.h>