feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Merge pull request #6462 from douzzer/20230601-fix-fips-XASM_LINK

Browse Source 
20230601-fix-fips-XASM_LINK
This commit is contained in:
JacobBarthelmeh
2023-06-01 14:00:01 -06:00
committed by GitHub
parent 35e59a3569 a435302415
commit bb78e1c7d8
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wolfssl/wolfcrypt/types.h
View File

@ -1180,8 +1180,16 @@ typedef struct w64wrapper {
/* invalid device id */ /* invalid device id */
#define INVALID_DEVID (-2) #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 */ /* keep user-supplied definition */
#elif defined(WOLFSSL_NO_ASM)
#define XASM_LINK(f)
#elif defined(_MSC_VER) #elif defined(_MSC_VER)
#define XASM_LINK(f) #define XASM_LINK(f)
#elif defined(__APPLE__) #elif defined(__APPLE__)