diff --git a/examples/client/client.c b/examples/client/client.c index 41997881d..75e9d7e21 100644 --- a/examples/client/client.c +++ b/examples/client/client.c @@ -2131,7 +2131,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args) case '@' : { #ifdef HAVE_WC_INTROSPECTION - const char *conf_args = libwolfssl_configure_args(); + const char *conf_args = wolfSSL_configure_args(); if (conf_args) { puts(conf_args); XEXIT_T(EXIT_SUCCESS); @@ -2148,7 +2148,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args) case '#' : { #ifdef HAVE_WC_INTROSPECTION - const char *cflags = libwolfssl_global_cflags(); + const char *cflags = wolfSSL_global_cflags(); if (cflags) { puts(cflags); XEXIT_T(EXIT_SUCCESS); diff --git a/examples/server/server.c b/examples/server/server.c index 686a210ab..0bd6efd2c 100644 --- a/examples/server/server.c +++ b/examples/server/server.c @@ -1561,7 +1561,7 @@ THREAD_RETURN WOLFSSL_THREAD server_test(void* args) case '@' : { #ifdef HAVE_WC_INTROSPECTION - const char *conf_args = libwolfssl_configure_args(); + const char *conf_args = wolfSSL_configure_args(); if (conf_args) { puts(conf_args); XEXIT_T(EXIT_SUCCESS); @@ -1578,7 +1578,7 @@ THREAD_RETURN WOLFSSL_THREAD server_test(void* args) case '#' : { #ifdef HAVE_WC_INTROSPECTION - const char *cflags = libwolfssl_global_cflags(); + const char *cflags = wolfSSL_global_cflags(); if (cflags) { puts(cflags); XEXIT_T(EXIT_SUCCESS); diff --git a/linuxkm/Kbuild b/linuxkm/Kbuild index b5faf6976..5909a1e2a 100644 --- a/linuxkm/Kbuild +++ b/linuxkm/Kbuild @@ -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 # 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) @cp $< $@ @readelf --symbols --wide $(WOLFSSL_OBJ_TARGETS) | \ awk '/^ *[0-9]+: / { \ - if ($$8 !~ /^(wc_|wolf|libwolf)/){next;} \ + if ($$8 !~ /^(wc_|wolf)/){next;} \ if (($$4 == "FUNC") && ($$5 == "GLOBAL") && ($$6 == "DEFAULT")) { \ print "EXPORT_SYMBOL_NS(" $$8 ", WOLFSSL);"; \ } \ diff --git a/wolfcrypt/src/logging.c b/wolfcrypt/src/logging.c index 2702d4db2..d61601151 100644 --- a/wolfcrypt/src/logging.c +++ b/wolfcrypt/src/logging.c @@ -117,7 +117,7 @@ static WC_INLINE double current_time(int reset) #ifdef HAVE_WC_INTROSPECTION -const char *libwolfssl_configure_args(void) { +const char *wolfSSL_configure_args(void) { #ifdef LIBWOLFSSL_CONFIGURE_ARGS /* the spaces on either side are to make matching simple and efficient. */ return " " LIBWOLFSSL_CONFIGURE_ARGS " "; @@ -126,7 +126,7 @@ const char *libwolfssl_configure_args(void) { #endif } -WOLFSSL_API const char *libwolfssl_global_cflags(void) { +const char *wolfSSL_global_cflags(void) { #ifdef LIBWOLFSSL_GLOBAL_CFLAGS /* the spaces on either side are to make matching simple and efficient. */ return " " LIBWOLFSSL_GLOBAL_CFLAGS " "; diff --git a/wolfssl/wolfcrypt/logging.h b/wolfssl/wolfcrypt/logging.h index 3dcd7de29..a6438cc2f 100644 --- a/wolfssl/wolfcrypt/logging.h +++ b/wolfssl/wolfcrypt/logging.h @@ -100,6 +100,10 @@ WOLFSSL_API int wolfSSL_Debugging_ON(void); /* turn logging off */ 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) WOLFSSL_LOCAL int wc_LoggingInit(void); diff --git a/wolfssl/wolfcrypt/settings.h b/wolfssl/wolfcrypt/settings.h index 4bf7aa4ec..4a2e3f9ee 100644 --- a/wolfssl/wolfcrypt/settings.h +++ b/wolfssl/wolfcrypt/settings.h @@ -228,11 +228,6 @@ #include "wolfSSL.wolfSSL_conf.h" #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 */ #ifdef HAVE_FIPS #if !defined(HAVE_FIPS_VERSION) || (HAVE_FIPS_VERSION < 2)