From: Pauli <pauli@openssl.org>
Date: Sun, 6 Jun 2021 23:23:41 +0000 (+1000)
Subject: fix coverity 1485660 improper use of negative value
X-Git-Tag: openssl-3.0.0-beta1~149
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6c1d17c802678364a8a8d7d69ee2aba2ac76a854;p=thirdparty%2Fopenssl.git

fix coverity 1485660 improper use of negative value

Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15635)
---

diff --git a/engines/e_padlock.c b/engines/e_padlock.c
index a22fc476e6f..5662bf5b50b 100644
--- a/engines/e_padlock.c
+++ b/engines/e_padlock.c
@@ -457,7 +457,12 @@ padlock_ctr_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out_arg,
                    const unsigned char *in_arg, size_t nbytes)
 {
     struct padlock_cipher_data *cdata = ALIGNED_CIPHER_DATA(ctx);
-    unsigned int num = EVP_CIPHER_CTX_get_num(ctx);
+    int n = EVP_CIPHER_CTX_get_num(ctx);
+    unsigned int num;
+
+    if (n < 0)
+        return 0;
+    num = (unsigned int)n;
 
     CRYPTO_ctr128_encrypt_ctr32(in_arg, out_arg, nbytes,
                                 cdata, EVP_CIPHER_CTX_iv_noconst(ctx),