commit a7ff57965b81ce4fd73a18266ce29abf6b909fdb
author Richard Levitte <levitte@openssl.org> Sat Jul 08 22:13:24 2017 +0200
committer Richard Levitte <levitte@openssl.org> Sat Jul 08 22:13:24 2017 +0200
tree dca47b76158cecaeb41c86632a6f1821c37d7276
parent 04256277cb9dddedd77965f19107c6c3935e8b96

Fix cipher_compare

Unsigned overflow.  Found by Brian Carpenter

Fixes #3889

Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3890)

ssl/s3_lib.c

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 @@
     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)