mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2024-11-27 05:21:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Missing else in cipher_hw_aes_ocb_generic_initkey

Browse Source 
This came from commit 3837c202 "Add aes_ocb cipher to providers". It
causes the default non-hardware accelerated AES implementation to be
used even if HWAES_CAPABLE is set. Affects all platforms except X86 and
SPARC.

Patch by: Nick Gasson <Nick.Gasson@arm.com>
Change-Id: I26001a3a922ff23f6090fdcefefaecf68e92e2a6

Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Kurt Roeckx <kurt@roeckx.be>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/10012)
This commit is contained in:
Fangming.Fang 2019-09-26 12:14:54 +10:00 committed by Shane Lontis
parent 42462e4016
commit 0dceb3f5d8
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
providers/default/ciphers/cipher_aes_ocb_hw.c
View File

@ -37,7 +37,7 @@ static int cipher_hw_aes_ocb_generic_initkey(PROV_CIPHER_CTX *vctx,
OCB_SET_KEY_FN(HWAES_set_encrypt_key, HWAES_set_decrypt_key, OCB_SET_KEY_FN(HWAES_set_encrypt_key, HWAES_set_decrypt_key,
HWAES_encrypt, HWAES_decrypt, HWAES_encrypt, HWAES_decrypt,
HWAES_ocb_encrypt, HWAES_ocb_decrypt); HWAES_ocb_encrypt, HWAES_ocb_decrypt);
} } else
# endif # endif
# ifdef VPAES_CAPABLE # ifdef VPAES_CAPABLE
if (VPAES_CAPABLE) { if (VPAES_CAPABLE) {