From 10c1fc1edb73a31925fe5f6ef335a0d9dd58ac79 Mon Sep 17 00:00:00 2001 From: Daniel Pouzzner Date: Tue, 15 Apr 2025 12:00:54 -0500 Subject: [PATCH] linuxkm/lkcapi_glue.c: inhibit LINUXKM_LKCAPI_REGISTER_ECDH on kernel <5.13 (currently incompatible); .wolfssl_known_macro_extras: fix lexical order. --- .wolfssl_known_macro_extras | 2 +- linuxkm/lkcapi_glue.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.wolfssl_known_macro_extras b/.wolfssl_known_macro_extras index 7947ebef3..eeedf9ff1 100644 --- a/.wolfssl_known_macro_extras +++ b/.wolfssl_known_macro_extras @@ -518,7 +518,6 @@ USE_STSAFE_VERBOSE USE_TLSV13 USE_WOLF_STRNSTR USS_API -WindowsCE WC_AESXTS_STREAM_NO_REQUEST_ACCOUNTING WC_AES_BS_WORD_SIZE WC_AES_GCM_DEC_AUTH_EARLY @@ -858,6 +857,7 @@ WOLF_CRYPTO_CB_ONLY_ECC WOLF_CRYPTO_CB_ONLY_RSA WOLF_CRYPTO_DEV WOLF_NO_TRAILING_ENUM_COMMAS +WindowsCE XGETPASSWD XMSS_CALL_PRF_KEYGEN XPAR_VERSAL_CIPS_0_PSPMC_0_PSV_CORTEXA72_0_TIMESTAMP_CLK_FREQ diff --git a/linuxkm/lkcapi_glue.c b/linuxkm/lkcapi_glue.c index 0bc3a539a..19ba13ed6 100644 --- a/linuxkm/lkcapi_glue.c +++ b/linuxkm/lkcapi_glue.c @@ -4258,6 +4258,13 @@ static int linuxkm_test_aesecb(void) { #endif #endif /* LINUXKM_LKCAPI_REGISTER_ECDSA */ +#ifdef LINUXKM_LKCAPI_REGISTER_ECDH + #if LINUX_VERSION_CODE < KERNEL_VERSION(5, 13, 0) + /* currently incompatible with kernel 5.12 or earlier. */ + #undef LINUXKM_LKCAPI_REGISTER_ECDH + #endif +#endif + #if defined (LINUXKM_LKCAPI_REGISTER_ECDSA) #include "linuxkm/lkcapi_ecdsa_glue.c" #endif /* LINUXKM_LKCAPI_REGISTER_ECDSA */