From a43530241554aa1b5f4a8c358c83519e1ca7d4da Mon Sep 17 00:00:00 2001 From: Daniel Pouzzner Date: Thu, 1 Jun 2023 11:12:27 -0500 Subject: [PATCH] wolfssl/wolfcrypt/types.h: conditionalize XASM_LINK() definition on !FIPS_VERSION_LT(5,3) and !WOLFSSL_NO_ASM. --- wolfssl/wolfcrypt/types.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/wolfssl/wolfcrypt/types.h b/wolfssl/wolfcrypt/types.h index 6a11c44b7..87c0d152b 100644 --- a/wolfssl/wolfcrypt/types.h +++ b/wolfssl/wolfcrypt/types.h @@ -1180,8 +1180,16 @@ typedef struct w64wrapper { /* invalid device id */ #define INVALID_DEVID (-2) - #ifdef XASM_LINK + #if defined(HAVE_FIPS) && FIPS_VERSION_LT(5,3) + #ifdef XASM_LINK + #error User-supplied XASM_LINK is not compatible with this FIPS version. + #else + /* use version in FIPS <=5.2 aes.c */ + #endif + #elif defined(XASM_LINK) /* keep user-supplied definition */ + #elif defined(WOLFSSL_NO_ASM) + #define XASM_LINK(f) #elif defined(_MSC_VER) #define XASM_LINK(f) #elif defined(__APPLE__)