diff --git a/library/ssl_debug_helpers.h b/library/ssl_debug_helpers.h
index ad84619..ccdda2a 100644
--- a/library/ssl_debug_helpers.h
+++ b/library/ssl_debug_helpers.h
@@ -55,17 +55,9 @@
                                   int hs_msg_type, unsigned int extension_type,
                                   const char *extra_msg0, const char *extra_msg1 );
 
-#define MBEDTLS_SSL_PRINT_SENT_EXTS( level, hs_msg_type )                       \
+#define MBEDTLS_SSL_PRINT_EXTS( level, hs_msg_type, extension_mask )            \
             mbedtls_ssl_print_extensions( ssl, level, __FILE__, __LINE__,       \
-                                          hs_msg_type,                          \
-                                          ssl->handshake->sent_extensions,      \
-                                          "sent" )
-
-#define MBEDTLS_SSL_PRINT_RECEIVED_EXTS( level, hs_msg_type )                   \
-            mbedtls_ssl_print_extensions( ssl, level, __FILE__, __LINE__,       \
-                                          hs_msg_type,                          \
-                                          ssl->handshake->received_extensions,  \
-                                          "received" )
+                                          hs_msg_type, extension_mask, NULL )
 
 #define MBEDTLS_SSL_PRINT_EXT( level, hs_msg_type, extension_type, extra )      \
             mbedtls_ssl_print_extension( ssl, level, __FILE__, __LINE__,        \
@@ -73,9 +65,7 @@
                                          extra, NULL )
 #else
 
-#define MBEDTLS_SSL_PRINT_SENT_EXTS( level, hs_msg_type )
-
-#define MBEDTLS_SSL_PRINT_RECEIVED_EXTS( level, hs_msg_type )
+#define MBEDTLS_SSL_PRINT_EXTS( level, hs_msg_type, extension_mask )
 
 #define MBEDTLS_SSL_PRINT_EXT( level, hs_msg_type, extension_type, extra )