The branch master has been updated via 0dceb3f5d8f70a763a9c94203079e0f806bc73ba (commit) from 42462e4016d85b2abc5dcd5c872a71bb7521e079 (commit)
- Log ----------------------------------------------------------------- commit 0dceb3f5d8f70a763a9c94203079e0f806bc73ba Author: Fangming.Fang <fangming.f...@arm.com> Date: Thu Sep 26 12:14:54 2019 +1000 Missing else in cipher_hw_aes_ocb_generic_initkey 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.gas...@arm.com> Change-Id: I26001a3a922ff23f6090fdcefefaecf68e92e2a6 Reviewed-by: Paul Dale <paul.d...@oracle.com> Reviewed-by: Kurt Roeckx <k...@roeckx.be> Reviewed-by: Shane Lontis <shane.lon...@oracle.com> (Merged from https://github.com/openssl/openssl/pull/10012) ----------------------------------------------------------------------- Summary of changes: providers/default/ciphers/cipher_aes_ocb_hw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/providers/default/ciphers/cipher_aes_ocb_hw.c b/providers/default/ciphers/cipher_aes_ocb_hw.c index d7ef3bd282..49f387b5ba 100644 --- a/providers/default/ciphers/cipher_aes_ocb_hw.c +++ b/providers/default/ciphers/cipher_aes_ocb_hw.c @@ -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, HWAES_encrypt, HWAES_decrypt, HWAES_ocb_encrypt, HWAES_ocb_decrypt); - } + } else # endif # ifdef VPAES_CAPABLE if (VPAES_CAPABLE) {