From 9d05e9c0b7a3b4eb77dfdacb0cff34f8a88a0929 Mon Sep 17 00:00:00 2001
From: David Garske <david@wolfssl.com>
Date: Wed, 25 Sep 2019 07:17:57 -0700
Subject: [PATCH] Fixes for minor nightly build tests.

---
 examples/server/server.c |  2 ++
 src/ssl.c                | 12 ++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/examples/server/server.c b/examples/server/server.c
index 893bc251c..73d2a758c 100644
--- a/examples/server/server.c
+++ b/examples/server/server.c
@@ -1189,7 +1189,9 @@ THREAD_RETURN WOLFSSL_THREAD server_test(void* args)
                 #endif
                 }
                 else if (XSTRNCMP(myoptarg, "overrideDateErr", 15) == 0) {
+                #if !defined(NO_FILESYSTEM) && !defined(NO_CERTS)
                     overrideDateErrors = 1;
+                #endif
                 }
                 else {
                     Usage();
diff --git a/src/ssl.c b/src/ssl.c
index 3615b431b..7388385b2 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -10396,7 +10396,7 @@ static int wolfSSL_parse_cipher_list(WOLFSSL_CTX* ctx, Suites* suites,
             name[(length == sizeof(name)) ? length - 1 : length] = 0;
 
             /* check for "not" case */
-            if (name[0] == '!') {
+            if (name[0] == '!' && suiteSz > 0) {
                 /* populate list with all suites if not already created */
                 if (localList == NULL) {
                     for (i = 0; i < suiteSz; i++) {
@@ -40287,8 +40287,11 @@ const byte* wolfSSL_SESSION_get_id(WOLFSSL_SESSION* sess, unsigned int* idLen)
     return sess->sessionID;
 }
 
-#if defined(SESSION_CERTS) || (defined(WOLFSSL_TLS13) && \
-                               defined(HAVE_SESSION_TICKET))
+#if (defined(HAVE_SESSION_TICKET) || defined(SESSION_CERTS)) && \
+    !defined(NO_FILESYSTEM)
+
+#if defined(SESSION_CERTS) || \
+   (defined(WOLFSSL_TLS13) && defined(HAVE_SESSION_TICKET))
 /* returns a pointer to the protocol used by the session */
 static const char* wolfSSL_SESSION_get_protocol(const WOLFSSL_SESSION* in)
 {
@@ -40296,9 +40299,6 @@ static const char* wolfSSL_SESSION_get_protocol(const WOLFSSL_SESSION* in)
 }
 #endif
 
-
-#if (defined(HAVE_SESSION_TICKET) || defined(SESSION_CERTS)) && \
-    !defined(NO_FILESYSTEM)
 /* returns true (non 0) if the session has EMS (extended master secret) */
 static int wolfSSL_SESSION_haveEMS(const WOLFSSL_SESSION* in)
 {