diff --git a/library/ssl_cli.c b/library/ssl_cli.c
index 29e9316351..a821a317ac 100644
--- a/library/ssl_cli.c
+++ b/library/ssl_cli.c
@@ -1453,7 +1453,8 @@ static int ssl_parse_server_key_exchange( ssl_context *ssl )
             md_free_ctx( &ctx );
         }
 
-        SSL_DEBUG_BUF( 3, "parameters hash", hash, hashlen );
+        SSL_DEBUG_BUF( 3, "parameters hash", hash, hashlen != 0 ? hashlen :
+                (unsigned int) ( md_info_from_type( md_alg ) )->size );
 
         /*
          * Verify signature
diff --git a/library/ssl_srv.c b/library/ssl_srv.c
index 8efd57e82f..53f12f445f 100644
--- a/library/ssl_srv.c
+++ b/library/ssl_srv.c
@@ -2040,7 +2040,8 @@ static int ssl_write_server_key_exchange( ssl_context *ssl )
 
         }
 
-        SSL_DEBUG_BUF( 3, "parameters hash", hash, hashlen );
+        SSL_DEBUG_BUF( 3, "parameters hash", hash, hashlen != 0 ? hashlen :
+                (unsigned int) ( md_info_from_type( md_alg ) )->size );
 
         /*
          * Make the signature