Merge pull request #658 from JacobBarthelmeh/dev_bump

dev bundle, version 1.4.16

configure.ac

@@ -3,7 +3,7 @@
 # All right reserved.
 
 AC_COPYRIGHT([Copyright (C) 2014-2023 wolfSSL Inc.])
-AC_INIT([wolfssh],[1.4.15],[[email protected]],[wolfssh],[https://www.wolfssl.com])
+AC_INIT([wolfssh],[1.4.16],[[email protected]],[wolfssh],[https://www.wolfssl.com])
 AC_PREREQ([2.63])
 AC_CONFIG_AUX_DIR([build-aux])
 
@@ -18,7 +18,7 @@ AC_ARG_PROGRAM
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])
 
-WOLFSSH_LIBRARY_VERSION=15:2:7
+WOLFSSH_LIBRARY_VERSION=15:3:8
 #                       | | |
 #                +------+ | +---+
 #                |        |     |

examples/client/client.c

@@ -977,7 +977,8 @@ THREAD_RETURN WOLFSSH_THREAD client_test(void* args)
     }
     ret = wolfSSH_shutdown(ssh);
     /* do not continue on with shutdown process if peer already disconnected */
-    if (ret != WS_SOCKET_ERROR_E && wolfSSH_get_error(ssh) != WS_SOCKET_ERROR_E) {
+    if (ret != WS_SOCKET_ERROR_E && wolfSSH_get_error(ssh) != WS_SOCKET_ERROR_E
+            && wolfSSH_get_error(ssh) != WS_CHANNEL_CLOSED) {
         if (ret != WS_SUCCESS) {
             err_sys("Sending the shutdown messages failed.");
         }

src/internal.c

@@ -7335,7 +7335,8 @@ int wolfSSH_DoModes(const byte* modes, word32 modesSz, int fd)
                 TTY_SET_FLAG(term.c_lflag, ONLCR, arg);
                 break;
             case WOLFSSH_OCRNL:
-                TTY_SET_FLAG(term.c_lflag, OCRNL, arg);
+                /* keep as default, adjusting removes echo over shell */
+                /* TTY_SET_FLAG(term.c_lflag, OCRNL, arg); */
                 break;
             case WOLFSSH_ONOCR:
                 TTY_SET_FLAG(term.c_lflag, ONOCR, arg);

wolfssh/version.h

@@ -35,8 +35,8 @@
 extern "C" {
 #endif
 
-#define LIBWOLFSSH_VERSION_STRING "1.4.15"
-#define LIBWOLFSSH_VERSION_HEX 0x01004015
+#define LIBWOLFSSH_VERSION_STRING "1.4.16"
+#define LIBWOLFSSH_VERSION_HEX 0x01004016
 
 #ifdef __cplusplus
 }