Commit cf0bd0ae authored by Corentin LABBE's avatar Corentin LABBE Committed by Herbert Xu

crypto: ccp - Use GCM IV size constant

This patch replace GCM IV size value by their constant name.
Signed-off-by: default avatarCorentin Labbe <clabbe.montjoie@gmail.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 7545e166
...@@ -19,13 +19,12 @@ ...@@ -19,13 +19,12 @@
#include <crypto/algapi.h> #include <crypto/algapi.h>
#include <crypto/aes.h> #include <crypto/aes.h>
#include <crypto/ctr.h> #include <crypto/ctr.h>
#include <crypto/gcm.h>
#include <crypto/scatterwalk.h> #include <crypto/scatterwalk.h>
#include <linux/delay.h> #include <linux/delay.h>
#include "ccp-crypto.h" #include "ccp-crypto.h"
#define AES_GCM_IVSIZE 12
static int ccp_aes_gcm_complete(struct crypto_async_request *async_req, int ret) static int ccp_aes_gcm_complete(struct crypto_async_request *async_req, int ret)
{ {
return ret; return ret;
...@@ -95,9 +94,9 @@ static int ccp_aes_gcm_crypt(struct aead_request *req, bool encrypt) ...@@ -95,9 +94,9 @@ static int ccp_aes_gcm_crypt(struct aead_request *req, bool encrypt)
*/ */
/* Prepare the IV: 12 bytes + an integer (counter) */ /* 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++) 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; rctx->iv[AES_BLOCK_SIZE - 1] = 1;
/* Set up a scatterlist for the IV */ /* Set up a scatterlist for the IV */
...@@ -160,7 +159,7 @@ static struct aead_alg ccp_aes_gcm_defaults = { ...@@ -160,7 +159,7 @@ static struct aead_alg ccp_aes_gcm_defaults = {
.encrypt = ccp_aes_gcm_encrypt, .encrypt = ccp_aes_gcm_encrypt,
.decrypt = ccp_aes_gcm_decrypt, .decrypt = ccp_aes_gcm_decrypt,
.init = ccp_aes_gcm_cra_init, .init = ccp_aes_gcm_cra_init,
.ivsize = AES_GCM_IVSIZE, .ivsize = GCM_AES_IV_SIZE,
.maxauthsize = AES_BLOCK_SIZE, .maxauthsize = AES_BLOCK_SIZE,
.base = { .base = {
.cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER | .cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER |
......
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