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

Add sanity check for configuration method

Browse Source
This commit is contained in:
Eric Blankenhorn
2024-12-06 16:35:21 -06:00
parent f764dbeee1
commit 3d0cc250b9
6 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.wolfssl_known_macro_extras
View File

@@ -599,6 +599,7 @@ WOLFSSL_CLANG_TIDY
WOLFSSL_COMMERCIAL_LICENSE WOLFSSL_COMMERCIAL_LICENSE
WOLFSSL_CONTIKI WOLFSSL_CONTIKI
WOLFSSL_CRL_ALLOW_MISSING_CDP WOLFSSL_CRL_ALLOW_MISSING_CDP
WOLFSSL_CUSTOM_CONFIG
WOLFSSL_DILITHIUM_ASSIGN_KEY WOLFSSL_DILITHIUM_ASSIGN_KEY
WOLFSSL_DILITHIUM_MAKE_KEY_SMALL_MEM WOLFSSL_DILITHIUM_MAKE_KEY_SMALL_MEM
WOLFSSL_DILITHIUM_NO_ASN1 WOLFSSL_DILITHIUM_NO_ASN1

2
examples/echoclient/echoclient.c
View File

@@ -24,10 +24,10 @@
#include <config.h> #include <config.h>
#endif #endif
#include <wolfssl/wolfcrypt/settings.h>
#ifndef WOLFSSL_USER_SETTINGS #ifndef WOLFSSL_USER_SETTINGS
#include <wolfssl/options.h> #include <wolfssl/options.h>
#endif #endif
#include <wolfssl/wolfcrypt/settings.h>
/* Force enable the compatibility macros for this example */ /* Force enable the compatibility macros for this example */
#undef TEST_OPENSSL_COEXIST #undef TEST_OPENSSL_COEXIST

3
sslSniffer/sslSnifferTest/snifftest.c
View File

@@ -24,6 +24,9 @@
#include <config.h> #include <config.h>
#endif #endif
#ifndef WOLFSSL_USER_SETTINGS
#include <wolfssl/options.h>
#endif
#include <wolfssl/wolfcrypt/settings.h> #include <wolfssl/wolfcrypt/settings.h>
#include <wolfssl/wolfcrypt/types.h> #include <wolfssl/wolfcrypt/types.h>
#include <wolfssl/wolfcrypt/logging.h> #include <wolfssl/wolfcrypt/logging.h>

3
tests/srp.c
View File

@@ -24,6 +24,9 @@
#include <config.h> #include <config.h>
#endif #endif
#ifndef WOLFSSL_USER_SETTINGS
#include <wolfssl/options.h>
#endif
#include <wolfssl/wolfcrypt/settings.h> #include <wolfssl/wolfcrypt/settings.h>
#include <tests/unit.h> #include <tests/unit.h>

2
testsuite/testsuite.c
View File

@@ -24,10 +24,10 @@
#include <config.h> #include <config.h>
#endif #endif
#include <wolfssl/wolfcrypt/settings.h>
#ifndef WOLFSSL_USER_SETTINGS #ifndef WOLFSSL_USER_SETTINGS
#include <wolfssl/options.h> #include <wolfssl/options.h>
#endif #endif
#include <wolfssl/wolfcrypt/settings.h>
#undef TEST_OPENSSL_COEXIST /* can't use this option with this example */ #undef TEST_OPENSSL_COEXIST /* can't use this option with this example */
#undef OPENSSL_COEXIST /* can't use this option with this example */ #undef OPENSSL_COEXIST /* can't use this option with this example */

8
wolfssl/wolfcrypt/settings.h
View File

@@ -28,6 +28,8 @@
* *
* ./configure CFLAGS="-DFEATURE_FLAG_TO_DEFINE -UFEATURE_FLAG_TO_CLEAR [...]" * ./configure CFLAGS="-DFEATURE_FLAG_TO_DEFINE -UFEATURE_FLAG_TO_CLEAR [...]"
* *
* To build using a custom configuration method, define WOLFSSL_CUSTOM_CONFIG
*
* For more information see: * For more information see:
* *
* https://www.wolfssl.com/how-do-i-manage-the-build-configuration-of-wolfssl/ * https://www.wolfssl.com/how-do-i-manage-the-build-configuration-of-wolfssl/
@@ -326,6 +328,12 @@
/* NOTE: cyassl_nucleus_defs.h is akin to user_settings.h */ /* NOTE: cyassl_nucleus_defs.h is akin to user_settings.h */
#include "nucleus.h" #include "nucleus.h"
#include "os/networking/ssl/lite/cyassl_nucleus_defs.h" #include "os/networking/ssl/lite/cyassl_nucleus_defs.h"
#elif !defined(BUILDING_WOLFSSL) && !defined(WOLFSSL_OPTIONS_H) && \
!defined(WOLFSSL_CUSTOM_CONFIG)
/* This error indicates that the settings header may not be included before
* other wolfSSL headers. If you are using a custom configuration method,
* define WOLFSSL_CUSTOM_CONFIG to override this error. */
#error "No configuration for wolfSSL detected, check header order"
#endif #endif
#include <wolfssl/wolfcrypt/visibility.h> #include <wolfssl/wolfcrypt/visibility.h>