wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 18:57:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6248 from JacobBarthelmeh/fips

Browse Source 
visibility is dependent on macros that could be set in user_settings.h
This commit is contained in:
David Garske
2023-03-29 16:32:29 -07:00
committed by GitHub
parent 5d1a914ebd 951b5bc77c
commit a8ca958855
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wolfssl/wolfcrypt/settings.h
View File

@ -266,8 +266,6 @@
/* #define WOLFSSL_MAXQ108X */ /* #define WOLFSSL_MAXQ108X */
#include <wolfssl/wolfcrypt/visibility.h>
#ifdef WOLFSSL_USER_SETTINGS #ifdef WOLFSSL_USER_SETTINGS
#include "user_settings.h" #include "user_settings.h"
#elif defined(USE_HAL_DRIVER) && !defined(HAVE_CONFIG_H) #elif defined(USE_HAL_DRIVER) && !defined(HAVE_CONFIG_H)
@ -275,6 +273,8 @@
#include "wolfSSL.I-CUBE-wolfSSL_conf.h" #include "wolfSSL.I-CUBE-wolfSSL_conf.h"
#endif #endif
#include <wolfssl/wolfcrypt/visibility.h>
#define WOLFSSL_MAKE_FIPS_VERSION(major, minor) (((major) * 256) + (minor)) #define WOLFSSL_MAKE_FIPS_VERSION(major, minor) (((major) * 256) + (minor))
#if !defined(HAVE_FIPS) #if !defined(HAVE_FIPS)
#define WOLFSSL_FIPS_VERSION_CODE WOLFSSL_MAKE_FIPS_VERSION(0,0) #define WOLFSSL_FIPS_VERSION_CODE WOLFSSL_MAKE_FIPS_VERSION(0,0)