Commit a3d7c50c authored by Vic Wu's avatar Vic Wu Committed by Herbert Xu

crypto: mediatek - fix incorrect crypto key setting

Record crypto key to context during setkey and set the key to
transform state buffer in encrypt/decrypt process.
Signed-off-by: default avatarVic Wu <vic.wu@mediatek.com>
Tested-by: default avatarJohn Crispin <john@phrozen.og>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 069ec891
...@@ -105,6 +105,7 @@ struct mtk_aes_reqctx { ...@@ -105,6 +105,7 @@ struct mtk_aes_reqctx {
struct mtk_aes_base_ctx { struct mtk_aes_base_ctx {
struct mtk_cryp *cryp; struct mtk_cryp *cryp;
u32 keylen; u32 keylen;
__le32 key[12];
__le32 keymode; __le32 keymode;
mtk_aes_fn start; mtk_aes_fn start;
...@@ -534,6 +535,8 @@ static int mtk_aes_handle_queue(struct mtk_cryp *cryp, u8 id, ...@@ -534,6 +535,8 @@ static int mtk_aes_handle_queue(struct mtk_cryp *cryp, u8 id,
backlog->complete(backlog, -EINPROGRESS); backlog->complete(backlog, -EINPROGRESS);
ctx = crypto_tfm_ctx(areq->tfm); ctx = crypto_tfm_ctx(areq->tfm);
/* Write key into state buffer */
memcpy(ctx->info.state, ctx->key, sizeof(ctx->key));
aes->areq = areq; aes->areq = areq;
aes->ctx = ctx; aes->ctx = ctx;
...@@ -653,7 +656,7 @@ static int mtk_aes_setkey(struct crypto_ablkcipher *tfm, ...@@ -653,7 +656,7 @@ static int mtk_aes_setkey(struct crypto_ablkcipher *tfm,
} }
ctx->keylen = SIZE_IN_WORDS(keylen); ctx->keylen = SIZE_IN_WORDS(keylen);
mtk_aes_write_state_le(ctx->info.state, (const u32 *)key, keylen); mtk_aes_write_state_le(ctx->key, (const u32 *)key, keylen);
return 0; return 0;
} }
...@@ -1070,10 +1073,8 @@ static int mtk_aes_gcm_setkey(struct crypto_aead *aead, const u8 *key, ...@@ -1070,10 +1073,8 @@ static int mtk_aes_gcm_setkey(struct crypto_aead *aead, const u8 *key,
if (err) if (err)
goto out; goto out;
/* Write key into state buffer */ mtk_aes_write_state_le(ctx->key, (const u32 *)key, keylen);
mtk_aes_write_state_le(ctx->info.state, (const u32 *)key, keylen); mtk_aes_write_state_be(ctx->key + ctx->keylen, data->hash,
/* Write key(H) into state buffer */
mtk_aes_write_state_be(ctx->info.state + ctx->keylen, data->hash,
AES_BLOCK_SIZE); AES_BLOCK_SIZE);
out: out:
kzfree(data); kzfree(data);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment