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

name the new introspection routines wolfSSL_configure_args() and wolfSSL_global_cflags() for consistency, and move the prototypes to logging.h.

Browse Source
This commit is contained in:
Daniel Pouzzner
2020-10-27 18:38:29 -05:00
parent 139b0431cb
commit fda84576b0
6 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/client/client.c
View File

@ -2131,7 +2131,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
case '@' : case '@' :
{ {
#ifdef HAVE_WC_INTROSPECTION #ifdef HAVE_WC_INTROSPECTION
const char *conf_args = libwolfssl_configure_args(); const char *conf_args = wolfSSL_configure_args();
if (conf_args) { if (conf_args) {
puts(conf_args); puts(conf_args);
XEXIT_T(EXIT_SUCCESS); XEXIT_T(EXIT_SUCCESS);
@ -2148,7 +2148,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
case '#' : case '#' :
{ {
#ifdef HAVE_WC_INTROSPECTION #ifdef HAVE_WC_INTROSPECTION
const char *cflags = libwolfssl_global_cflags(); const char *cflags = wolfSSL_global_cflags();
if (cflags) { if (cflags) {
puts(cflags); puts(cflags);
XEXIT_T(EXIT_SUCCESS); XEXIT_T(EXIT_SUCCESS);

4
examples/server/server.c
View File

@ -1561,7 +1561,7 @@ THREAD_RETURN WOLFSSL_THREAD server_test(void* args)
case '@' : case '@' :
{ {
#ifdef HAVE_WC_INTROSPECTION #ifdef HAVE_WC_INTROSPECTION
const char *conf_args = libwolfssl_configure_args(); const char *conf_args = wolfSSL_configure_args();
if (conf_args) { if (conf_args) {
puts(conf_args); puts(conf_args);
XEXIT_T(EXIT_SUCCESS); XEXIT_T(EXIT_SUCCESS);
@ -1578,7 +1578,7 @@ THREAD_RETURN WOLFSSL_THREAD server_test(void* args)
case '#' : case '#' :
{ {
#ifdef HAVE_WC_INTROSPECTION #ifdef HAVE_WC_INTROSPECTION
const char *cflags = libwolfssl_global_cflags(); const char *cflags = wolfSSL_global_cflags();
if (cflags) { if (cflags) {
puts(cflags); puts(cflags);
XEXIT_T(EXIT_SUCCESS); XEXIT_T(EXIT_SUCCESS);

4
linuxkm/Kbuild
View File

@ -76,12 +76,12 @@ $(obj)/wolfcrypt/src/aes_asm.o: OBJECT_FILES_NON_STANDARD := y
$(obj)/wolfcrypt/src/aes_gcm_asm.o: OBJECT_FILES_NON_STANDARD := y $(obj)/wolfcrypt/src/aes_gcm_asm.o: OBJECT_FILES_NON_STANDARD := y
# auto-generate the exported symbol list, leveraging the WOLFSSL_API visibility tags. # auto-generate the exported symbol list, leveraging the WOLFSSL_API visibility tags.
# exclude symbols that don't match wc_*, wolf*, or libwolf*. # exclude symbols that don't match wc_* or wolf*.
$(src)/linuxkm/module_exports.c: $(src)/linuxkm/module_exports.c.template $(WOLFSSL_OBJ_TARGETS) $(src)/linuxkm/module_exports.c: $(src)/linuxkm/module_exports.c.template $(WOLFSSL_OBJ_TARGETS)
@cp $< $@ @cp $< $@
@readelf --symbols --wide $(WOLFSSL_OBJ_TARGETS) | \ @readelf --symbols --wide $(WOLFSSL_OBJ_TARGETS) | \
awk '/^ *[0-9]+: / { \ awk '/^ *[0-9]+: / { \
if ($$8 !~ /^(wc_|wolf|libwolf)/){next;} \ if ($$8 !~ /^(wc_|wolf)/){next;} \
if (($$4 == "FUNC") && ($$5 == "GLOBAL") && ($$6 == "DEFAULT")) { \ if (($$4 == "FUNC") && ($$5 == "GLOBAL") && ($$6 == "DEFAULT")) { \
print "EXPORT_SYMBOL_NS(" $$8 ", WOLFSSL);"; \ print "EXPORT_SYMBOL_NS(" $$8 ", WOLFSSL);"; \
} \ } \

4
wolfcrypt/src/logging.c
View File

@ -117,7 +117,7 @@ static WC_INLINE double current_time(int reset)
#ifdef HAVE_WC_INTROSPECTION #ifdef HAVE_WC_INTROSPECTION
const char *libwolfssl_configure_args(void) { const char *wolfSSL_configure_args(void) {
#ifdef LIBWOLFSSL_CONFIGURE_ARGS #ifdef LIBWOLFSSL_CONFIGURE_ARGS
/* the spaces on either side are to make matching simple and efficient. */ /* the spaces on either side are to make matching simple and efficient. */
return " " LIBWOLFSSL_CONFIGURE_ARGS " "; return " " LIBWOLFSSL_CONFIGURE_ARGS " ";
@ -126,7 +126,7 @@ const char *libwolfssl_configure_args(void) {
#endif #endif
} }
WOLFSSL_API const char *libwolfssl_global_cflags(void) { const char *wolfSSL_global_cflags(void) {
#ifdef LIBWOLFSSL_GLOBAL_CFLAGS #ifdef LIBWOLFSSL_GLOBAL_CFLAGS
/* the spaces on either side are to make matching simple and efficient. */ /* the spaces on either side are to make matching simple and efficient. */
return " " LIBWOLFSSL_GLOBAL_CFLAGS " "; return " " LIBWOLFSSL_GLOBAL_CFLAGS " ";

4
wolfssl/wolfcrypt/logging.h
View File

@ -100,6 +100,10 @@ WOLFSSL_API int wolfSSL_Debugging_ON(void);
/* turn logging off */ /* turn logging off */
WOLFSSL_API void wolfSSL_Debugging_OFF(void); WOLFSSL_API void wolfSSL_Debugging_OFF(void);
#ifdef HAVE_WC_INTROSPECTION
WOLFSSL_API const char *wolfSSL_configure_args(void);
WOLFSSL_API const char *wolfSSL_global_cflags(void);
#endif
#if defined(OPENSSL_EXTRA) || defined(DEBUG_WOLFSSL_VERBOSE) #if defined(OPENSSL_EXTRA) || defined(DEBUG_WOLFSSL_VERBOSE)
WOLFSSL_LOCAL int wc_LoggingInit(void); WOLFSSL_LOCAL int wc_LoggingInit(void);

5
wolfssl/wolfcrypt/settings.h
View File

@ -228,11 +228,6 @@
#include "wolfSSL.wolfSSL_conf.h" #include "wolfSSL.wolfSSL_conf.h"
#endif #endif
#ifdef HAVE_WC_INTROSPECTION
WOLFSSL_API const char *libwolfssl_configure_args(void);
WOLFSSL_API const char *libwolfssl_global_cflags(void);
#endif
/* make sure old RNG name is used with CTaoCrypt FIPS */ /* make sure old RNG name is used with CTaoCrypt FIPS */
#ifdef HAVE_FIPS #ifdef HAVE_FIPS
#if !defined(HAVE_FIPS_VERSION) || (HAVE_FIPS_VERSION < 2) #if !defined(HAVE_FIPS_VERSION) || (HAVE_FIPS_VERSION < 2)