diff --git a/include/mbedtls/debug.h b/include/mbedtls/debug.h
index 0aed596..ea6d35c 100644
--- a/include/mbedtls/debug.h
+++ b/include/mbedtls/debug.h
@@ -27,56 +27,74 @@
 #include "mbedtls/ssl.h"
 
 #if defined(MBEDTLS_ECP_C)
-#include "mbedtls/ecp.h"
+#    include "mbedtls/ecp.h"
 #endif
 
 #if defined(MBEDTLS_DEBUG_C)
 
-#define MBEDTLS_DEBUG_STRIP_PARENS( ... )   __VA_ARGS__
+#    define MBEDTLS_DEBUG_STRIP_PARENS(...) __VA_ARGS__
 
-#define MBEDTLS_SSL_DEBUG_MSG( level, args )                    \
-    mbedtls_debug_print_msg( ssl, level, __FILE__, __LINE__,    \
-                             MBEDTLS_DEBUG_STRIP_PARENS args )
+#    define MBEDTLS_SSL_DEBUG_MSG(level, args)                  \
+        mbedtls_debug_print_msg(ssl, level, __FILE__, __LINE__, \
+                                MBEDTLS_DEBUG_STRIP_PARENS args)
 
-#define MBEDTLS_SSL_DEBUG_RET( level, text, ret )                \
-    mbedtls_debug_print_ret( ssl, level, __FILE__, __LINE__, text, ret )
+#    define MBEDTLS_SSL_DEBUG_RET(level, text, ret) \
+        mbedtls_debug_print_ret(ssl, level, __FILE__, __LINE__, text, ret)
 
-#define MBEDTLS_SSL_DEBUG_BUF( level, text, buf, len )           \
-    mbedtls_debug_print_buf( ssl, level, __FILE__, __LINE__, text, buf, len )
+#    define MBEDTLS_SSL_DEBUG_BUF(level, text, buf, len) \
+        mbedtls_debug_print_buf(ssl, level, __FILE__, __LINE__, text, buf, len)
 
-#if defined(MBEDTLS_BIGNUM_C)
-#define MBEDTLS_SSL_DEBUG_MPI( level, text, X )                  \
-    mbedtls_debug_print_mpi( ssl, level, __FILE__, __LINE__, text, X )
-#endif
+#    if defined(MBEDTLS_BIGNUM_C)
+#        define MBEDTLS_SSL_DEBUG_MPI(level, text, X) \
+            mbedtls_debug_print_mpi(ssl, level, __FILE__, __LINE__, text, X)
+#    endif
 
-#if defined(MBEDTLS_ECP_C)
-#define MBEDTLS_SSL_DEBUG_ECP( level, text, X )                  \
-    mbedtls_debug_print_ecp( ssl, level, __FILE__, __LINE__, text, X )
-#endif
+#    if defined(MBEDTLS_ECP_C)
+#        define MBEDTLS_SSL_DEBUG_ECP(level, text, X) \
+            mbedtls_debug_print_ecp(ssl, level, __FILE__, __LINE__, text, X)
+#    endif
 
-#if defined(MBEDTLS_X509_CRT_PARSE_C)
-#if !defined(MBEDTLS_X509_REMOVE_INFO)
-#define MBEDTLS_SSL_DEBUG_CRT( level, text, crt )                \
-    mbedtls_debug_print_crt( ssl, level, __FILE__, __LINE__, text, crt )
-#else
-#define MBEDTLS_SSL_DEBUG_CRT( level, text, crt )       do { } while( 0 )
-#endif /* MBEDTLS_X509_REMOVE_INFO */
-#endif /* MBEDTLS_X509_CRT_PARSE_C */
+#    if defined(MBEDTLS_X509_CRT_PARSE_C)
+#        if !defined(MBEDTLS_X509_REMOVE_INFO)
+#            define MBEDTLS_SSL_DEBUG_CRT(level, text, crt)                   \
+                mbedtls_debug_print_crt(ssl, level, __FILE__, __LINE__, text, \
+                                        crt)
+#        else
+#            define MBEDTLS_SSL_DEBUG_CRT(level, text, crt) \
+                do {                                        \
+                } while (0)
+#        endif /* MBEDTLS_X509_REMOVE_INFO */
+#    endif /* MBEDTLS_X509_CRT_PARSE_C */
 
-#if defined(MBEDTLS_ECDH_C)
-#define MBEDTLS_SSL_DEBUG_ECDH( level, ecdh, attr )               \
-    mbedtls_debug_printf_ecdh( ssl, level, __FILE__, __LINE__, ecdh, attr )
-#endif
+#    if defined(MBEDTLS_ECDH_C)
+#        define MBEDTLS_SSL_DEBUG_ECDH(level, ecdh, attr)                   \
+            mbedtls_debug_printf_ecdh(ssl, level, __FILE__, __LINE__, ecdh, \
+                                      attr)
+#    endif
 
 #else /* MBEDTLS_DEBUG_C */
 
