[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  a7ff57965b81ce4fd73a18266ce29abf6b909fdb (commit)
      from  04256277cb9dddedd77965f19107c6c3935e8b96 (commit)


- Log -----------------------------------------------------------------
commit a7ff57965b81ce4fd73a18266ce29abf6b909fdb
Author: Richard Levitte <levitte at openssl.org>
Date:   Sat Jul 8 22:13:24 2017 +0200

    Fix cipher_compare
    
    Unsigned overflow.  Found by Brian Carpenter
    
    Fixes #3889
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3890)

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

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

diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index d7b8fb0..c3adc87 100644
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -2793,7 +2793,9 @@ static int cipher_compare(const void *a, const void *b)
     const SSL_CIPHER *ap = (const SSL_CIPHER *)a;
     const SSL_CIPHER *bp = (const SSL_CIPHER *)b;
 
-    return ap->id - bp->id;
+    if (ap->id == bp->id)
+        return 0;
+    return ap->id < bp->id ? -1 : 1;
 }
 
 void ssl_sort_cipher_list(void)