From e11dd9803a703ba433665f354c4de86efaa5b74a Mon Sep 17 00:00:00 2001
From: toddouska <todd@wolfssl.com>
Date: Wed, 28 May 2014 17:36:21 -0700
Subject: [PATCH] fix icc v14 warnings

---
 configure.ac                | 7 +++++++
 ctaocrypt/src/misc.c        | 2 ++
 cyassl/ctaocrypt/settings.h | 6 ++++++
 examples/client/client.c    | 8 ++++----
 examples/server/server.c    | 6 +++---
 src/keys.c                  | 4 ++--
 6 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index 2b84124cc..778b20193 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1635,6 +1635,13 @@ then
     fi
 fi
 
+# ICC command line warning for non supported warning flags
+if test "$CC" = "icc"
+then
+    AM_CFLAGS="$AM_CFLAGS -wd10006"
+fi
+
+
 LIB_SOCKET_NSL
 AX_HARDEN_CC_COMPILER_FLAGS
 
diff --git a/ctaocrypt/src/misc.c b/ctaocrypt/src/misc.c
index 69fd4a449..7d4d33594 100644
--- a/ctaocrypt/src/misc.c
+++ b/ctaocrypt/src/misc.c
@@ -45,6 +45,8 @@
 
     #include <stdlib.h>      /* get intrinsic definitions */
 
+    /* for non visual studio probably need no long version, 32 bit only
+     * i.e., _rotl and _rotr */
     #pragma intrinsic(_lrotl, _lrotr)
 
     STATIC INLINE word32 rotlFixed(word32 x, word32 y)
diff --git a/cyassl/ctaocrypt/settings.h b/cyassl/ctaocrypt/settings.h
index c49e3725c..57bb8290e 100644
--- a/cyassl/ctaocrypt/settings.h
+++ b/cyassl/ctaocrypt/settings.h
@@ -673,6 +673,12 @@
     #define NO_SKID
 #endif
 
+
+#ifdef __INTEL_COMPILER
+    #pragma warning(disable:2259) /* explicit casts to smaller sizes, disable */
+#endif
+
+
 /* Place any other flags or defines here */
 
 
diff --git a/examples/client/client.c b/examples/client/client.c
index 113bed9f6..1c4041850 100644
--- a/examples/client/client.c
+++ b/examples/client/client.c
@@ -180,7 +180,7 @@ THREAD_RETURN CYASSL_THREAD client_test(void* args)
 
     word16 port   = yasslPort;
     char* host   = (char*)yasslIP;
-    char* domain = (char*)"www.yassl.com";
+    const char* domain = "www.yassl.com";
 
     int    ch;
     int    version = CLIENT_INVALID_VERSION;
@@ -198,9 +198,9 @@ THREAD_RETURN CYASSL_THREAD client_test(void* args)
     int    atomicUser    = 0;
     int    pkCallbacks   = 0;
     char*  cipherList = NULL;
-    char*  verifyCert = (char*)caCert;
-    char*  ourCert    = (char*)cliCert;
-    char*  ourKey     = (char*)cliKey;
+    const char* verifyCert = caCert;
+    const char* ourCert    = cliCert;
+    const char* ourKey     = cliKey;
 
 #ifdef HAVE_SNI
     char*  sniHostName = NULL;
diff --git a/examples/server/server.c b/examples/server/server.c
index a42581d90..b64aaa71c 100644
--- a/examples/server/server.c
+++ b/examples/server/server.c
@@ -164,9 +164,9 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args)
     int    fewerPackets = 0;
     int    pkCallbacks  = 0;
     char*  cipherList = NULL;
-    char*  verifyCert = (char*)cliCert;
-    char*  ourCert    = (char*)svrCert;
-    char*  ourKey     = (char*)svrKey;
+    const char* verifyCert = cliCert;
+    const char* ourCert    = svrCert;
+    const char* ourKey     = svrKey;
     int    argc = ((func_args*)args)->argc;
     char** argv = ((func_args*)args)->argv;
 
diff --git a/src/keys.c b/src/keys.c
index dabebe5ed..bcd169a96 100644
--- a/src/keys.c
+++ b/src/keys.c
@@ -2023,8 +2023,8 @@ static int MakeSslMasterSecret(CYASSL* ssl)
     XMEMCPY(md5Input, ssl->arrays->preMasterSecret, pmsSz);
 
     for (i = 0; i < MASTER_ROUNDS; ++i) {
-        byte prefix[PREFIX];
-        if (!SetPrefix(prefix, i)) {
+        byte prefix[KEY_PREFIX];      /* only need PREFIX bytes but static */
+        if (!SetPrefix(prefix, i)) {  /* analysis thinks will overrun      */
             return PREFIX_ERROR;
         }