Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Corentin LABBE and committed by
Herbert Xu
cb3f3817 8f6acb7f

+7 -5
+4 -3
drivers/crypto/omap-aes-gcm.c
··· 18 18 #include <linux/omap-dma.h> 19 19 #include <linux/interrupt.h> 20 20 #include <crypto/aes.h> 21 + #include <crypto/gcm.h> 21 22 #include <crypto/scatterwalk.h> 22 23 #include <crypto/skcipher.h> 23 24 #include <crypto/internal/aead.h> ··· 312 311 int err, assoclen; 313 312 314 313 memset(rctx->auth_tag, 0, sizeof(rctx->auth_tag)); 315 - memcpy(rctx->iv + 12, &counter, 4); 314 + memcpy(rctx->iv + GCM_AES_IV_SIZE, &counter, 4); 316 315 317 316 err = do_encrypt_iv(req, (u32 *)rctx->auth_tag, (u32 *)rctx->iv); 318 317 if (err) ··· 340 339 { 341 340 struct omap_aes_reqctx *rctx = aead_request_ctx(req); 342 341 343 - memcpy(rctx->iv, req->iv, 12); 342 + memcpy(rctx->iv, req->iv, GCM_AES_IV_SIZE); 344 343 return omap_aes_gcm_crypt(req, FLAGS_ENCRYPT | FLAGS_GCM); 345 344 } 346 345 ··· 348 347 { 349 348 struct omap_aes_reqctx *rctx = aead_request_ctx(req); 350 349 351 - memcpy(rctx->iv, req->iv, 12); 350 + memcpy(rctx->iv, req->iv, GCM_AES_IV_SIZE); 352 351 return omap_aes_gcm_crypt(req, FLAGS_GCM); 353 352 } 354 353
+3 -2
drivers/crypto/omap-aes.c
··· 35 35 #include <linux/interrupt.h> 36 36 #include <crypto/scatterwalk.h> 37 37 #include <crypto/aes.h> 38 + #include <crypto/gcm.h> 38 39 #include <crypto/engine.h> 39 40 #include <crypto/internal/skcipher.h> 40 41 #include <crypto/internal/aead.h> ··· 768 767 }, 769 768 .init = omap_aes_gcm_cra_init, 770 769 .exit = omap_aes_gcm_cra_exit, 771 - .ivsize = 12, 770 + .ivsize = GCM_AES_IV_SIZE, 772 771 .maxauthsize = AES_BLOCK_SIZE, 773 772 .setkey = omap_aes_gcm_setkey, 774 773 .encrypt = omap_aes_gcm_encrypt, ··· 789 788 .init = omap_aes_gcm_cra_init, 790 789 .exit = omap_aes_gcm_cra_exit, 791 790 .maxauthsize = AES_BLOCK_SIZE, 792 - .ivsize = 8, 791 + .ivsize = GCM_RFC4106_IV_SIZE, 793 792 .setkey = omap_aes_4106gcm_setkey, 794 793 .encrypt = omap_aes_4106gcm_encrypt, 795 794 .decrypt = omap_aes_4106gcm_decrypt,