From: Shane Lontis <shane.lontis@oracle.com>
Date: Wed, 18 Sep 2019 05:20:30 +0000 (+1000)
Subject: Fix Coverity CID:1453685 'unreachable code' in aes_xts code.
X-Git-Tag: openssl-3.0.0-alpha1~1337
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=793374c82abd3215ec33d989810214a871849eda;p=oweals%2Fopenssl.git

Fix Coverity CID:1453685 'unreachable code' in aes_xts code.

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Kurt Roeckx <kurt@roeckx.be>
(Merged from https://github.com/openssl/openssl/pull/9902)
---

diff --git a/providers/common/ciphers/cipher_aes_xts.c b/providers/common/ciphers/cipher_aes_xts.c
index c85475442b..0d642368b3 100644
--- a/providers/common/ciphers/cipher_aes_xts.c
+++ b/providers/common/ciphers/cipher_aes_xts.c
@@ -176,7 +176,6 @@ static int aes_xts_cipher(void *vctx, unsigned char *out, size_t *outl,
     else if (CRYPTO_xts128_encrypt(&ctx->xts, ctx->base.iv, in, out, inl,
                                    ctx->base.enc))
         return 0;
-    return 1;
 
     *outl = inl;
     return 1;
@@ -198,7 +197,6 @@ static int aes_xts_stream_update(void *vctx, unsigned char *out, size_t *outl,
         return 0;
     }
 
-    *outl = inl;
     return 1;
 }