Update WolfSSL library to the latest version.

[freertos] / FreeRTOS-Plus / Source / WolfSSL / cyassl / ctaocrypt / logging.h

diff --git a/FreeRTOS-Plus/Source/WolfSSL/cyassl/ctaocrypt/logging.h b/FreeRTOS-Plus/Source/WolfSSL/cyassl/ctaocrypt/logging.h
index a361e8ccaff49811190c83a5cee45a8379104397..faa85d44905efe562bfddc861c493e5948174f5b 100644 (file)
--- a/FreeRTOS-Plus/Source/WolfSSL/cyassl/ctaocrypt/logging.h
+++ b/FreeRTOS-Plus/Source/WolfSSL/cyassl/ctaocrypt/logging.h
@@ -1,15 +1,15 @@
 /* logging.h
  *
- * Copyright (C) 2006-2014 wolfSSL Inc.
+ * Copyright (C) 2006-2015 wolfSSL Inc.
  *
- * This file is part of CyaSSL.
+ * This file is part of wolfSSL. (formerly known as CyaSSL)
  *
- * CyaSSL is free software; you can redistribute it and/or modify
+ * 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.
  *
- * CyaSSL is distributed in the hope that it will be useful,
+ * 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.
@@ -25,46 +25,16 @@
 #ifndef CYASSL_LOGGING_H
 #define CYASSL_LOGGING_H
 
-
-#ifdef __cplusplus
-    extern "C" {
+/* for fips compatibility @wc_fips */
+#include <wolfssl/wolfcrypt/logging.h>
+#define CYASSL_LEAVE WOLFSSL_LEAVE
+#define CYASSL_ERROR WOLFSSL_ERROR
+#define CYASSL_ENTER WOLFSSL_ENTER
+#define CYASSL_MSG   WOLFSSL_MSG
+/* check old macros possibly declared */
+#if defined(DEBUG_CYASSL) && !defined(DEBUG_WOLFSSL)
+    #define DEBUG_WOLFSSL
 #endif
 
+#endif /* CYASSL_LOGGING_H */
 
-enum  CYA_Log_Levels {
-    ERROR_LOG = 0,
-    INFO_LOG,
-    ENTER_LOG,
-    LEAVE_LOG,
-    OTHER_LOG
-};
-
-typedef void (*CyaSSL_Logging_cb)(const int logLevel,
-                                  const char *const logMessage);
-
-CYASSL_API int CyaSSL_SetLoggingCb(CyaSSL_Logging_cb log_function);
-
-
-#ifdef DEBUG_CYASSL
-
-    void CYASSL_ENTER(const char* msg);
-    void CYASSL_LEAVE(const char* msg, int ret);
-
-    void CYASSL_ERROR(int);
-    void CYASSL_MSG(const char* msg);
-
-#else /* DEBUG_CYASSL   */
-
-    #define CYASSL_ENTER(m)
-    #define CYASSL_LEAVE(m, r)
-
-    #define CYASSL_ERROR(e)
-    #define CYASSL_MSG(m)
-
-#endif /* DEBUG_CYASSL  */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* CYASSL_MEMORY_H */