-#define MBEDTLS_SSL_DEBUG_MSG( level, args )            do { } while( 0 )
-#define MBEDTLS_SSL_DEBUG_RET( level, text, ret )       do { } while( 0 )
-#define MBEDTLS_SSL_DEBUG_BUF( level, text, buf, len )  do { } while( 0 )
-#define MBEDTLS_SSL_DEBUG_MPI( level, text, X )         do { } while( 0 )
-#define MBEDTLS_SSL_DEBUG_ECP( level, text, X )         do { } while( 0 )
-#define MBEDTLS_SSL_DEBUG_CRT( level, text, crt )       do { } while( 0 )
-#define MBEDTLS_SSL_DEBUG_ECDH( level, ecdh, attr )     do { } while( 0 )
+#    define MBEDTLS_SSL_DEBUG_MSG(level, args) \
+        do {                                   \
+        } while (0)
+#    define MBEDTLS_SSL_DEBUG_RET(level, text, ret) \
+        do {                                        \
+        } while (0)
+#    define MBEDTLS_SSL_DEBUG_BUF(level, text, buf, len) \
+        do {                                             \
+        } while (0)
+#    define MBEDTLS_SSL_DEBUG_MPI(level, text, X) \
+        do {                                      \
+        } while (0)
+#    define MBEDTLS_SSL_DEBUG_ECP(level, text, X) \
+        do {                                      \
+        } while (0)
+#    define MBEDTLS_SSL_DEBUG_CRT(level, text, crt) \
+        do {                                        \
+        } while (0)
+#    define MBEDTLS_SSL_DEBUG_ECDH(level, ecdh, attr) \
+        do {                                          \
+        } while (0)
 
 #endif /* MBEDTLS_DEBUG_C */
 
@@ -93,19 +111,20 @@
  * This module provides debugging functions.
  */
 #if defined(__has_attribute)
-#if __has_attribute(format)
-#if defined(__MINGW32__) && __USE_MINGW_ANSI_STDIO == 1
-#define MBEDTLS_PRINTF_ATTRIBUTE(string_index, first_to_check)    \
-    __attribute__((__format__ (gnu_printf, string_index, first_to_check)))
-#else /* defined(__MINGW32__) && __USE_MINGW_ANSI_STDIO == 1 */
-#define MBEDTLS_PRINTF_ATTRIBUTE(string_index, first_to_check)    \
-    __attribute__((format(printf, string_index, first_to_check)))
-#endif
-#else /* __has_attribute(format) */
-#define MBEDTLS_PRINTF_ATTRIBUTE(string_index, first_to_check)
-#endif /* __has_attribute(format) */
+#    if __has_attribute(format)
+#        if defined(__MINGW32__) && __USE_MINGW_ANSI_STDIO == 1
+#            define MBEDTLS_PRINTF_ATTRIBUTE(string_index, first_to_check) \
+                __attribute__((                                            \
+                    __format__(gnu_printf, string_index, first_to_check)))
+#        else /* defined(__MINGW32__) && __USE_MINGW_ANSI_STDIO == 1 */
+#            define MBEDTLS_PRINTF_ATTRIBUTE(string_index, first_to_check) \
+                __attribute__((format(printf, string_index, first_to_check)))
+#        endif
+#    else /* __has_attribute(format) */
+#        define MBEDTLS_PRINTF_ATTRIBUTE(string_index, first_to_check)
+#    endif /* __has_attribute(format) */
 #else /* defined(__has_attribute) */
-#define MBEDTLS_PRINTF_ATTRIBUTE(string_index, first_to_check)
+#    define MBEDTLS_PRINTF_ATTRIBUTE(string_index, first_to_check)
 #endif
 
 /**
@@ -120,14 +139,17 @@
  *
  * This module provides debugging functions.
  */
