Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dev bundle, version 1.4.16 #658

Merged
merged 3 commits into from
Feb 27, 2024
Merged

dev bundle, version 1.4.16 #658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dda8905
dev bundle, version 1.4.16
JacobBarthelmeh Feb 21, 2024
8b7a15f
check for channel closed on shutdown
JacobBarthelmeh Feb 22, 2024
9e9db31
fix for echo of characters with shell connection
JacobBarthelmeh Feb 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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])

Expand All @@ -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
# | | |
# +------+ | +---+
# | | |
Expand Down
3 changes: 2 additions & 1 deletion examples/client/client.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.");
}
Expand Down
3 changes: 2 additions & 1 deletion src/internal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions wolfssh/version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
Loading