From dd469bb67d4b8a0c9b415fc14fa9381edefd1621 Mon Sep 17 00:00:00 2001
From: kaleb-himes <kaleb@wolfssl.com>
Date: Mon, 4 Jan 2016 15:03:39 -0700
Subject: [PATCH 1/3] avoid unused variable warnings

---
 src/internal.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/internal.c b/src/internal.c
index 2a8c6b7da..008a45f1c 100644
--- a/src/internal.c
+++ b/src/internal.c
@@ -1519,6 +1519,11 @@ void InitSuites(Suites* suites, ProtocolVersion pv, word16 haveRSA,
     }
 #endif
 
+    /* account for  unused variable warnings ifdef WOLFSSL_DTLS  */
+#ifdef WOLFSSL_DTLS
+    (void) dtls;
+    (void) tls;
+#endif
     suites->suiteSz = idx;
 
     InitSuitesHashSigAlgo(suites, haveECDSAsig, haveRSAsig, 0);
@@ -15438,7 +15443,7 @@ int DoSessionTicket(WOLFSSL* ssl,
                 #error "DTLS needs either SHA or SHA-256"
             #endif /* NO_SHA && NO_SHA256 */
 
-            #ifndef NO_SHA
+            #if !defined(NO_SHA) && defined(NO_SHA256)
                 cookieType = SHA;
                 cookieSz = SHA_DIGEST_SIZE;
             #endif /* NO_SHA */

From 29e6f283cff6e5a28a34cef611538bac316bca6a Mon Sep 17 00:00:00 2001
From: kaleb-himes <kaleb@wolfssl.com>
Date: Tue, 5 Jan 2016 14:19:46 -0700
Subject: [PATCH 2/3] Implement peer suggestion

---
 src/internal.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/internal.c b/src/internal.c
index 008a45f1c..cc35f158d 100644
--- a/src/internal.c
+++ b/src/internal.c
@@ -832,6 +832,9 @@ void InitSuites(Suites* suites, ProtocolVersion pv, word16 haveRSA,
         tls1_2 = pv.minor <= DTLSv1_2_MINOR;
     }
 #endif
+        /* May be dead assignments dependant upon configuration */
+        (void) dtls;
+        (void) tls;
 
 #ifdef HAVE_RENEGOTIATION_INDICATION
     if (side == WOLFSSL_CLIENT_END) {
@@ -1519,11 +1522,6 @@ void InitSuites(Suites* suites, ProtocolVersion pv, word16 haveRSA,
     }
 #endif
 
-    /* account for  unused variable warnings ifdef WOLFSSL_DTLS  */
-#ifdef WOLFSSL_DTLS
-    (void) dtls;
-    (void) tls;
-#endif
     suites->suiteSz = idx;
 
     InitSuitesHashSigAlgo(suites, haveECDSAsig, haveRSAsig, 0);

From a6ca2c3bdd7fbc039eb0fa7f24247a13df870bea Mon Sep 17 00:00:00 2001
From: kaleb-himes <kaleb@wolfssl.com>
Date: Tue, 5 Jan 2016 14:32:45 -0700
Subject: [PATCH 3/3] Avoid un-necessary cast

---
 src/internal.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/internal.c b/src/internal.c
index cc35f158d..440d768fc 100644
--- a/src/internal.c
+++ b/src/internal.c
@@ -829,12 +829,12 @@ void InitSuites(Suites* suites, ProtocolVersion pv, word16 haveRSA,
     if (pv.major == DTLS_MAJOR) {
         dtls   = 1;
         tls    = 1;
-        tls1_2 = pv.minor <= DTLSv1_2_MINOR;
-    }
-#endif
         /* May be dead assignments dependant upon configuration */
         (void) dtls;
         (void) tls;
+        tls1_2 = pv.minor <= DTLSv1_2_MINOR;
+    }
+#endif
 
 #ifdef HAVE_RENEGOTIATION_INDICATION
     if (side == WOLFSSL_CLIENT_END) {