From dda8905daafc13a0bb8cca4cdb92485e55aa0d3f Mon Sep 17 00:00:00 2001 From: JacobBarthelmeh Date: Thu, 22 Feb 2024 03:16:22 +0700 Subject: [PATCH 1/3] dev bundle, version 1.4.16 --- configure.ac | 4 ++-- wolfssh/version.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 9e7b1abcc..4070c2176 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ # All right reserved. AC_COPYRIGHT([Copyright (C) 2014-2023 wolfSSL Inc.]) -AC_INIT([wolfssh],[1.4.15],[support@wolfssl.com],[wolfssh],[https://www.wolfssl.com]) +AC_INIT([wolfssh],[1.4.16],[support@wolfssl.com],[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 # | | | # +------+ | +---+ # | | | diff --git a/wolfssh/version.h b/wolfssh/version.h index 3c3e9cfdc..34fdb11a9 100644 --- a/wolfssh/version.h +++ b/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 } From 8b7a15f0fdd4c24a548d348616d0dbb23d31f1fe Mon Sep 17 00:00:00 2001 From: JacobBarthelmeh Date: Thu, 22 Feb 2024 07:44:24 -0800 Subject: [PATCH 2/3] check for channel closed on shutdown --- examples/client/client.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/examples/client/client.c b/examples/client/client.c index 4d56575f6..9fed6fac2 100644 --- a/examples/client/client.c +++ b/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."); } From 9e9db3121d207cc246bda0e0d9821694b3d62090 Mon Sep 17 00:00:00 2001 From: JacobBarthelmeh Date: Thu, 22 Feb 2024 09:10:17 -0800 Subject: [PATCH 3/3] fix for echo of characters with shell connection --- src/internal.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/internal.c b/src/internal.c index e7020fbfc..fccbb5d67 100644 --- a/src/internal.c +++ b/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);