Merge pull request wolfSSL#637 from ejohnstown/release-v1.4.15-2

Release v1.4.15: Last Second Fixes
gojimmypi · Dec 23, 2023 · 60a2960 · 60a2960
2 parents c5d3704 + 271e560
commit 60a2960
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -7,7 +7,7 @@
   been observed in wolfSSH, the fix is now implemented. The RSA signature
   is verified before sending to the peer.
   - Keegan Ryan, Kaiwen He, George Arnold Sullivan, and Nadia Heninger. 2023.
-    Passive SSH Key Compormise via Lattices. Cryptology ePrint Archive,
+    Passive SSH Key Compromise via Lattices. Cryptology ePrint Archive,
     Report 2023/1711. https://eprint.iacr.org/2023/1711.
 
 ## Notes
@@ -46,7 +46,7 @@
 * Speed improvements for SFTP. (Fixed unnecessary waiting.)
 * Windows wolfSSHd improvements.
 * The functions `wolfSSH_ReadKey_file()` and `wolfSSH_ReadKey_buffer()`
-  handles more encodings.
+  handle more encodings.
 * Add function to supply new protocol ID string.
 * Support larger RSA keys.
 * MinGW support updates.

diff --git a/apps/wolfsshd/auth.c b/apps/wolfsshd/auth.c
@@ -41,7 +41,10 @@
 #include <unistd.h>
 #else
 /* avoid macro redefinition warnings on STATUS values when include ntstatus.h */
+#undef UMDF_USING_NTSTATUS
 #define UMDF_USING_NTSTATUS
+#undef UNICODE
+#define UNICODE
 #endif
 
 #include <wolfssh/ssh.h>