wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-01 19:54:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8272 from douzzer/20241210-fixes

Browse Source 
20241210-fixes
This commit is contained in:
JacobBarthelmeh
2024-12-10 13:35:09 -07:00
committed by GitHub
parent e443366748 d257a59087
commit 1208a7499b
7 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/options.h.in
View File

@@ -22,7 +22,9 @@
/* cmake template for options.h */ /* cmake template for options.h */
#ifndef WOLFSSL_OPTIONS_H #ifdef WOLFSSL_NO_OPTIONS_H
/* options.h inhibited by configuration */
#elif !defined(WOLFSSL_OPTIONS_H)
#define WOLFSSL_OPTIONS_H #define WOLFSSL_OPTIONS_H

4
configure.ac
View File

@@ -10169,7 +10169,9 @@ echo " *" >> $OPTION_FILE
echo " */" >> $OPTION_FILE echo " */" >> $OPTION_FILE
echo "" >> $OPTION_FILE echo "" >> $OPTION_FILE
echo "#ifndef WOLFSSL_OPTIONS_H" >> $OPTION_FILE echo "#ifdef WOLFSSL_NO_OPTIONS_H" >> $OPTION_FILE
echo "/* options.h inhibited by configuration */" >> $OPTION_FILE
echo "#elif !defined(WOLFSSL_OPTIONS_H)" >> $OPTION_FILE
echo "#define WOLFSSL_OPTIONS_H" >> $OPTION_FILE echo "#define WOLFSSL_OPTIONS_H" >> $OPTION_FILE
echo "" >> $OPTION_FILE echo "" >> $OPTION_FILE
echo "" >> $OPTION_FILE echo "" >> $OPTION_FILE

4
linuxkm/Kbuild
View File

@@ -89,7 +89,7 @@ endif
ccflags-y := $(WOLFSSL_CFLAGS) $(WOLFSSL_CFLAGS_NO_VECTOR_INSNS) ccflags-y := $(WOLFSSL_CFLAGS) $(WOLFSSL_CFLAGS_NO_VECTOR_INSNS)
$(obj)/libwolfssl.mod.o: ccflags-y := $(obj)/libwolfssl.mod.o: ccflags-y :=
$(obj)/wolfcrypt/test/test.o: ccflags-y += -DNO_MAIN_DRIVER $(obj)/wolfcrypt/test/test.o: ccflags-y += -DNO_MAIN_DRIVER -DWOLFSSL_NO_OPTIONS_H
$(obj)/wolfcrypt/src/aes.o: ccflags-y = $(WOLFSSL_CFLAGS) $(WOLFSSL_CFLAGS_YES_VECTOR_INSNS) $(obj)/wolfcrypt/src/aes.o: ccflags-y = $(WOLFSSL_CFLAGS) $(WOLFSSL_CFLAGS_YES_VECTOR_INSNS)
@@ -109,7 +109,7 @@ ifeq "$(ENABLED_LINUXKM_PIE)" "yes"
$(obj)/linuxkm/module_hooks.o: ccflags-y += $(PIE_SUPPORT_FLAGS) $(obj)/linuxkm/module_hooks.o: ccflags-y += $(PIE_SUPPORT_FLAGS)
endif endif
$(obj)/wolfcrypt/benchmark/benchmark.o: ccflags-y = $(WOLFSSL_CFLAGS) $(CFLAGS_FPU_ENABLE) $(CFLAGS_SIMD_ENABLE) $(PIE_SUPPORT_FLAGS) -DNO_MAIN_FUNCTION $(obj)/wolfcrypt/benchmark/benchmark.o: ccflags-y = $(WOLFSSL_CFLAGS) $(CFLAGS_FPU_ENABLE) $(CFLAGS_SIMD_ENABLE) $(PIE_SUPPORT_FLAGS) -DNO_MAIN_FUNCTION -DWOLFSSL_NO_OPTIONS_H
$(obj)/wolfcrypt/benchmark/benchmark.o: asflags-y = $(WOLFSSL_ASFLAGS) $(ASFLAGS_FPU_ENABLE_SIMD_DISABLE) $(obj)/wolfcrypt/benchmark/benchmark.o: asflags-y = $(WOLFSSL_ASFLAGS) $(ASFLAGS_FPU_ENABLE_SIMD_DISABLE)
asflags-y := $(WOLFSSL_ASFLAGS) $(ASFLAGS_FPUSIMD_DISABLE) asflags-y := $(WOLFSSL_ASFLAGS) $(ASFLAGS_FPUSIMD_DISABLE)

