Merge pull request #444 from JacobBarthelmeh/release

fix for include with FIPS build and cast with g++ build

Author: ejohnstown

apps/wolfsshd/auth.c

@@ -26,7 +26,9 @@
 
 #ifdef __linux__
     #define _XOPEN_SOURCE
-    #define _GNU_SOURCE
+    #ifndef _GNU_SOURCE
+        #define _GNU_SOURCE
+    #endif
 #endif
 #include <unistd.h>
 

apps/wolfsshd/configuration.c

@@ -479,7 +479,7 @@ static int HandleInclude(WOLFSSHD_CONFIG *conf, const char *value)
         struct dirent *dir;
         DIR *d;
         char *path;
-        char *filepath = WMALLOC(PATH_MAX, NULL, 0);
+        char *filepath = (char*)WMALLOC(PATH_MAX, NULL, 0);
 
         /* Back find the full path */
         while (ptr2 != value) {
@@ -490,13 +490,13 @@ static int HandleInclude(WOLFSSHD_CONFIG *conf, const char *value)
         }
 
         if (ptr2 != value) {
-            path = WMALLOC(ptr2 - value + 1, NULL, 0);
+            path = (char*)WMALLOC(ptr2 - value + 1, NULL, 0);
             memcpy(path, value, ptr2 - value);
             path[ptr2 - value] = '\0';
             prefix = ptr2 + 1;
             prefixLen = (int)(ptr - ptr2 - 1);
         } else {
-            path = WMALLOC(2, NULL, 0);
+            path = (char*)WMALLOC(2, NULL, 0);
             memcpy(path, ".", 1);
             path[1] = '\0';
             prefix = value;

apps/wolfsshd/wolfsshd.c

@@ -780,6 +780,11 @@ int main(int argc, char** argv)
 
             case 'p':
                 if (ret == WS_SUCCESS) {
+                    if (myoptarg == NULL) {
+                        ret = WS_BAD_ARGUMENT;
+                        break;
+                    }
+
                     ret = XATOI(myoptarg);
                     if (ret < 0) {
                         fprintf(stderr, "Issue parsing port number %s\n",

examples/echoserver/echoserver.c

@@ -747,7 +747,7 @@ static int ssh_worker(thread_ctx_t* threadCtx)
                 if (agentListenFd > maxFd)
                     maxFd = agentListenFd;
             }
-            if (threadCtx->agentCbCtx.state == AGENT_STATE_CONNECTED) {
+            if (agentFd >= 0 && threadCtx->agentCbCtx.state == AGENT_STATE_CONNECTED) {
                 FD_SET(agentFd, &readFds);
                 if (agentFd > maxFd)
                     maxFd = agentFd;
@@ -759,7 +759,7 @@ static int ssh_worker(thread_ctx_t* threadCtx)
                 if (fwdListenFd > maxFd)
                     maxFd = fwdListenFd;
             }
-            if (threadCtx->fwdCbCtx.state == FWD_STATE_CONNECTED) {
+            if (fwdFd >= 0 && threadCtx->fwdCbCtx.state == FWD_STATE_CONNECTED) {
                 FD_SET(fwdFd, &readFds);
                 if (fwdFd > maxFd)
                     maxFd = fwdFd;
@@ -918,7 +918,7 @@ static int ssh_worker(thread_ctx_t* threadCtx)
             }
             #endif
             #ifdef WOLFSSH_AGENT
-            if (threadCtx->agentCbCtx.state == AGENT_STATE_CONNECTED) {
+            if (agentFd >= 0 && threadCtx->agentCbCtx.state == AGENT_STATE_CONNECTED) {
                 if (FD_ISSET(agentFd, &readFds)) {
                     #ifdef SHELL_DEBUG
                         printf("agentFd set in readfd\n");
@@ -979,7 +979,7 @@ static int ssh_worker(thread_ctx_t* threadCtx)
             }
             #endif
             #ifdef WOLFSSH_FWD
-            if (threadCtx->fwdCbCtx.state == FWD_STATE_CONNECTED) {
+            if (fwdFd >= 0 && threadCtx->fwdCbCtx.state == FWD_STATE_CONNECTED) {
                 if (FD_ISSET(fwdFd, &readFds)) {
                     #ifdef SHELL_DEBUG
                         printf("fwdFd set in readfd\n");

examples/portfwd/portfwd.c

@@ -271,6 +271,8 @@ THREAD_RETURN WOLFSSH_THREAD portfwd_worker(void* args)
                 break;
 
             case 'p':
+                if (myoptarg == NULL)
+                    err_sys("null argument found");
                 port = (word16)atoi(myoptarg);
                 #if !defined(NO_MAIN_DRIVER) || defined(USE_WINDOWS_API)
                     if (port == 0)

examples/scpclient/scpclient.c

@@ -277,6 +277,9 @@ THREAD_RETURN WOLFSSH_THREAD scp_client(void* args)
                 break;
 
             case 'p':
+                if (myoptarg == NULL)
+                    err_sys("null argument found");
+
                 port = (word16)atoi(myoptarg);
                 #if !defined(NO_MAIN_DRIVER) || defined(USE_WINDOWS_API)
                     if (port == 0)

examples/sftpclient/sftpclient.c

@@ -1361,6 +1361,8 @@ THREAD_RETURN WOLFSSH_THREAD sftpclient_test(void* args)
                 break;
 
             case 'p':
+                if (myoptarg == NULL)
+                    err_sys("null argument found");
                 port = (word16)atoi(myoptarg);
                 #if !defined(NO_MAIN_DRIVER) || defined(USE_WINDOWS_API)
                     if (port == 0)

src/ssh.c

@@ -43,6 +43,7 @@
 #endif
 
 #ifdef HAVE_FIPS
+#include <wolfssl/wolfcrypt/fips_test.h>
 static void myFipsCb(int ok, int err, const char* hash)
 {
     printf("in my Fips callback, ok = %d, err = %d\n", ok, err);