OSDN Git Service

crypto: nx - Use GCM IV size constant
authorCorentin LABBE <clabbe.montjoie@gmail.com>
Tue, 22 Aug 2017 08:08:11 +0000 (10:08 +0200)
committerHerbert Xu <herbert@gondor.apana.org.au>
Fri, 22 Sep 2017 09:43:10 +0000 (17:43 +0800)
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>
drivers/crypto/nx/nx-aes-gcm.c

index abd465f..a810596 100644 (file)
@@ -22,6 +22,7 @@
 #include <crypto/internal/aead.h>
 #include <crypto/aes.h>
 #include <crypto/algapi.h>
+#include <crypto/gcm.h>
 #include <crypto/scatterwalk.h>
 #include <linux/module.h>
 #include <linux/types.h>
@@ -433,7 +434,7 @@ static int gcm_aes_nx_encrypt(struct aead_request *req)
        struct nx_gcm_rctx *rctx = aead_request_ctx(req);
        char *iv = rctx->iv;
 
-       memcpy(iv, req->iv, 12);
+       memcpy(iv, req->iv, GCM_AES_IV_SIZE);
 
        return gcm_aes_nx_crypt(req, 1, req->assoclen);
 }
@@ -443,7 +444,7 @@ static int gcm_aes_nx_decrypt(struct aead_request *req)
        struct nx_gcm_rctx *rctx = aead_request_ctx(req);
        char *iv = rctx->iv;
 
-       memcpy(iv, req->iv, 12);
+       memcpy(iv, req->iv, GCM_AES_IV_SIZE);
 
        return gcm_aes_nx_crypt(req, 0, req->assoclen);
 }
@@ -498,7 +499,7 @@ struct aead_alg nx_gcm_aes_alg = {
        },
        .init        = nx_crypto_ctx_aes_gcm_init,
        .exit        = nx_crypto_ctx_aead_exit,
-       .ivsize      = 12,
+       .ivsize      = GCM_AES_IV_SIZE,
        .maxauthsize = AES_BLOCK_SIZE,
        .setkey      = gcm_aes_nx_set_key,
        .encrypt     = gcm_aes_nx_encrypt,
@@ -516,7 +517,7 @@ struct aead_alg nx_gcm4106_aes_alg = {
        },
        .init        = nx_crypto_ctx_aes_gcm_init,
        .exit        = nx_crypto_ctx_aead_exit,
-       .ivsize      = 8,
+       .ivsize      = GCM_RFC4106_IV_SIZE,
        .maxauthsize = AES_BLOCK_SIZE,
        .setkey      = gcm4106_aes_nx_set_key,
        .setauthsize = gcm4106_aes_nx_setauthsize,