From ec5059c3effc59457f4b539ed105123c0b702307 Mon Sep 17 00:00:00 2001 From: XiaokangQian Date: Tue, 13 Oct 2020 09:53:58 +0000 Subject: [PATCH] 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 Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/13133) --- 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 15c136bafd8c..c45d67b825b1 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 */