crypto: bcm - 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/bcm/cipher.c b/drivers/crypto/bcm/cipher.c
index 8685c7e4debdc14855763f872b788a22c68a8168..537a67483aa31580d37e822201f09a304f004673 100644 (file)
--- a/drivers/crypto/bcm/cipher.c
+++ b/drivers/crypto/bcm/cipher.c
@@ -1367,11 +1367,11 @@ static int handle_aead_req(struct iproc_reqctx_s *rctx)
                 * expects AAD to include just SPI and seqno. So
                 * subtract off the IV len.
                 */
-               aead_parms.assoc_size -= GCM_ESP_IV_SIZE;
+               aead_parms.assoc_size -= GCM_RFC4106_IV_SIZE;
 
                if (rctx->is_encrypt) {
                        aead_parms.return_iv = true;
-                       aead_parms.ret_iv_len = GCM_ESP_IV_SIZE;
+                       aead_parms.ret_iv_len = GCM_RFC4106_IV_SIZE;
                        aead_parms.ret_iv_off = GCM_ESP_SALT_SIZE;
                }
        } else {
@@ -3255,7 +3255,7 @@ static struct iproc_alg_s driver_algs[] = {
                        .cra_flags = CRYPTO_ALG_NEED_FALLBACK
                 },
                 .setkey = aead_gcm_esp_setkey,
-                .ivsize = GCM_ESP_IV_SIZE,
+                .ivsize = GCM_RFC4106_IV_SIZE,
                 .maxauthsize = AES_BLOCK_SIZE,
         },
         .cipher_info = {
@@ -3301,7 +3301,7 @@ static struct iproc_alg_s driver_algs[] = {
                        .cra_flags = CRYPTO_ALG_NEED_FALLBACK
                 },
                 .setkey = rfc4543_gcm_esp_setkey,
-                .ivsize = GCM_ESP_IV_SIZE,
+                .ivsize = GCM_RFC4106_IV_SIZE,
                 .maxauthsize = AES_BLOCK_SIZE,
         },
         .cipher_info = {

diff --git a/drivers/crypto/bcm/cipher.h b/drivers/crypto/bcm/cipher.h
index 57a55eb2a2552cbd96d30a3ff50a85c6a1f445d5..763c425c41cae7c487d7312ff0b0e9d42670cbb8 100644 (file)
--- a/drivers/crypto/bcm/cipher.h
+++ b/drivers/crypto/bcm/cipher.h
@@ -23,6 +23,7 @@
 #include <crypto/aes.h>
 #include <crypto/internal/hash.h>
 #include <crypto/aead.h>
+#include <crypto/gcm.h>
 #include <crypto/sha.h>
 #include <crypto/sha3.h>
 
@@ -39,8 +40,6 @@
 #define ARC4_STATE_SIZE     4
 
 #define CCM_AES_IV_SIZE    16
-#define GCM_AES_IV_SIZE    12
-#define GCM_ESP_IV_SIZE     8
 #define CCM_ESP_IV_SIZE     8
 #define RFC4543_ICV_SIZE   16