[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

[bernd.edlinger at hotmail.de]

The branch OpenSSL_1_1_0-stable has been updated
       via  bd90e98e149532aac345080905603f98af3d3350 (commit)
      from  6ddcf90fae372da897bdf84d0949618bbdb4abab (commit)


- Log -----------------------------------------------------------------
commit bd90e98e149532aac345080905603f98af3d3350
Author: cedral <joseph at southwell.org>
Date:   Wed Apr 4 19:12:23 2018 +0200

    fix build error in 32 bit debug build
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Bernd Edlinger <bernd.edlinger at hotmail.de>
    (Merged from https://github.com/openssl/openssl/pull/5861)

-----------------------------------------------------------------------

Summary of changes:
 ssl/t1_trce.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/ssl/t1_trce.c b/ssl/t1_trce.c
index e5b4085..3df3f54 100644
--- a/ssl/t1_trce.c
+++ b/ssl/t1_trce.c
@@ -1278,11 +1278,12 @@ void SSL_trace(int write_p, int version, int content_type,
             int hvers;
 
             /* avoid overlapping with length at the end of buffer */
-            if (msglen < (SSL_IS_DTLS(ssl) ? 13 : 5)) {
-                    BIO_puts(bio, write_p ? "Sent" : "Received");
-                    ssl_print_hex(bio, 0, " too short message", msg, msglen);
-                    break;
-                }
+            if (msglen < (size_t)(SSL_IS_DTLS(ssl) ?
+                         DTLS1_RT_HEADER_LENGTH : SSL3_RT_HEADER_LENGTH)) {
+                BIO_puts(bio, write_p ? "Sent" : "Received");
+                ssl_print_hex(bio, 0, " too short message", msg, msglen);
+                break;
+            }
             hvers = msg[1] << 8 | msg[2];
             BIO_puts(bio, write_p ? "Sent" : "Received");
             BIO_printf(bio, " Record\nHeader:\n  Version = %s (0x%x)\n",