Visual Studio 2017 debug build warning error on 32 bit build
authorcedral <joseph@southwell.org>
Wed, 4 Apr 2018 12:54:47 +0000 (14:54 +0200)
committerBernd Edlinger <bernd.edlinger@hotmail.de>
Wed, 4 Apr 2018 12:54:47 +0000 (14:54 +0200)
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
(Merged from https://github.com/openssl/openssl/pull/5799)

ssl/t1_trce.c

index d3f67f5..394df98 100644 (file)
@@ -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;