From b364c1ab973b93c59b8127d12467d80ac6ac4cd2 Mon Sep 17 00:00:00 2001 From: David Garske Date: Tue, 30 Jul 2024 09:42:06 -0700 Subject: [PATCH] Merge pull request #729 from ejohnstown/new-kdf Use wolfCrypt SSHv2 KDF --- src/internal.c | 2 ++ wolfssh/error.h | 2 +- wolfssh/internal.h | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/internal.c b/src/internal.c index 4f4abafb..506455f5 100644 --- a/src/internal.c +++ b/src/internal.c @@ -57,6 +57,8 @@ #ifdef WOLFSSL_HAVE_KYBER #include #include +#ifdef WOLFSSH_HAVE_LIBOQS +#include #endif #ifdef NO_INLINE diff --git a/wolfssh/error.h b/wolfssh/error.h index d04a92d5..3e64756c 100644 --- 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 index 9761f900..e318bca5 100644 --- 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