mirror of
https://github.com/torvalds/linux
synced 2024-10-03 09:48:02 +00:00
crypto: qce - Improve the conditions for requesting AES fallback cipher
The following are the conditions for requesting AES fallback cipher. - AES-192 - AES-XTS request with len <= 512 byte (Allow messages of length less than 512 bytes for all other AES encryption algorithms other than AES XTS) - AES-XTS request with len > QCE_SECTOR_SIZE and is not a multiple of it Signed-off-by: Thara Gopinath <thara.gopinath@linaro.org> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
parent
02d0dae3ce
commit
25b71d61d6
|
@ -274,14 +274,19 @@ static int qce_skcipher_crypt(struct skcipher_request *req, int encrypt)
|
||||||
if (!IS_ALIGNED(req->cryptlen, blocksize))
|
if (!IS_ALIGNED(req->cryptlen, blocksize))
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
/* qce is hanging when AES-XTS request len > QCE_SECTOR_SIZE and
|
/*
|
||||||
* is not a multiple of it; pass such requests to the fallback
|
* Conditions for requesting a fallback cipher
|
||||||
|
* AES-192 (not supported by crypto engine (CE))
|
||||||
|
* AES-XTS request with len <= 512 byte (not recommended to use CE)
|
||||||
|
* AES-XTS request with len > QCE_SECTOR_SIZE and
|
||||||
|
* is not a multiple of it.(Revisit this condition to check if it is
|
||||||
|
* needed in all versions of CE)
|
||||||
*/
|
*/
|
||||||
if (IS_AES(rctx->flags) &&
|
if (IS_AES(rctx->flags) &&
|
||||||
(((keylen != AES_KEYSIZE_128 && keylen != AES_KEYSIZE_256) ||
|
((keylen != AES_KEYSIZE_128 && keylen != AES_KEYSIZE_256) ||
|
||||||
req->cryptlen <= aes_sw_max_len) ||
|
(IS_XTS(rctx->flags) && ((req->cryptlen <= aes_sw_max_len) ||
|
||||||
(IS_XTS(rctx->flags) && req->cryptlen > QCE_SECTOR_SIZE &&
|
(req->cryptlen > QCE_SECTOR_SIZE &&
|
||||||
req->cryptlen % QCE_SECTOR_SIZE))) {
|
req->cryptlen % QCE_SECTOR_SIZE))))) {
|
||||||
skcipher_request_set_tfm(&rctx->fallback_req, ctx->fallback);
|
skcipher_request_set_tfm(&rctx->fallback_req, ctx->fallback);
|
||||||
skcipher_request_set_callback(&rctx->fallback_req,
|
skcipher_request_set_callback(&rctx->fallback_req,
|
||||||
req->base.flags,
|
req->base.flags,
|
||||||
|
|
Loading…
Reference in a new issue