Skip to content

Commit

Permalink
Merge pull request #374 from JacobBarthelmeh/release
Browse files Browse the repository at this point in the history
  • Loading branch information
ejohnstown authored Nov 4, 2021
2 parents d917ec6 + ba99ddd commit bb6e6e2
Show file tree
Hide file tree
Showing 54 changed files with 151 additions and 122 deletions.
20 changes: 20 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,23 @@
# wolfSSH v1.4.8 (Nov 4, 2021)

## New Feature Additions and Improvements

- Add remote port forwarding
- Make loading user created keys into the examples easier
- Add --with-wolfssl and use --prefix to look for wolfSSL
- Updated the unsupported GlobalReq response


## Fixes

- Fix for RSA public key auth
- When decoding SFTP messages, fix the size checks so they don't wrap
- Fix an issue where the testsuite and echoserver a socket failure
- SFTP fix for getting attribute header
- Fix for possible null dereference in SendKexDhReply
- Remove reference to udp from test.h
- Fixes to local port forwarding

# wolfSSH v1.4.7 (July 23, 2021)

## New Feature Additions and Improvements
Expand Down
4 changes: 2 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# All right reserved.

AC_COPYRIGHT([Copyright (C) 2014-2020 wolfSSL Inc.])
AC_INIT([wolfssh],[1.4.7],[support@wolfssl.com],[wolfssh],[https://www.wolfssl.com])
AC_INIT([wolfssh],[1.4.8],[support@wolfssl.com],[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([src/config.h])

WOLFSSH_LIBRARY_VERSION=12:2:3
WOLFSSH_LIBRARY_VERSION=12:3:3
# | | |
# +------+ | +---+
# | | |
Expand Down
2 changes: 1 addition & 1 deletion examples/client/client.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* client.c
*
* Copyright (C) 2014-2020 wolfSSL Inc.
* Copyright (C) 2014-2021 wolfSSL Inc.
*
* This file is part of wolfSSH.
*
Expand Down
2 changes: 1 addition & 1 deletion examples/client/client.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* client.h
*
* Copyright (C) 2014-2020 wolfSSL Inc.
* Copyright (C) 2014-2021 wolfSSL Inc.
*
* This file is part of wolfSSH.
*
Expand Down
4 changes: 2 additions & 2 deletions examples/echoserver/echoserver.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* echoserver.c
*
* Copyright (C) 2014-2020 wolfSSL Inc.
* Copyright (C) 2014-2021 wolfSSL Inc.
*
* This file is part of wolfSSH.
*
Expand Down Expand Up @@ -606,7 +606,7 @@ static int ssh_worker(thread_ctx_t* threadCtx)
#ifdef WOLFSSH_SHELL
const char *userName;
struct passwd *p_passwd;
WS_SOCKET_T childFd;
WS_SOCKET_T childFd = 0;
pid_t childPid;
#endif
#if defined(WOLFSSL_PTHREADS) && defined(WOLFSSL_TEST_GLOBAL_REQ)
Expand Down
2 changes: 1 addition & 1 deletion examples/echoserver/echoserver.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* echoserver.h
*
* Copyright (C) 2014-2020 wolfSSL Inc.
* Copyright (C) 2014-2021 wolfSSL Inc.
*
* This file is part of wolfSSH.
*
Expand Down
2 changes: 1 addition & 1 deletion examples/portfwd/portfwd.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* portfwd.c
*
* Copyright (C) 2014-2020 wolfSSL Inc.
* Copyright (C) 2014-2021 wolfSSL Inc.
*
* This file is part of wolfSSH.
*
Expand Down
2 changes: 1 addition & 1 deletion examples/portfwd/wolfssh_portfwd.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* wolfssh_portfwd.h
*
* Copyright (C) 2014-2020 wolfSSL Inc.
* Copyright (C) 2014-2021 wolfSSL Inc.
*
* This file is part of wolfSSH.
*
Expand Down
2 changes: 1 addition & 1 deletion examples/scpclient/scpclient.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* scpclient.c
*
* Copyright (C) 2014-2020 wolfSSL Inc.
* Copyright (C) 2014-2021 wolfSSL Inc.
*
* This file is part of wolfSSH.
*
Expand Down
2 changes: 1 addition & 1 deletion examples/scpclient/scpclient.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* scpclient.h
*
* Copyright (C) 2014-2020 wolfSSL Inc.
* Copyright (C) 2014-2021 wolfSSL Inc.
*
* This file is part of wolfSSH.
*
Expand Down
2 changes: 1 addition & 1 deletion examples/server/server.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* server.c
*
* Copyright (C) 2014-2020 wolfSSL Inc.
* Copyright (C) 2014-2021 wolfSSL Inc.
*
* This file is part of wolfSSH.
*
Expand Down
2 changes: 1 addition & 1 deletion examples/server/server.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* server.h
*
* Copyright (C) 2014-2020 wolfSSL Inc.
* Copyright (C) 2014-2021 wolfSSL Inc.
*
* This file is part of wolfSSH.
*
Expand Down
10 changes: 5 additions & 5 deletions examples/sftpclient/sftpclient.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* sftpclient.c
*
* Copyright (C) 2014-2020 wolfSSL Inc.
* Copyright (C) 2014-2021 wolfSSL Inc.
*
* This file is part of wolfSSH.
*
Expand Down Expand Up @@ -689,7 +689,7 @@ static int doCmds(func_args* args)
continue;
}

if ((pt = WSTRNSTR(msg, "reget", MAX_CMD_SZ)) != NULL) {
if (WSTRNSTR(msg, "reget", MAX_CMD_SZ) != NULL) {
resume = 1;
}

Expand Down Expand Up @@ -782,7 +782,7 @@ static int doCmds(func_args* args)
}


if ((pt = WSTRNSTR(msg, "reput", MAX_CMD_SZ)) != NULL) {
if (WSTRNSTR(msg, "reput", MAX_CMD_SZ) != NULL) {
resume = 1;
}

Expand Down Expand Up @@ -1175,7 +1175,7 @@ static int doCmds(func_args* args)

}

if ((pt = WSTRNSTR(msg, "ls", MAX_CMD_SZ)) != NULL) {
if (WSTRNSTR(msg, "ls", MAX_CMD_SZ) != NULL) {
WS_SFTPNAME* tmp;
WS_SFTPNAME* current;

Expand All @@ -1201,7 +1201,7 @@ static int doCmds(func_args* args)
}

/* display current working directory */
if ((pt = WSTRNSTR(msg, "pwd", MAX_CMD_SZ)) != NULL) {
if (WSTRNSTR(msg, "pwd", MAX_CMD_SZ) != NULL) {
if (SFTP_FPUTS(args, workingDir) < 0 ||
SFTP_FPUTS(args, "\n") < 0) {
err_msg("fputs error");
Expand Down
2 changes: 1 addition & 1 deletion examples/sftpclient/sftpclient.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* sftpclient.h
*
* Copyright (C) 2014-2020 wolfSSL Inc.
* Copyright (C) 2014-2021 wolfSSL Inc.
*
* This file is part of wolfSSH.
*
Expand Down
2 changes: 1 addition & 1 deletion ide/IAR-EWARM/Projects/lib/myFilesystem.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* dummy_filesystem.h
*
* Copyright (C) 2014-2020 wolfSSL Inc.
* Copyright (C) 2014-2021 wolfSSL Inc.
*
* This file is part of wolfSSH.
*
Expand Down
13 changes: 6 additions & 7 deletions ide/Renesas/cs+/common/strings.h
Original file line number Diff line number Diff line change
@@ -1,22 +1,21 @@
/* strings.h
*
* Copyright (C) 2006-2020 wolfSSL Inc.
* Copyright (C) 2014-2021 wolfSSL Inc.
*
* This file is part of wolfSSL.
* This file is part of wolfSSH.
*
* wolfSSL is free software; you can redistribute it and/or modify
* wolfSSH is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* wolfSSL is distributed in the hope that it will be useful,
* wolfSSH is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
* along with wolfSSH. If not, see <http://www.gnu.org/licenses/>.
*/

int strncasecmp(const char *s1, const char * s2, unsigned int sz);
13 changes: 6 additions & 7 deletions ide/Renesas/cs+/common/unistd.h
Original file line number Diff line number Diff line change
@@ -1,22 +1,21 @@
/* unistd.h
*
* Copyright (C) 2006-2020 wolfSSL Inc.
* Copyright (C) 2014-2021 wolfSSL Inc.
*
* This file is part of wolfSSL.
* This file is part of wolfSSH.
*
* wolfSSL is free software; you can redistribute it and/or modify
* wolfSSH is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* wolfSSL is distributed in the hope that it will be useful,
* wolfSSH is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
* along with wolfSSH. If not, see <http://www.gnu.org/licenses/>.
*/

/* DUMMY Header */
13 changes: 6 additions & 7 deletions ide/Renesas/cs+/common/user_settings.h
Original file line number Diff line number Diff line change
@@ -1,22 +1,21 @@
/* user_settings.h
*
* Copyright (C) 2006-2020 wolfSSL Inc.
* Copyright (C) 2014-2021 wolfSSL Inc.
*
* This file is part of wolfSSL.
* This file is part of wolfSSH.
*
* wolfSSL is free software; you can redistribute it and/or modify
* wolfSSH is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* wolfSSL is distributed in the hope that it will be useful,
* wolfSSH is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
* along with wolfSSH. If not, see <http://www.gnu.org/licenses/>.
*/
#define WOLFCRYPT_ONLY
#define NO_ERROR_STRINGS
Expand Down
13 changes: 6 additions & 7 deletions ide/Renesas/cs+/common/wolfssh_csplus_usersettings.h
Original file line number Diff line number Diff line change
@@ -1,22 +1,21 @@
/* wolfssh_csplus_usersettings..h
*
* Copyright (C) 2006-2020 wolfSSL Inc.
* Copyright (C) 2014-2021 wolfSSL Inc.
*
* This file is part of wolfSSL.
* This file is part of wolfSSH.
*
* wolfSSL is free software; you can redistribute it and/or modify
* wolfSSH is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* wolfSSL is distributed in the hope that it will be useful,
* wolfSSH is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
* along with wolfSSH. If not, see <http://www.gnu.org/licenses/>.
*/

#define RENESAS_CSPLUS
Expand Down
2 changes: 1 addition & 1 deletion ide/Renesas/cs+/demo_server/wolfssh_demo.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* wolfssh_demo.c
*
* Copyright (C) 2014-2020 wolfSSL Inc.
* Copyright (C) 2014-2021 wolfSSL Inc.
*
* This file is part of wolfSSH.
*
Expand Down
2 changes: 1 addition & 1 deletion ide/Renesas/cs+/demo_server/wolfssh_demo.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* wolfssh_demo.h
*
* Copyright (C) 2014-2020 wolfSSL Inc.
* Copyright (C) 2014-2021 wolfSSL Inc.
*
* This file is part of wolfSSH.
*
Expand Down
2 changes: 1 addition & 1 deletion ide/Renesas/cs+/demo_server/wolfssh_dummy.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* wolfssh_dummy.c
*
* Copyright (C) 2014-2020 wolfSSL Inc.
* Copyright (C) 2014-2021 wolfSSL Inc.
*
* This file is part of wolfSSH.
*
Expand Down
2 changes: 1 addition & 1 deletion src/agent.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* agent.c
*
* Copyright (C) 2014-2020 wolfSSL Inc.
* Copyright (C) 2014-2021 wolfSSL Inc.
*
* This file is part of wolfSSH.
*
Expand Down
Loading

0 comments on commit bb6e6e2

Please sign in to comment.