From: Benjamin Kaduk <bkaduk@akamai.com>
Date: Tue, 14 Mar 2017 16:37:42 +0000 (-0500)
Subject: Fix a -Wsign-compare warning
X-Git-Tag: OpenSSL_1_1_0f~148
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b1163cc8b87547d4506de0b037fa1bd69781e818;p=oweals%2Fopenssl.git

Fix a -Wsign-compare warning

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2940)
(cherry picked from commit 96a5d7fdbaa7aea5e5090e0f7dc2973943986fc9)
---

diff --git a/apps/s_client.c b/apps/s_client.c
index 458b9e05d6..0292e5f87a 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -175,7 +175,7 @@ static unsigned int psk_client_cb(SSL *ssl, const char *hint, char *identity,
                    psk_key);
         return 0;
     }
-    if (key_len > max_psk_len) {
+    if (max_psk_len > INT_MAX || key_len > (long)max_psk_len) {
         BIO_printf(bio_err,
                    "psk buffer of callback is too small (%d) for key (%ld)\n",
                    max_psk_len, key_len);