wolfcrypt/src: remove wc_debug.c and move its contents to logging.c.

CMakeLists.txt

@@ -110,7 +110,6 @@ add_library(wolfssl
     wolfcrypt/src/cryptocb.c
     wolfcrypt/src/curve25519.c
     wolfcrypt/src/curve448.c
-    wolfcrypt/src/wc_debug.c
     wolfcrypt/src/des3.c
     wolfcrypt/src/dh.c
     wolfcrypt/src/dsa.c

configure.ac

@@ -5795,7 +5795,6 @@ then
 else
     WC_INTROSPECTION=no
 fi
-AM_CONDITIONAL([BUILD_WC_DEBUG],[test "$WC_INTROSPECTION" = "yes"])
 
 CREATE_HEX_VERSION
 AC_SUBST([AM_CPPFLAGS])

src/include.am

@@ -317,11 +317,6 @@ src_libwolfssl_la_SOURCES += \
                wolfcrypt/src/wc_port.c \
                wolfcrypt/src/error.c
 
-if BUILD_WC_DEBUG
-src_libwolfssl_la_SOURCES += \
-               wolfcrypt/src/wc_debug.c
-endif
-
 if !BUILD_FIPS_RAND
 src_libwolfssl_la_SOURCES += \
                wolfcrypt/src/wc_encrypt.c \

wolfcrypt/src/logging.c

@@ -24,6 +24,10 @@
     #include <config.h>
 #endif
 
+#ifndef WOLFSSL_USER_SETTINGS
+    #include <wolfssl/options.h>
+#endif
+
 #include <wolfssl/wolfcrypt/settings.h>
 
 #include <wolfssl/wolfcrypt/logging.h>
@@ -111,6 +115,38 @@ static WC_INLINE double current_time(int reset)
 }
 #endif /* WOLFSSL_FUNC_TIME */
 
+#ifdef HAVE_WC_INTROSPECTION
+
+const char *libwolfssl_configure_args(void) {
+#ifdef LIBWOLFSSL_CONFIGURE_ARGS
+  /* the spaces on either side are to make matching simple and efficient. */
+  return " " LIBWOLFSSL_CONFIGURE_ARGS " ";
+#else
+  return NULL;
+#endif
+}
+
+WOLFSSL_API const char *libwolfssl_global_cflags(void) {
+#ifdef LIBWOLFSSL_GLOBAL_CFLAGS
+  /* the spaces on either side are to make matching simple and efficient. */
+  return " " LIBWOLFSSL_GLOBAL_CFLAGS " ";
+#else
+  return NULL;
+#endif
+}
+
+#endif /* HAVE_WC_INTROSPECTION */
+
+#ifdef HAVE_STACK_SIZE_VERBOSE
+
+THREAD_LS_T unsigned char *StackSizeCheck_myStack = NULL;
+THREAD_LS_T size_t StackSizeCheck_stackSize = 0;
+THREAD_LS_T size_t StackSizeCheck_stackSizeHWM = 0;
+THREAD_LS_T size_t *StackSizeCheck_stackSizeHWM_ptr = 0;
+THREAD_LS_T void *StackSizeCheck_stackOffsetPointer = 0;
+
+#endif /* HAVE_STACK_SIZE_VERBOSE */
+
 #ifdef DEBUG_WOLFSSL
 
 /* Set these to default values initially. */

wolfcrypt/src/wc_debug.c

@@ -1,60 +0,0 @@
-/* wc_debug.c
- *
- * Copyright (C) 2006-2020 wolfSSL Inc.
- *
- * This file is part of wolfSSL.
- *
- * wolfSSL is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * wolfSSL is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
- */
-
-
-#ifdef HAVE_CONFIG_H
-    #include <config.h>
-#endif
-
-#include <wolfssl/options.h>
-#include <wolfssl/wolfcrypt/settings.h>
-#include <wolfssl/wolfcrypt/wc_port.h>
-#include <wolfssl/wolfcrypt/types.h>
-
-#ifdef HAVE_WC_INTROSPECTION
-
-WOLFSSL_API const char *libwolfssl_configure_args(void) {
-#ifdef LIBWOLFSSL_CONFIGURE_ARGS
-  /* the spaces on either side are to make matching simple and efficient. */
-  return " " LIBWOLFSSL_CONFIGURE_ARGS " ";
-#else
-  return NULL;
-#endif
-}
-
-WOLFSSL_API const char *libwolfssl_global_cflags(void) {
-#ifdef LIBWOLFSSL_GLOBAL_CFLAGS
-  /* the spaces on either side are to make matching simple and efficient. */
-  return " " LIBWOLFSSL_GLOBAL_CFLAGS " ";
-#else
-  return NULL;
-#endif
-}
-
-#endif /* HAVE_WC_INTROSPECTION */
-
-#ifdef HAVE_STACK_SIZE_VERBOSE
-WOLFSSL_API THREAD_LS_T unsigned char *StackSizeCheck_myStack = NULL;
-WOLFSSL_API THREAD_LS_T size_t StackSizeCheck_stackSize = 0;
-WOLFSSL_API THREAD_LS_T size_t StackSizeCheck_stackSizeHWM = 0;
-WOLFSSL_API THREAD_LS_T size_t *StackSizeCheck_stackSizeHWM_ptr = 0;
-WOLFSSL_API THREAD_LS_T void *StackSizeCheck_stackOffsetPointer = 0;
-#endif /* HAVE_STACK_SIZE_VERBOSE */