From 650ddb8d23dbf30b9e5c3613ef6995381928684b Mon Sep 17 00:00:00 2001
From: David Garske <david@wolfssl.com>
Date: Wed, 23 Nov 2016 17:19:54 -0800
Subject: [PATCH] Fixes so make check works with NO_FILESYSTEM and
 FORCE_BUFFER_TEST. Example: ./configure CFLAGS="-DNO_FILESYSTEM
 -DFORCE_BUFFER_TEST"

---
 examples/client/client.c | 23 +++++++++++++++++------
 wolfssl/test.h           | 14 +++++++-------
 2 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/examples/client/client.c b/examples/client/client.c
index 23574d8f3..7d5b43e2a 100644
--- a/examples/client/client.c
+++ b/examples/client/client.c
@@ -1186,8 +1186,9 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
 #ifdef VERIFY_CALLBACK
     wolfSSL_CTX_set_verify(ctx, SSL_VERIFY_PEER, myVerify);
 #endif
-#if !defined(NO_FILESYSTEM) && !defined(NO_CERTS)
+#if !defined(NO_CERTS)
     if (useClientCert){
+#if !defined(NO_FILESYSTEM)
         if (wolfSSL_CTX_use_certificate_chain_file(ctx, ourCert) != SSL_SUCCESS)
             err_sys("can't load client cert file, check file and run from"
                     " wolfSSL home dir");
@@ -1196,32 +1197,42 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
                                          != SSL_SUCCESS)
             err_sys("can't load client private key file, check file and run "
                     "from wolfSSL home dir");
+#else
+        load_buffer(ctx, ourCert, WOLFSSL_CERT_CHAIN);
+        load_buffer(ctx, ourKey, WOLFSSL_KEY);
+#endif  /* !defined(NO_FILESYSTEM) */
     }
 
     if (!usePsk && !useAnon) {
+#if !defined(NO_FILESYSTEM)
         if (wolfSSL_CTX_load_verify_locations(ctx, verifyCert,0) != SSL_SUCCESS)
             err_sys("can't load ca file, Please run from wolfSSL home dir");
+#else
+        load_buffer(ctx, verifyCert, WOLFSSL_CA);
+#endif  /* !defined(NO_FILESYSTEM) */
 #ifdef HAVE_ECC
         /* load ecc verify too, echoserver uses it by default w/ ecc */
+#if !defined(NO_FILESYSTEM)
         if (wolfSSL_CTX_load_verify_locations(ctx, eccCert, 0) != SSL_SUCCESS)
             err_sys("can't load ecc ca file, Please run from wolfSSL home dir");
+#else
+        load_buffer(ctx, eccCert, WOLFSSL_CA);
+#endif  /* !defined(NO_FILESYSTEM) */
 #endif /* HAVE_ECC */
-#ifdef WOLFSSL_TRUST_PEER_CERT
+#if defined(WOLFSSL_TRUST_PEER_CERT) && !defined(NO_FILESYSTEM)
         if (trustCert) {
             if ((ret = wolfSSL_CTX_trust_peer_cert(ctx, trustCert,
                                             SSL_FILETYPE_PEM)) != SSL_SUCCESS) {
                 err_sys("can't load trusted peer cert file");
             }
         }
-#endif /* WOLFSSL_TRUST_PEER_CERT */
+#endif /* WOLFSSL_TRUST_PEER_CERT && !NO_FILESYSTEM */
     }
-#endif /* !NO_FILESYSTEM && !NO_CERTS */
-#if !defined(NO_CERTS)
     if (!usePsk && !useAnon && doPeerCheck == 0)
         wolfSSL_CTX_set_verify(ctx, SSL_VERIFY_NONE, 0);
     if (!usePsk && !useAnon && overrideDateErrors == 1)
         wolfSSL_CTX_set_verify(ctx, SSL_VERIFY_PEER, myDateCb);
-#endif
+#endif /* !defined(NO_CERTS) */
 
 #ifdef WOLFSSL_ASYNC_CRYPT
     ret = wolfAsync_DevOpen(&devId);
diff --git a/wolfssl/test.h b/wolfssl/test.h
index 8fea48176..a488418f1 100644
--- a/wolfssl/test.h
+++ b/wolfssl/test.h
@@ -934,7 +934,7 @@ static INLINE void tcp_accept(SOCKET_T* sockfd, SOCKET_T* clientfd,
     #endif
 
         if (ready_file) {
-        #ifndef NO_FILESYSTEM
+        #if !defined(NO_FILESYSTEM) || defined(FORCE_BUFFER_TEST)
             FILE* srf = NULL;
             if (args)
                 ready = args->signal;
@@ -1080,7 +1080,7 @@ static INLINE unsigned int my_psk_server_cb(WOLFSSL* ssl, const char* identity,
 #endif /* USE_WINDOWS_API */
 
 
-#if defined(NO_FILESYSTEM) && !defined(NO_CERTS)
+#if defined(NO_FILESYSTEM) && !defined(NO_CERTS) && defined(FORCE_BUFFER_TEST)
 
     enum {
         WOLFSSL_CA   = 1,
@@ -1291,13 +1291,13 @@ static INLINE void CaCb(unsigned char* der, int sz, int type)
 
     static INLINE int ChangeToWolfRoot(void)
     {
-        #if !defined(NO_FILESYSTEM)
+        #if !defined(NO_FILESYSTEM) || defined(FORCE_BUFFER_TEST)
             int depth, res;
-            XFILE file;
+            FILE* file;
             for(depth = 0; depth <= MAX_WOLF_ROOT_DEPTH; depth++) {
-                file = XFOPEN(ntruKey, "rb");
-                if (file != XBADFILE) {
-                    XFCLOSE(file);
+                file = fopen(ntruKey, "rb");
+                if (file != NULL) {
+                    fclose(file);
                     return depth;
                 }
             #ifdef USE_WINDOWS_API