From: Corentin Labbe <clabbe.montjoie@gmail.com>
To: herbert@gondor.apana.org.au, davem@davemloft.net,
tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com,
x86@kernel.org, horia.geanta@nxp.com, dan.douglass@nxp.com,
thomas.lendacky@amd.com, gary.hook@amd.com, harsh@chelsio.com,
matthias.bgg@gmail.com, leosilva@linux.vnet.ibm.com,
pfsmorigo@linux.vnet.ibm.com, benh@kernel.crashing.org,
paulus@samba.org, mpe@ellerman.id.au
Cc: linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-mediatek@lists.infradead.org,
linuxppc-dev@lists.ozlabs.org,
Corentin Labbe <clabbe.montjoie@gmail.com>
Subject: [PATCH 03/11] crypto: ccp - Use GCM IV size constant
Date: Tue, 22 Aug 2017 10:08:10 +0200 [thread overview]
Message-ID: <20170822080818.12486-4-clabbe.montjoie@gmail.com> (raw)
In-Reply-To: <20170822080818.12486-1-clabbe.montjoie@gmail.com>
This patch replace GCM IV size value by their constant name.
Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com>
---
drivers/crypto/ccp/ccp-crypto-aes-galois.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/crypto/ccp/ccp-crypto-aes-galois.c b/drivers/crypto/ccp/ccp-crypto-aes-galois.c
index 52313524a4dd..ff02b713c6f6 100644
--- a/drivers/crypto/ccp/ccp-crypto-aes-galois.c
+++ b/drivers/crypto/ccp/ccp-crypto-aes-galois.c
@@ -19,13 +19,12 @@
#include <crypto/algapi.h>
#include <crypto/aes.h>
#include <crypto/ctr.h>
+#include <crypto/gcm.h>
#include <crypto/scatterwalk.h>
#include <linux/delay.h>
#include "ccp-crypto.h"
-#define AES_GCM_IVSIZE 12
-
static int ccp_aes_gcm_complete(struct crypto_async_request *async_req, int ret)
{
return ret;
@@ -95,9 +94,9 @@ static int ccp_aes_gcm_crypt(struct aead_request *req, bool encrypt)
*/
/* Prepare the IV: 12 bytes + an integer (counter) */
- memcpy(rctx->iv, req->iv, AES_GCM_IVSIZE);
+ memcpy(rctx->iv, req->iv, GCM_AES_IV_SIZE);
for (i = 0; i < 3; i++)
- rctx->iv[i + AES_GCM_IVSIZE] = 0;
+ rctx->iv[i + GCM_AES_IV_SIZE] = 0;
rctx->iv[AES_BLOCK_SIZE - 1] = 1;
/* Set up a scatterlist for the IV */
@@ -160,7 +159,7 @@ static struct aead_alg ccp_aes_gcm_defaults = {
.encrypt = ccp_aes_gcm_encrypt,
.decrypt = ccp_aes_gcm_decrypt,
.init = ccp_aes_gcm_cra_init,
- .ivsize = AES_GCM_IVSIZE,
+ .ivsize = GCM_AES_IV_SIZE,
.maxauthsize = AES_BLOCK_SIZE,
.base = {
.cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER |
--
2.13.0
next prev parent reply other threads:[~2017-08-22 8:17 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-22 8:08 [PATCH 00/11] crypto: gcm - add " Corentin Labbe
2017-08-22 8:08 ` [PATCH 01/11] " Corentin Labbe
2017-08-22 8:08 ` [PATCH 02/11] crypto: caam - Use " Corentin Labbe
2017-08-22 8:08 ` Corentin Labbe [this message]
2017-08-22 8:08 ` [PATCH 04/11] crypto: nx " Corentin Labbe
2017-08-22 8:08 ` [PATCH 05/11] crypto: atmel " Corentin Labbe
2017-08-22 8:08 ` [PATCH 06/11] crypto: bcm " Corentin Labbe
2017-08-22 8:08 ` [PATCH 07/11] crypto: mediatek " Corentin Labbe
2017-08-22 8:08 ` [PATCH 08/11] crypto: chelsio " Corentin Labbe
2017-08-22 8:08 ` [PATCH 09/11] crypto: omap " Corentin Labbe
2017-08-22 8:08 ` [PATCH 10/11] crypto: gcm " Corentin Labbe
2017-08-22 8:08 ` [PATCH 11/11] crypto: aesni " Corentin Labbe
2017-09-22 10:14 ` [PATCH 00/11] crypto: gcm - add " 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=20170822080818.12486-4-clabbe.montjoie@gmail.com \
--to=clabbe.montjoie@gmail.com \
--cc=benh@kernel.crashing.org \
--cc=dan.douglass@nxp.com \
--cc=davem@davemloft.net \
--cc=gary.hook@amd.com \
--cc=harsh@chelsio.com \
--cc=herbert@gondor.apana.org.au \
--cc=horia.geanta@nxp.com \
--cc=hpa@zytor.com \
--cc=leosilva@linux.vnet.ibm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=matthias.bgg@gmail.com \
--cc=mingo@redhat.com \
--cc=mpe@ellerman.id.au \
--cc=paulus@samba.org \
--cc=pfsmorigo@linux.vnet.ibm.com \
--cc=tglx@linutronix.de \
--cc=thomas.lendacky@amd.com \
--cc=x86@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
all inboxes | Powered by JetHome®