From 997bd8a0d05daef435c35f8d3c135c9c1e2ce305 Mon Sep 17 00:00:00 2001
From: Jacob Barthelmeh <jacob@wolfssl.com>
Date: Wed, 3 Feb 2021 22:26:58 +0700
Subject: [PATCH 1/2] fix for windows sftp build

---
 src/wolfsftp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wolfsftp.c b/src/wolfsftp.c
index b8953e0..1cf5b4a 100644
--- a/src/wolfsftp.c
+++ b/src/wolfsftp.c
@@ -2172,7 +2172,7 @@ int wolfSSH_SFTP_RecvOpenDir(WOLFSSH* ssh, int reqId, byte* data, word32 maxSz)
     }
     WMEMCPY(dirName, data + idx, sz);
     dirName[sz] = '\0';
-    if (wolfSSH_CleanPath(ssh, buf) < 0) {
+    if (wolfSSH_CleanPath(ssh, dirName) < 0) {
         WFREE(dirName, ssh->ctx->heap, DYNTYPE_BUFFER);
         return WS_FATAL_ERROR;
     }

From 5327a7f761cd570e78b645f09d5eae1c3f057ff5 Mon Sep 17 00:00:00 2001
From: Jacob Barthelmeh <jacob@wolfssl.com>
Date: Wed, 3 Feb 2021 22:43:46 +0700
Subject: [PATCH 2/2] prepare for release 1.4.6

---
 ChangeLog.md      | 34 ++++++++++++++++++++++++++++++++++
 configure.ac      |  4 ++--
 wolfssh/version.h |  4 ++--
 3 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index c8d236a..051e391 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,37 @@
+# wolfSSH v1.4.6 (February 3, 2021)
+
+## New Feature Additions
+
+- Added optional builds for not using RSA or ECC making the build more modular for resource constrained situations.
+- MQX IDE build added
+- Command line option added for Agent use with the example client
+
+
+
+## Fixes
+
+- Increase the ID list size for interop with some OpenSSH servers
+- In the case of a network error add a close to any open files with SFTP connection
+- Fix for potential memory leak with agent and a case with wolfSHS_SFTP_GetHandle
+- Fuzzing fix for potential out of bounds read in the public key user auth messages
+- MQX build fixes
+- Sanity check that agent was set before setting the agent’s channel
+- Fuzzing fix for bounds checking with DoKexDhReply internal function
+- Fuzzing fix for clean up of base path with SCP use
+- Fuzzing fix for sanity checks on setting the prime group and generator
+- Fuzzing fix for return result of high water check
+- Fuzzing fix for null terminator in internal ReceiveScpConfirmation function
+
+## Improvements and Optimizations
+
+- Example timeout added to SFTP example
+- Update wolfSSH_ReadKey_buffer() to handle P-384 and P-521 when reading a key from a buffer
+- Use internal version of strdup
+- Use strncmp instead of memcmp for comparint session string type
+
+--------------------------------
+
+
 # wolfSSH v1.4.5 (August 31, 2020)
 
 ## New Feature Additions
diff --git a/configure.ac b/configure.ac
index 9faa93e..af13960 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 # All right reserved.
 
 AC_COPYRIGHT([Copyright (C) 2014-2020 wolfSSL Inc.])
-AC_INIT([wolfssh],[1.4.5],[support@wolfssl.com],[wolfssh],[https://www.wolfssl.com])
+AC_INIT([wolfssh],[1.4.6],[support@wolfssl.com],[wolfssh],[https://www.wolfssl.com])
 AC_PREREQ([2.63])
 AC_CONFIG_AUX_DIR([build-aux])
 
@@ -17,7 +17,7 @@ AC_ARG_PROGRAM
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([src/config.h])
 
-WOLFSSH_LIBRARY_VERSION=12:0:3
+WOLFSSH_LIBRARY_VERSION=12:1:3
 #                       | | |
 #                +------+ | +---+
 #                |        |     |
diff --git a/wolfssh/version.h b/wolfssh/version.h
index eba2efc..f3065a6 100644
--- a/wolfssh/version.h
+++ b/wolfssh/version.h
@@ -35,8 +35,8 @@
 extern "C" {
 #endif
 
-#define LIBWOLFSSH_VERSION_STRING "1.4.5"
-#define LIBWOLFSSH_VERSION_HEX 0x01004005
+#define LIBWOLFSSH_VERSION_STRING "1.4.6"
+#define LIBWOLFSSH_VERSION_HEX 0x01004006
 
 #ifdef __cplusplus
 }