[openssl] master update

[tomas at openssl.org]

The branch master has been updated
       via  6d774732517f1d63b7999c5691fc0bf046023faf (commit)
      from  35530b117fcf54cf733c485e9e2e267963c081ee (commit)


- Log -----------------------------------------------------------------
commit 6d774732517f1d63b7999c5691fc0bf046023faf
Author: Peiwei Hu <jlu.hpw at foxmail.com>
Date:   Sun Nov 14 16:39:42 2021 +0800

    EVP_Cipher: fix the incomplete return check
    
    Signed-off-by: Peiwei Hu <jlu.hpw at foxmail.com>
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/17027)

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

Summary of changes:
 crypto/cmac/cmac.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/cmac/cmac.c b/crypto/cmac/cmac.c
index 18c7fea3dd..218eb94259 100644
--- a/crypto/cmac/cmac.c
+++ b/crypto/cmac/cmac.c
@@ -227,7 +227,7 @@ int CMAC_Final(CMAC_CTX *ctx, unsigned char *out, size_t *poutlen)
         for (i = 0; i < bl; i++)
             out[i] = ctx->last_block[i] ^ ctx->k2[i];
     }
-    if (!EVP_Cipher(ctx->cctx, out, out, bl)) {
+    if (EVP_Cipher(ctx->cctx, out, out, bl) <= 0) {
         OPENSSL_cleanse(out, bl);
         return 0;
     }