[openssl-commits] [openssl] master update

[bernd.edlinger at hotmail.de]

The branch master has been updated
       via  d8fa9324d25b07efd45761a0fee6b0f89c18924b (commit)
      from  6b49b30811f4afa0340342af9400b8d0357b5291 (commit)


- Log -----------------------------------------------------------------
commit d8fa9324d25b07efd45761a0fee6b0f89c18924b
Author: cedral <joseph at southwell.org>
Date:   Wed Apr 4 14:54:47 2018 +0200

    Visual Studio 2017 debug build warning error on 32 bit 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/5799)

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

Summary of changes:
 ssl/t1_trce.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ssl/t1_trce.c b/ssl/t1_trce.c
index d3f67f5..394df98 100644
--- a/ssl/t1_trce.c
+++ b/ssl/t1_trce.c
@@ -1504,7 +1504,8 @@ 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)) {
+            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;