for debug

Signed-off-by: Ronald Cron <[email protected]>

Author: ronald-cron-arm

include/mbedtls/debug.h

@@ -108,7 +108,7 @@
  *
  * This module provides debugging functions.
  */
-#if (defined(__MINGW32__) && __USE_MINGW_ANSI_STDIO == 0) || (defined(_MSC_VER) && _MSC_VER < 1800)
+#if (defined(__MINGW32__) && __USE_MINGW_ANSI_STDIO == 0) || (defined(_MSC_VER) && _MSC_VER <= 1800)
    #include <inttypes.h>
    #define MBEDTLS_PRINTF_SIZET     PRIuPTR
    #define MBEDTLS_PRINTF_LONGLONG  "I64d"

library/debug.c

@@ -67,10 +67,14 @@ void mbedtls_debug_print_msg(const mbedtls_ssl_context *ssl, int level,
         return;
     }
 
+    mbedtls_fprintf(stderr, "b1 %s-%d\n", file, line);
+
     va_start(argp, format);
     ret = mbedtls_vsnprintf(str, DEBUG_BUF_SIZE, format, argp);
     va_end(argp);
 
+    mbedtls_fprintf(stderr, "a1 %s-%d\n", file, line);
+
     if (ret < 0) {
         ret = 0;
     } else {
@@ -81,7 +85,10 @@ void mbedtls_debug_print_msg(const mbedtls_ssl_context *ssl, int level,
     str[ret]     = '\n';
     str[ret + 1] = '\0';
 
+    mbedtls_fprintf(stderr, "b2\n");
     debug_send_line(ssl, level, file, line, str);
+    mbedtls_fprintf(stderr, "a2\n");
+    fflush(stderr);
 }
 
 void mbedtls_debug_print_ret(const mbedtls_ssl_context *ssl, int level,

tests/scripts/all.sh

@@ -1064,14 +1064,10 @@ component_check_test_dependencies () {
     # PSA_VENDOR_RSA_MAX_KEY_BITS. The legacy module is only used by
     # the test code and that's probably the most convenient way of achieving
     # the test's goal.
-    echo "MBEDTLS_ASN1_WRITE_C" >> $expected
     # No PSA equivalent - we should probably have one in the future.
-    echo "MBEDTLS_ECP_RESTARTABLE" >> $expected
     # No PSA equivalent - needed by some init tests
-    echo "MBEDTLS_ENTROPY_NV_SEED" >> $expected
     # Used by two tests that are about an extension to the PSA standard;
     # as such, no PSA equivalent.
-    echo "MBEDTLS_PEM_PARSE_C" >> $expected
 
     # Compare reality with expectation.
     # We want an exact match, to ensure the above list remains up-to-date.

tests/src/test_helpers/ssl_helpers.c

@@ -11,6 +11,8 @@
 #include <test/ssl_helpers.h>
 #include "md_psa.h"
 
+int mbedtls_ssl_test_helper_enable_log_analyzer_fprintf = 0;
+
 #if defined(MBEDTLS_SSL_TLS_C)
 #if defined(MBEDTLS_SSL_HANDSHAKE_WITH_CERT_ENABLED)
 static int rng_seed = 0xBEEF;
@@ -29,17 +31,11 @@ void mbedtls_test_ssl_log_analyzer(void *ctx, int level,
                                    const char *file, int line,
                                    const char *str)
 {
-    mbedtls_test_ssl_log_pattern *p = (mbedtls_test_ssl_log_pattern *) ctx;
-
+    (void) ctx;
     (void) level;
-    (void) line;
     (void) file;
-
-    if (NULL != p &&
-        NULL != p->pattern &&
-        NULL != strstr(str, p->pattern)) {
-        p->counter++;
-    }
+    (void) line;
+    (void) str;
 }
 
 void mbedtls_test_init_handshake_options(