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

add API functions libwolfssl_configure_args() and libwolfssl_global_cflags() to retrieve build parameters at runtime.

Browse Source
This commit is contained in:
Daniel Pouzzner
2020-10-23 00:17:40 -05:00
parent 931eea30f5
commit 8be2d7690a
4 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
configure.ac
View File

@ -5783,10 +5783,8 @@ AM_CONDITIONAL([BUILD_PKCS7],[test "x$ENABLED_PKCS7" = "xyes" || test "x$ENABLED
AM_CONDITIONAL([BUILD_HASHFLAGS],[test "x$ENABLED_HASHFLAGS" = "xyes"]) AM_CONDITIONAL([BUILD_HASHFLAGS],[test "x$ENABLED_HASHFLAGS" = "xyes"])
AM_CONDITIONAL([BUILD_LINUXKM],[test "$ENABLED_LINUXKM" = "yes"]) AM_CONDITIONAL([BUILD_LINUXKM],[test "$ENABLED_LINUXKM" = "yes"])
AM_CONDITIONAL([BUILD_NO_LIBRARY],[test "$ENABLED_NO_LIBRARY" = "yes"]) AM_CONDITIONAL([BUILD_NO_LIBRARY],[test "$ENABLED_NO_LIBRARY" = "yes"])
AM_CONDITIONAL([BUILD_DEBUG],[test "$ax_enable_debug" = "yes" || test "$ENABLED_STACKSIZE" = "yes"])
AM_CONDITIONAL([BUILD_RC2],[test "x$ENABLED_RC2" = "xyes"]) AM_CONDITIONAL([BUILD_RC2],[test "x$ENABLED_RC2" = "xyes"])
CREATE_HEX_VERSION CREATE_HEX_VERSION
AC_SUBST([AM_CPPFLAGS]) AC_SUBST([AM_CPPFLAGS])
AC_SUBST([AM_CFLAGS]) AC_SUBST([AM_CFLAGS])
@ -5836,6 +5834,11 @@ echo "extern \"C\" {" >> $OPTION_FILE
echo "#endif" >> $OPTION_FILE echo "#endif" >> $OPTION_FILE
echo "" >> $OPTION_FILE echo "" >> $OPTION_FILE
echo "#define LIBWOLFSSL_CONFIGURE_ARGS \"$ac_configure_args\"" >> $OPTION_FILE
echo >> $OPTION_FILE
echo "#define LIBWOLFSSL_GLOBAL_CFLAGS \"$CPPFLAGS $AM_CPPFLAGS $CFLAGS $AM_CFLAGS\"" >> $OPTION_FILE
echo >> $OPTION_FILE
for option in $CPPFLAGS $AM_CPPFLAGS $CFLAGS $AM_CFLAGS; do for option in $CPPFLAGS $AM_CPPFLAGS $CFLAGS $AM_CFLAGS; do
defonly=`echo $option | sed 's/^-D//'` defonly=`echo $option | sed 's/^-D//'`
if test "$defonly" != "$option" if test "$defonly" != "$option"

6
src/include.am
View File

@ -315,12 +315,8 @@ endif !BUILD_FIPS_RAND
src_libwolfssl_la_SOURCES += \ src_libwolfssl_la_SOURCES += \
wolfcrypt/src/logging.c \ wolfcrypt/src/logging.c \
wolfcrypt/src/wc_port.c \ wolfcrypt/src/wc_port.c \
wolfcrypt/src/error.c wolfcrypt/src/error.c \
if BUILD_DEBUG
src_libwolfssl_la_SOURCES += \
wolfcrypt/src/debug.c wolfcrypt/src/debug.c
endif
if !BUILD_FIPS_RAND if !BUILD_FIPS_RAND
src_libwolfssl_la_SOURCES += \ src_libwolfssl_la_SOURCES += \

17
wolfcrypt/src/debug.c
View File

@ -27,6 +27,23 @@
#include <wolfssl/wolfcrypt/settings.h> #include <wolfssl/wolfcrypt/settings.h>
#include <wolfssl/wolfcrypt/wc_port.h> #include <wolfssl/wolfcrypt/wc_port.h>
#include <wolfssl/wolfcrypt/types.h> #include <wolfssl/wolfcrypt/types.h>
#include <wolfssl/options.h>
WOLFSSL_API const char *libwolfssl_configure_args(void) {
#ifdef LIBWOLFSSL_CONFIGURE_ARGS
return " " LIBWOLFSSL_CONFIGURE_ARGS " ";
#else
return NULL;
#endif
}
WOLFSSL_API const char *libwolfssl_global_cflags(void) {
#ifdef LIBWOLFSSL_GLOBAL_CFLAGS
return " " LIBWOLFSSL_GLOBAL_CFLAGS " ";
#else
return NULL;
#endif
}
#ifdef HAVE_STACK_SIZE_VERBOSE #ifdef HAVE_STACK_SIZE_VERBOSE
WOLFSSL_API THREAD_LS_T unsigned char *StackSizeCheck_myStack = NULL; WOLFSSL_API THREAD_LS_T unsigned char *StackSizeCheck_myStack = NULL;

3
wolfssl/wolfcrypt/settings.h
View File

@ -221,6 +221,9 @@
#include <wolfssl/wolfcrypt/visibility.h> #include <wolfssl/wolfcrypt/visibility.h>
WOLFSSL_API const char *libwolfssl_configure_args(void);
WOLFSSL_API const char *libwolfssl_global_cflags(void);
#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)