feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Fix to disable log output for WOLFSSL_ERROR with WOLFSSL_NGINX defined. Cleanup on the loggingEnabled.

Browse Source
This commit is contained in:
David Garske
2018-01-02 19:30:33 -08:00
parent d0bd52910f
commit ab3d1e85cf
2 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
wolfcrypt/src/logging.c
View File

@ -123,30 +123,28 @@ static void wolfssl_log(const int logLevel, const char *const logMessage)
if (log_function) if (log_function)
log_function(logLevel, logMessage); log_function(logLevel, logMessage);
else { else {
if (loggingEnabled) {
#if defined(WOLFSSL_USER_LOG) #if defined(WOLFSSL_USER_LOG)
WOLFSSL_USER_LOG(logMessage); WOLFSSL_USER_LOG(logMessage);
#elif defined(WOLFSSL_LOG_PRINTF) #elif defined(WOLFSSL_LOG_PRINTF)
printf("%s\n", logMessage); printf("%s\n", logMessage);
#elif defined(THREADX) && !defined(THREADX_NO_DC_PRINTF) #elif defined(THREADX) && !defined(THREADX_NO_DC_PRINTF)
dc_log_printf("%s\n", logMessage); dc_log_printf("%s\n", logMessage);
#elif defined(MICRIUM) #elif defined(MICRIUM)
BSP_Ser_Printf("%s\r\n", logMessage); BSP_Ser_Printf("%s\r\n", logMessage);
#elif defined(WOLFSSL_MDK_ARM) #elif defined(WOLFSSL_MDK_ARM)
fflush(stdout) ; fflush(stdout) ;
printf("%s\n", logMessage); printf("%s\n", logMessage);
fflush(stdout) ; fflush(stdout) ;
#elif defined(WOLFSSL_UTASKER) #elif defined(WOLFSSL_UTASKER)
fnDebugMsg((char*)logMessage); fnDebugMsg((char*)logMessage);
fnDebugMsg("\r\n"); fnDebugMsg("\r\n");
#elif defined(MQX_USE_IO_OLD) #elif defined(MQX_USE_IO_OLD)
fprintf(_mqxio_stderr, "%s\n", logMessage); fprintf(_mqxio_stderr, "%s\n", logMessage);
#else #else
fprintf(stderr, "%s\n", logMessage); fprintf(stderr, "%s\n", logMessage);
#endif #endif
}
} }
} }
@ -232,8 +230,8 @@ void WOLFSSL_ERROR_LINE(int error, const char* func, unsigned int line,
void WOLFSSL_ERROR(int error) void WOLFSSL_ERROR(int error)
#endif #endif
{ {
#if defined(DEBUG_WOLFSSL) && !defined(WOLFSSL_NGINX) #ifdef WOLFSSL_ASYNC_CRYPT
if (loggingEnabled && error != WC_PENDING_E) if (error != WC_PENDING_E)
#endif #endif
{ {
char buffer[WOLFSSL_MAX_ERROR_SZ]; char buffer[WOLFSSL_MAX_ERROR_SZ];
@ -267,7 +265,8 @@ void WOLFSSL_ERROR(int error)
#endif #endif
#ifdef DEBUG_WOLFSSL #ifdef DEBUG_WOLFSSL
wolfssl_log(ERROR_LOG , buffer); if (loggingEnabled)
wolfssl_log(ERROR_LOG , buffer);
#endif #endif
} }
} }

5
wolfcrypt/test/test.c
View File

@ -15100,11 +15100,14 @@ int logging_test(void)
WOLFSSL_BUFFER(NULL, 0); WOLFSSL_BUFFER(NULL, 0);
WOLFSSL_ERROR(MEMORY_E); WOLFSSL_ERROR(MEMORY_E);
WOLFSSL_ERROR_MSG(msg); WOLFSSL_ERROR_MSG(msg);
i = log_cnt; /* capture log count */
/* turn off logs */ /* turn off logs */
wolfSSL_Debugging_OFF(); wolfSSL_Debugging_OFF();
/* capture log count */
i = log_cnt;
/* validate no logs are output when disabled */
WOLFSSL_MSG(msg); WOLFSSL_MSG(msg);
WOLFSSL_BUFFER(a, sizeof(a)); WOLFSSL_BUFFER(a, sizeof(a));
WOLFSSL_BUFFER(b, sizeof(b)); WOLFSSL_BUFFER(b, sizeof(b));