[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  511190b691183a1fb160e7e05e2974dc73cab0c6 (commit)
      from  246bd8fd0507f4555432c148eed5a9322c113bf5 (commit)


- Log -----------------------------------------------------------------
commit 511190b691183a1fb160e7e05e2974dc73cab0c6
Author: Matt Caswell <matt at openssl.org>
Date:   Wed May 16 11:59:47 2018 +0100

    Fix undefined behaviour in X509_NAME_cmp()
    
    If the lengths of both names is 0 then don't attempt to do a memcmp.
    
    Issue reported by Simon Friedberger, Robert Merget and Juraj Somorovsky.
    
    Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
    (Merged from https://github.com/openssl/openssl/pull/6291)

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

Summary of changes:
 crypto/x509/x509_cmp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/x509/x509_cmp.c b/crypto/x509/x509_cmp.c
index 3d4931b..67c1872 100644
--- a/crypto/x509/x509_cmp.c
+++ b/crypto/x509/x509_cmp.c
@@ -173,7 +173,7 @@ int X509_NAME_cmp(const X509_NAME *a, const X509_NAME *b)
 
     ret = a->canon_enclen - b->canon_enclen;
 
-    if (ret)
+    if (ret != 0 || a->canon_enclen == 0)
         return ret;
 
     return memcmp(a->canon_enc, b->canon_enc, a->canon_enclen);