[openssl] master update

[tmraz]

The branch master has been updated
       via  ec5059c3effc59457f4b539ed105123c0b702307 (commit)
      from  6be235a0927473a2fddad83dd30ce4474ae53880 (commit)


- Log -----------------------------------------------------------------
commit ec5059c3effc59457f4b539ed105123c0b702307
Author: XiaokangQian <xiaokang.q...@arm.com>
Date:   Tue Oct 13 09:53:58 2020 +0000

    Fix Aes-xts potential failure on aarch64
    
    Add return value for aarch64 in the init key function.
    This will avoid overwriting the stream pointers of aarch64.
    
    Reviewed-by: Shane Lontis <shane.lon...@oracle.com>
    Reviewed-by: Tomas Mraz <tm...@fedoraproject.org>
    (Merged from https://github.com/openssl/openssl/pull/13133)

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

Summary of changes:
 providers/implementations/ciphers/cipher_aes_xts_hw.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/providers/implementations/ciphers/cipher_aes_xts_hw.c 
b/providers/implementations/ciphers/cipher_aes_xts_hw.c
index 15c136bafd..c45d67b825 100644
--- a/providers/implementations/ciphers/cipher_aes_xts_hw.c
+++ b/providers/implementations/ciphers/cipher_aes_xts_hw.c
@@ -59,6 +59,7 @@ static int cipher_hw_aes_xts_generic_initkey(PROV_CIPHER_CTX 
*ctx,
         XTS_SET_KEY_FN(HWAES_set_encrypt_key, HWAES_set_decrypt_key,
                        HWAES_encrypt, HWAES_decrypt,
                        stream_enc, stream_dec);
+        return 1;
     } else
 #endif /* HWAES_CAPABLE */