From: XiaokangQian <xiaokang.qian@arm.com>
Date: Tue, 13 Oct 2020 09:53:58 +0000 (+0000)
Subject: Fix Aes-xts potential failure on aarch64
X-Git-Tag: openssl-3.0.0-alpha8~49
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ec5059c3effc59457f4b539ed105123c0b702307;p=thirdparty%2Fopenssl.git

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.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/13133)
---

diff --git a/providers/implementations/ciphers/cipher_aes_xts_hw.c b/providers/implementations/ciphers/cipher_aes_xts_hw.c
index 15c136bafd8..c45d67b825b 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 */