summaryrefslogtreecommitdiffstats
path: root/providers/implementations/ciphers
diff options
context:
space:
mode:
authorXiaokangQian <xiaokang.qian@arm.com>2020-10-13 09:53:58 +0000
committerTomas Mraz <tmraz@fedoraproject.org>2020-10-20 13:45:01 +0200
commitec5059c3effc59457f4b539ed105123c0b702307 (patch)
tree60ebc070230c1b5fc7db1242eb4c2a5ccd3bc184 /providers/implementations/ciphers
parent6be235a0927473a2fddad83dd30ce4474ae53880 (diff)
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)
Diffstat (limited to 'providers/implementations/ciphers')
-rw-r--r--providers/implementations/ciphers/cipher_aes_xts_hw.c1
1 files changed, 1 insertions, 0 deletions
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 */