2
wolfcrypt/benchmark/benchmark.c
View File

@@ -61,7 +61,7 @@
#include <config.h> #include <config.h>
#endif #endif
#ifndef WOLFSSL_USER_SETTINGS #if !defined(WOLFSSL_USER_SETTINGS) && !defined(WOLFSSL_NO_OPTIONS_H)
#include <wolfssl/options.h> #include <wolfssl/options.h>
#endif #endif
#include <wolfssl/wolfcrypt/settings.h> /* also picks up user_settings.h */ #include <wolfssl/wolfcrypt/settings.h> /* also picks up user_settings.h */

2
wolfcrypt/test/test.c
View File

@@ -32,7 +32,7 @@
#include <config.h> #include <config.h>
#endif #endif
#ifndef WOLFSSL_USER_SETTINGS #if !defined(WOLFSSL_USER_SETTINGS) && !defined(WOLFSSL_NO_OPTIONS_H)
#include <wolfssl/options.h> #include <wolfssl/options.h>
#endif #endif
#include <wolfssl/wolfcrypt/settings.h> #include <wolfssl/wolfcrypt/settings.h>

4
wolfssl/options.h.in
View File

@@ -22,7 +22,9 @@
/* default blank options for autoconf */ /* default blank options for autoconf */
#ifndef WOLFSSL_OPTIONS_H #ifdef WOLFSSL_NO_OPTIONS_H
/* options.h inhibited by configuration */
#elif !defined(WOLFSSL_OPTIONS_H)
#define WOLFSSL_OPTIONS_H #define WOLFSSL_OPTIONS_H

24
wolfssl/wolfcrypt/settings.h
View File

@@ -47,11 +47,14 @@
extern "C" { extern "C" {
#endif #endif
/* This flag allows wolfSSL to include options.h instead of having client /* WOLFSSL_USE_OPTIONS_H directs wolfSSL to include options.h on behalf of
* projects do it themselves. This should *NEVER* be defined when building * application code, rather than the application including it directly. This is
* wolfSSL as it can cause hard to debug problems. */ * not defined when compiling wolfSSL library objects, which are configured
#if defined(EXTERNAL_OPTS_OPENVPN) || defined(WOLFSSL_USE_OPTIONS_H) * through CFLAGS.
#include <wolfssl/options.h> */
#if (defined(EXTERNAL_OPTS_OPENVPN) || defined(WOLFSSL_USE_OPTIONS_H)) && \
!defined(WOLFSSL_NO_OPTIONS_H)
#include <wolfssl/options.h>
#endif #endif
/* Uncomment next line if using IPHONE */ /* Uncomment next line if using IPHONE */
@@ -335,10 +338,13 @@
#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) && \ #elif !defined(BUILDING_WOLFSSL) && !defined(WOLFSSL_OPTIONS_H) && \
!defined(WOLFSSL_CUSTOM_CONFIG) !defined(WOLFSSL_NO_OPTIONS_H) && !defined(WOLFSSL_CUSTOM_CONFIG)
/* This warning indicates that the settings header may not be included before /* This warning indicates that wolfSSL features may not have been properly
* other wolfSSL headers. If you are using a custom configuration method, * configured before other wolfSSL headers were included. If you are using
* define WOLFSSL_CUSTOM_CONFIG to override this error. */ * an alternative configuration method -- e.g. custom header, or CFLAGS in
* an application build -- then your application can avoid this warning by
* defining WOLFSSL_NO_OPTIONS_H or WOLFSSL_CUSTOM_CONFIG as appropriate.
*/
#warning "No configuration for wolfSSL detected, check header order" #warning "No configuration for wolfSSL detected, check header order"
#endif #endif