From: Harsh Jain <harsh@chelsio.com>
To: hariprasad@chelsio.com, netdev@vger.kernel.org,
herbert@gondor.apana.org.au, linux-crypto@vger.kernel.org
Cc: Harsh Jain <harsh@chelsio.com>
Subject: [PATCH v1 4/8] crypto:chcr- Use cipher instead of Block Cipher in gcm setkey
Date: Fri, 6 Jan 2017 14:01:35 +0530 [thread overview]
Message-ID: <58bcdff06b7746292cd28b4b7d1018059e97b9df.1483599449.git.harsh@chelsio.com> (raw)
In-Reply-To: <cover.1483599449.git.harsh@chelsio.com>
In-Reply-To: <cover.1483599449.git.harsh@chelsio.com>
1 Block of encrption can be done with aes-generic. no need of
cbc(aes). This patch replaces cbc(aes-generic) with aes-generic.
Signed-off-by: Harsh Jain <harsh@chelsio.com>
---
drivers/crypto/chelsio/chcr_algo.c | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/drivers/crypto/chelsio/chcr_algo.c b/drivers/crypto/chelsio/chcr_algo.c
index 6c2dea3..d335943 100644
--- a/drivers/crypto/chelsio/chcr_algo.c
+++ b/drivers/crypto/chelsio/chcr_algo.c
@@ -2189,8 +2189,7 @@ static int chcr_gcm_setkey(struct crypto_aead *aead, const u8 *key,
struct chcr_context *ctx = crypto_aead_ctx(aead);
struct chcr_aead_ctx *aeadctx = AEAD_CTX(ctx);
struct chcr_gcm_ctx *gctx = GCM_CTX(aeadctx);
- struct blkcipher_desc h_desc;
- struct scatterlist src[1];
+ struct crypto_cipher *cipher;
unsigned int ck_size;
int ret = 0, key_ctx_size = 0;
@@ -2223,27 +2222,26 @@ static int chcr_gcm_setkey(struct crypto_aead *aead, const u8 *key,
CHCR_KEYCTX_MAC_KEY_SIZE_128,
0, 0,
key_ctx_size >> 4);
- /* Calculate the H = CIPH(K, 0 repeated 16 times) using sync aes
- * blkcipher It will go on key context
+ /* Calculate the H = CIPH(K, 0 repeated 16 times).
+ * It will go in key context
*/
- h_desc.tfm = crypto_alloc_blkcipher("cbc(aes-generic)", 0, 0);
- if (IS_ERR(h_desc.tfm)) {
+ cipher = crypto_alloc_cipher("aes-generic", 0, 0);
+ if (IS_ERR(cipher)) {
aeadctx->enckey_len = 0;
ret = -ENOMEM;
goto out;
}
- h_desc.flags = 0;
- ret = crypto_blkcipher_setkey(h_desc.tfm, key, keylen);
+
+ ret = crypto_cipher_setkey(cipher, key, keylen);
if (ret) {
aeadctx->enckey_len = 0;
goto out1;
}
memset(gctx->ghash_h, 0, AEAD_H_SIZE);
- sg_init_one(&src[0], gctx->ghash_h, AEAD_H_SIZE);
- ret = crypto_blkcipher_encrypt(&h_desc, &src[0], &src[0], AEAD_H_SIZE);
+ crypto_cipher_encrypt_one(cipher, gctx->ghash_h, gctx->ghash_h);
out1:
- crypto_free_blkcipher(h_desc.tfm);
+ crypto_free_cipher(cipher);
out:
return ret;
}
--
1.8.2.3
next prev parent reply other threads:[~2017-01-06 8:31 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-06 8:31 [PATCH v1 0/8] crypto:chcr- Bug fixes Harsh Jain
2017-01-06 8:31 ` [PATCH v1 1/8] crypto:chcr-Change flow IDs Harsh Jain
2017-01-06 8:31 ` [PATCH v1 2/8] crypto:chcr- Fix panic on dma_unmap_sg Harsh Jain
2017-01-06 8:31 ` [PATCH v1 3/8] crypto:chcr- Fix key length for RFC4106 Harsh Jain
2017-01-12 16:09 ` Herbert Xu
2017-01-12 16:38 ` Harsh Jain
2017-01-12 16:42 ` Herbert Xu
2017-01-06 8:31 ` Harsh Jain [this message]
2017-01-06 8:31 ` [PATCH v1 5/8] crypto:chcr: Change cra_flags for cipher algos Harsh Jain
2017-01-06 8:31 ` [PATCH v1 6/8] crypto:chcr- Change algo priority Harsh Jain
2017-01-06 8:31 ` [PATCH v1 7/8] crypto:chcr- Check device is allocated before use Harsh Jain
2017-01-06 8:31 ` [PATCH v1 8/8] crypto:chcr- Fix wrong typecasting Harsh Jain
2017-01-12 16:14 ` [PATCH v1 0/8] crypto:chcr- Bug fixes Herbert Xu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=58bcdff06b7746292cd28b4b7d1018059e97b9df.1483599449.git.harsh@chelsio.com \
--to=harsh@chelsio.com \
--cc=hariprasad@chelsio.com \
--cc=herbert@gondor.apana.org.au \
--cc=linux-crypto@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).