-#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"
-#else /* (defined(__MINGW32__)  && __USE_MINGW_ANSI_STDIO == 0) || (defined(_MSC_VER) && _MSC_VER < 1800) */
-   #define MBEDTLS_PRINTF_SIZET     "zu"
-   #define MBEDTLS_PRINTF_LONGLONG  "lld"
-#endif /* (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"
+#else /* (defined(__MINGW32__)  && __USE_MINGW_ANSI_STDIO == 0) || \
+         (defined(_MSC_VER) && _MSC_VER < 1800) */
+#    define MBEDTLS_PRINTF_SIZET    "zu"
+#    define MBEDTLS_PRINTF_LONGLONG "lld"
+#endif /* (defined(__MINGW32__)  && __USE_MINGW_ANSI_STDIO == 0) || \
+          (defined(_MSC_VER) && _MSC_VER < 1800) */
 
 #ifdef __cplusplus
 extern "C" {
@@ -148,7 +170,7 @@
  *                              - 3 Informational
  *                              - 4 Verbose
  */
-void mbedtls_debug_set_threshold( int threshold );
+void mbedtls_debug_set_threshold(int threshold);
 
 /**
  * \brief    Print a message to the debug output. This function is always used
@@ -165,9 +187,12 @@
  * \attention       This function is intended for INTERNAL usage within the
  *                  library only.
  */
-void mbedtls_debug_print_msg( const mbedtls_ssl_context *ssl, int level,
-                              const char *file, int line,
-                              const char *format, ... ) MBEDTLS_PRINTF_ATTRIBUTE(5, 6);
+void mbedtls_debug_print_msg(const mbedtls_ssl_context *ssl,
+                             int level,
+                             const char *file,
+                             int line,
+                             const char *format,
+                             ...) MBEDTLS_PRINTF_ATTRIBUTE(5, 6);
 
 /**
  * \brief   Print the return value of a function to the debug output. This
@@ -184,9 +209,12 @@
  * \attention       This function is intended for INTERNAL usage within the
  *                  library only.
  */
-void mbedtls_debug_print_ret( const mbedtls_ssl_context *ssl, int level,
-                      const char *file, int line,
-                      const char *text, int ret );
+void mbedtls_debug_print_ret(const mbedtls_ssl_context *ssl,
+                             int level,
+                             const char *file,
+                             int line,
+                             const char *text,
+                             int ret);
 
 /**
  * \brief   Output a buffer of size len bytes to the debug output. This function
@@ -205,9 +233,13 @@
  * \attention       This function is intended for INTERNAL usage within the
  *                  library only.
  */
-void mbedtls_debug_print_buf( const mbedtls_ssl_context *ssl, int level,
-                      const char *file, int line, const char *text,
-                      const unsigned char *buf, size_t len );
+void mbedtls_debug_print_buf(const mbedtls_ssl_context *ssl,
+                             int level,
+                             const char *file,
+                             int line,
+                             const char *text,
+                             const unsigned char *buf,
+                             size_t len);
 
 #if defined(MBEDTLS_BIGNUM_C)
 /**
@@ -226,9 +258,12 @@
  * \attention       This function is intended for INTERNAL usage within the
  *                  library only.
  */
-void mbedtls_debug_print_mpi( const mbedtls_ssl_context *ssl, int level,
-                      const char *file, int line,
-                      const char *text, const mbedtls_mpi *X );
+void mbedtls_debug_print_mpi(const mbedtls_ssl_context *ssl,
+                             int level,
+                             const char *file,
+                             int line,
+                             const char *text,
+                             const mbedtls_mpi *X);
 #endif
 
 #if defined(MBEDTLS_ECP_C)
@@ -248,9 +283,12 @@
  * \attention       This function is intended for INTERNAL usage within the
  *                  library only.
  */
-void mbedtls_debug_print_ecp( const mbedtls_ssl_context *ssl, int level,
-                      const char *file, int line,
-                      const char *text, const mbedtls_ecp_point *X );
+void mbedtls_debug_print_ecp(const mbedtls_ssl_context *ssl,
+                             int level,
+                             const char *file,
+                             int line,
+                             const char *text,
+                             const mbedtls_ecp_point *X);
 #endif
 
 #if defined(MBEDTLS_X509_CRT_PARSE_C) && !defined(MBEDTLS_X509_REMOVE_INFO)
@@ -269,9 +307,12 @@
  * \attention       This function is intended for INTERNAL usage within the
  *                  library only.
  */
-void mbedtls_debug_print_crt( const mbedtls_ssl_context *ssl, int level,
-                      const char *file, int line,
-                      const char *text, const mbedtls_x509_crt *crt );
+void mbedtls_debug_print_crt(const mbedtls_ssl_context *ssl,
+                             int level,
+                             const char *file,
+                             int line,
+                             const char *text,
+                             const mbedtls_x509_crt *crt);
 #endif
 
 #if defined(MBEDTLS_ECDH_C)
@@ -298,10 +339,12 @@
  * \attention       This function is intended for INTERNAL usage within the
  *                  library only.
  */
-void mbedtls_debug_printf_ecdh( const mbedtls_ssl_context *ssl, int level,
-                                const char *file, int line,
-                                const mbedtls_ecdh_context *ecdh,
-                                mbedtls_debug_ecdh_attr attr );
+void mbedtls_debug_printf_ecdh(const mbedtls_ssl_context *ssl,
+                               int level,
+                               const char *file,
+                               int line,
+                               const mbedtls_ecdh_context *ecdh,
+                               mbedtls_debug_ecdh_attr attr);
 #endif
 
 #ifdef __cplusplus