crypto: ccp - Use GCM IV size constant (cf0bd0ae) · Commits · 戴 / test

drivers/crypto/ccp/ccp-crypto-aes-galois.c

+4 −5

Original line number	Diff line number	Diff line
		@@ -19,13 +19,12 @@
		#include <crypto/algapi.h>
		#include <crypto/aes.h>
		#include <crypto/ctr.h>
		#include <crypto/gcm.h>
		#include <crypto/scatterwalk.h>
		#include <linux/delay.h>

		#include "ccp-crypto.h"

		#define AES_GCM_IVSIZE 12

		static int ccp_aes_gcm_complete(struct crypto_async_request *async_req, int ret)
		{
		return ret;
		@@ -95,9 +94,9 @@ static int ccp_aes_gcm_crypt(struct aead_request *req, bool encrypt)
		*/

		/* 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++)
		rctx->iv[i + AES_GCM_IVSIZE] = 0;
		rctx->iv[i + GCM_AES_IV_SIZE] = 0;
		rctx->iv[AES_BLOCK_SIZE - 1] = 1;

		/* Set up a scatterlist for the IV */
		@@ -160,7 +159,7 @@ static struct aead_alg ccp_aes_gcm_defaults = {
		.encrypt = ccp_aes_gcm_encrypt,
		.decrypt = ccp_aes_gcm_decrypt,
		.init = ccp_aes_gcm_cra_init,
		.ivsize = AES_GCM_IVSIZE,
		.ivsize = GCM_AES_IV_SIZE,
		.maxauthsize = AES_BLOCK_SIZE,
		.base = {
		.cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER \|