[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  63ff89ab71d38f03bb56603e4048a1dc143942b2 (commit)
      from  ddc1caac2d6b22250f78ae9e0d392c923bc85933 (commit)


- Log -----------------------------------------------------------------
commit 63ff89ab71d38f03bb56603e4048a1dc143942b2
Author: Philippe Antoine <p.antoine at catenacyber.fr>
Date:   Wed Mar 21 08:27:34 2018 +0100

    Fixes integer underflow with SSL_trace support
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5706)

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

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

diff --git a/ssl/t1_trce.c b/ssl/t1_trce.c
index 55f1824..f8d0501 100644
--- a/ssl/t1_trce.c
+++ b/ssl/t1_trce.c
@@ -729,7 +729,7 @@ static int ssl_print_extension(BIO *bio, int indent, int server,
         while (xlen > 0) {
             size_t plen = *ext++;
 
-            if (plen > xlen + 1)
+            if (plen + 1 > xlen)
                 return 0;
             BIO_indent(bio, indent + 2, 80);
             BIO_write(bio, ext, plen);