Fix a -Wsign-compare warning
authorBenjamin Kaduk <bkaduk@akamai.com>
Tue, 14 Mar 2017 16:37:42 +0000 (11:37 -0500)
committerRichard Levitte <levitte@openssl.org>
Tue, 14 Mar 2017 17:10:04 +0000 (18:10 +0100)
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)

apps/s_client.c

index 458b9e05d66e68d2c940b7f035e4f5c37fe8a89e..0292e5f87aa5f4411a744bbf9feace1be9a399c0 100644 (file)
@@ -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);