From ec76ab7e421d2808e1b383437f5213e133c4f5ad Mon Sep 17 00:00:00 2001
From: John Safranek <john@wolfssl.com>
Date: Thu, 29 Nov 2018 09:08:48 -0800
Subject: [PATCH] Server Side Renegotiation 1. Add an extra guard check around
 a call to SendHelloRequest() in the case where server renegotiation is
 disabled. 2. Replaced an accidental deletion of an include of the misc.h
 header for no inline builds.

---
 src/ssl.c | 4 ++--
 src/tls.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/ssl.c b/src/ssl.c
index 5c059eb4d..74cd62076 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -2395,13 +2395,13 @@ int wolfSSL_Rehandshake(WOLFSSL* ssl)
 
         ssl->secure_renegotiation->cache_status = SCR_CACHE_NEEDED;
 
-#ifndef NO_WOLFSSL_SERVER
+#if !defined(NO_WOLFSSL_SERVER) && defined(HAVE_SERVER_RENEGOTIATION_INFO)
         if (ssl->options.side == WOLFSSL_SERVER_END) {
             ret = SendHelloRequest(ssl);
             if (ret != 0)
                 return ret;
         }
-#endif /* NO_WOLFSSL_SERVER*/
+#endif /* NO_WOLFSSL_SERVER && HAVE_SERVER_RENEGOTIATION_INFO */
 
         ret = InitHandshakeHashes(ssl);
         if (ret !=0)
diff --git a/src/tls.c b/src/tls.c
index f932dfcec..ac5c1adf7 100644
--- a/src/tls.c
+++ b/src/tls.c
@@ -34,7 +34,7 @@
 #include <wolfssl/error-ssl.h>
 #include <wolfssl/wolfcrypt/hmac.h>
 #ifdef NO_INLINE
-
+    #include <wolfssl/wolfcrypt/misc.h>
 #else
     #define WOLFSSL_MISC_INCLUDED
     #include <wolfcrypt/src/misc.c>