[openssl] master update

[shane.lontis at oracle.com]

The branch master has been updated
       via  793374c82abd3215ec33d989810214a871849eda (commit)
      from  d5d32e784dd2ac25b3c773893f94484bcda5a23d (commit)


- Log -----------------------------------------------------------------
commit 793374c82abd3215ec33d989810214a871849eda
Author: Shane Lontis <shane.lontis at oracle.com>
Date:   Wed Sep 18 15:20:30 2019 +1000

    Fix Coverity CID:1453685 'unreachable code' in aes_xts code.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Kurt Roeckx <kurt at roeckx.be>
    (Merged from https://github.com/openssl/openssl/pull/9902)

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

Summary of changes:
 providers/common/ciphers/cipher_aes_xts.c | 2 --
 1 file changed, 2 deletions(-)

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;
 }