crypto: omap - Use GCM IV size constant

This patch replace GCM IV size value by their constant name.

Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/omap-aes-gcm.c b/drivers/crypto/omap-aes-gcm.c
index 7d4f8a4be6d8febbe0336cf8d677a4a196b63fdf..9b8f1c752168adf29e9f3e7515e08b708d4574ea 100644 (file)
--- a/drivers/crypto/omap-aes-gcm.c
+++ b/drivers/crypto/omap-aes-gcm.c
@@ -18,6 +18,7 @@
 #include <linux/omap-dma.h>
 #include <linux/interrupt.h>
 #include <crypto/aes.h>
+#include <crypto/gcm.h>
 #include <crypto/scatterwalk.h>
 #include <crypto/skcipher.h>
 #include <crypto/internal/aead.h>
@@ -311,7 +312,7 @@ static int omap_aes_gcm_crypt(struct aead_request *req, unsigned long mode)
        int err, assoclen;
 
        memset(rctx->auth_tag, 0, sizeof(rctx->auth_tag));
-       memcpy(rctx->iv + 12, &counter, 4);
+       memcpy(rctx->iv + GCM_AES_IV_SIZE, &counter, 4);
 
        err = do_encrypt_iv(req, (u32 *)rctx->auth_tag, (u32 *)rctx->iv);
        if (err)
@@ -339,7 +340,7 @@ int omap_aes_gcm_encrypt(struct aead_request *req)
 {
        struct omap_aes_reqctx *rctx = aead_request_ctx(req);
 
-       memcpy(rctx->iv, req->iv, 12);
+       memcpy(rctx->iv, req->iv, GCM_AES_IV_SIZE);
        return omap_aes_gcm_crypt(req, FLAGS_ENCRYPT | FLAGS_GCM);
 }
 
@@ -347,7 +348,7 @@ int omap_aes_gcm_decrypt(struct aead_request *req)
 {
        struct omap_aes_reqctx *rctx = aead_request_ctx(req);
 
-       memcpy(rctx->iv, req->iv, 12);
+       memcpy(rctx->iv, req->iv, GCM_AES_IV_SIZE);
        return omap_aes_gcm_crypt(req, FLAGS_GCM);
 }
 

diff --git a/drivers/crypto/omap-aes.c b/drivers/crypto/omap-aes.c
index c376a3ee7c2c3d370b71ae8cdd359da742425975..1f3686a1ebfa4266799126273c2e96203c5a98b1 100644 (file)
--- a/drivers/crypto/omap-aes.c
+++ b/drivers/crypto/omap-aes.c
@@ -35,6 +35,7 @@
 #include <linux/interrupt.h>
 #include <crypto/scatterwalk.h>
 #include <crypto/aes.h>
+#include <crypto/gcm.h>
 #include <crypto/engine.h>
 #include <crypto/internal/skcipher.h>
 #include <crypto/internal/aead.h>
@@ -767,7 +768,7 @@ static struct aead_alg algs_aead_gcm[] = {
        },
        .init           = omap_aes_gcm_cra_init,
        .exit           = omap_aes_gcm_cra_exit,
-       .ivsize         = 12,
+       .ivsize         = GCM_AES_IV_SIZE,
        .maxauthsize    = AES_BLOCK_SIZE,
        .setkey         = omap_aes_gcm_setkey,
        .encrypt        = omap_aes_gcm_encrypt,
@@ -788,7 +789,7 @@ static struct aead_alg algs_aead_gcm[] = {
        .init           = omap_aes_gcm_cra_init,
        .exit           = omap_aes_gcm_cra_exit,
        .maxauthsize    = AES_BLOCK_SIZE,
-       .ivsize         = 8,
+       .ivsize         = GCM_RFC4106_IV_SIZE,
        .setkey         = omap_aes_4106gcm_setkey,
        .encrypt        = omap_aes_4106gcm_encrypt,
        .decrypt        = omap_aes_4106gcm_decrypt,