[openssl] master update

[Matt Caswell]

The branch master has been updated
       via  8e8901e1e497d2a2bc0f56aa711f7462d88820f3 (commit)
      from  38b71bd4704ee1746e862f5a7a4e170fd84a5eb0 (commit)


- Log -----------------------------------------------------------------
commit 8e8901e1e497d2a2bc0f56aa711f7462d88820f3
Author: Kelvin Lee <kiyolee at gmail.com>
Date:   Sun Oct 27 23:04:39 2019 +1100

    Fix typo in cipher_chacha20_poly1305_hw.c.
    
    CLA: trivial
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/10275)

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

Summary of changes:
 providers/implementations/ciphers/cipher_chacha20_poly1305_hw.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/providers/implementations/ciphers/cipher_chacha20_poly1305_hw.c b/providers/implementations/ciphers/cipher_chacha20_poly1305_hw.c
index 51e5275b7e..74b8fb6586 100644
--- a/providers/implementations/ciphers/cipher_chacha20_poly1305_hw.c
+++ b/providers/implementations/ciphers/cipher_chacha20_poly1305_hw.c
@@ -142,7 +142,7 @@ static int chacha20_poly1305_tls_cipher(PROV_CIPHER_CTX *bctx,
         ctx->len.text = plen;
 
         if (plen) {
-            if (ctx->enc)
+            if (bctx->enc)
                 ctr = xor128_encrypt_n_pad(out, in, ctr, plen);
             else
                 ctr = xor128_decrypt_n_pad(out, in, ctr, plen);