Merge pull request wolfSSL#729 from ejohnstown/new-kdf

Use wolfCrypt SSHv2 KDF
jefferyq2 · Oct 18, 2024 · b364c1a · b364c1a
1 parent ff4c9a3
commit b364c1a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/src/internal.c b/src/internal.c
@@ -57,6 +57,8 @@
 #ifdef WOLFSSL_HAVE_KYBER
 #include <wolfssl/wolfcrypt/kyber.h>
 #include <wolfssl/wolfcrypt/wc_kyber.h>
+#ifdef WOLFSSH_HAVE_LIBOQS
+#include <oqs/kem.h>
 #endif
 
 #ifdef NO_INLINE

diff --git a/wolfssh/error.h b/wolfssh/error.h
@@ -141,7 +141,7 @@ enum WS_ErrorCodes {
 
     WS_LAST_E               = -1095  /* Update this to indicate last error */
 
-    WS_LAST_E               = -1096  /* Update this to indicate last error */
+    WS_LAST_E               = -1097  /* Update this to indicate last error */
 };
 
 

diff --git a/wolfssh/internal.h b/wolfssh/internal.h
@@ -1362,6 +1362,7 @@ enum TerminalModes {
 #define WOLFSSL_V5_7_0 0x05007000
 #define WOLFSSL_V5_7_2 0x05007002
 #define WOLFSSL_V5_7_0 0x05007000
+#define WOLFSSL_V5_7_2 0x05007002
 
 
 #ifdef __cplusplus
-Original file line number
+Diff line change
@@ Expand Up / @@ -141,7 +141,7 @@ enum WS_ErrorCodes { @@
         WS_LAST_E               = -1095  /* Update this to indicate last error */
-        WS_LAST_E               = -1096  /* Update this to indicate last error */
+        WS_LAST_E               = -1097  /* Update this to indicate last error */
     };
@@ Expand Down @@