Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e82efb2c authored by Jelena Bjelja's avatar Jelena Bjelja Committed by Peter P Waskiewicz Jr
Browse files

staging: vt6655: Remove unnecessary braces in aes_ccmp.c 



This patch fixes the checkpatch warnings:
	WARNING: braces {} are not necessary for single statement blocks

Signed-off-by: default avatarJelena Bjelja <jelena.bjelja.ing@gmail.com>
Acked-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: default avatarPeter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
parent cdf11154

drivers/staging/vt6655/aes_ccmp.c

+10 −20
Original line number Original line Diff line number Diff line
@@ -152,10 +152,9 @@ static void SubBytes(unsigned char *in, unsigned char *out) 
{

{

	int i;

	int i;





	for (i = 0; i < 16; i++) {

	for (i = 0; i < 16; i++)

		out[i] = sbox_table[in[i]];

		out[i] = sbox_table[in[i]];

}

}

}





static void ShiftRows(unsigned char *in, unsigned char *out)

static void ShiftRows(unsigned char *in, unsigned char *out)

{

{
@@ -309,13 +308,11 @@ bool AESbGenCCMP(unsigned char *pbyRxKey, unsigned char *pbyFrame, unsigned shor 




	/* CCMP */

	/* CCMP */

	AESv128(pbyRxKey, MIC_IV, abyMIC);

	AESv128(pbyRxKey, MIC_IV, abyMIC);

	for (kk = 0; kk < 16; kk++) {

	for (kk = 0; kk < 16; kk++)

		abyTmp[kk] = MIC_HDR1[kk] ^ abyMIC[kk];

		abyTmp[kk] = MIC_HDR1[kk] ^ abyMIC[kk];

	}

	AESv128(pbyRxKey, abyTmp, abyMIC);

	AESv128(pbyRxKey, abyTmp, abyMIC);

	for (kk = 0; kk < 16; kk++) {

	for (kk = 0; kk < 16; kk++)

		abyTmp[kk] = MIC_HDR2[kk] ^ abyMIC[kk];

		abyTmp[kk] = MIC_HDR2[kk] ^ abyMIC[kk];

	}

	AESv128(pbyRxKey, abyTmp, abyMIC);

	AESv128(pbyRxKey, abyTmp, abyMIC);





	wCnt = 1;

	wCnt = 1;
@@ -328,12 +325,10 @@ bool AESbGenCCMP(unsigned char *pbyRxKey, unsigned char *pbyFrame, unsigned shor 




		AESv128(pbyRxKey, abyCTRPLD, abyTmp);

		AESv128(pbyRxKey, abyCTRPLD, abyTmp);





		for (kk = 0; kk < 16; kk++) {

		for (kk = 0; kk < 16; kk++)

			abyPlainText[kk] = abyTmp[kk] ^ pbyPayload[kk];

			abyPlainText[kk] = abyTmp[kk] ^ pbyPayload[kk];

		}

		for (kk = 0; kk < 16; kk++)

		for (kk = 0; kk < 16; kk++) {

			abyTmp[kk] = abyMIC[kk] ^ abyPlainText[kk];

			abyTmp[kk] = abyMIC[kk] ^ abyPlainText[kk];

		}

		AESv128(pbyRxKey, abyTmp, abyMIC);

		AESv128(pbyRxKey, abyTmp, abyMIC);





		memcpy(pbyPayload, abyPlainText, 16);

		memcpy(pbyPayload, abyPlainText, 16);
@@ -343,27 +338,23 @@ bool AESbGenCCMP(unsigned char *pbyRxKey, unsigned char *pbyFrame, unsigned shor 




	/* last payload */

	/* last payload */

	memcpy(&(abyLastCipher[0]), pbyPayload, jj);

	memcpy(&(abyLastCipher[0]), pbyPayload, jj);

	for (ii = jj; ii < 16; ii++) {

	for (ii = jj; ii < 16; ii++)

		abyLastCipher[ii] = 0x00;

		abyLastCipher[ii] = 0x00;

	}





	abyCTRPLD[14] = (unsigned char)(wCnt >> 8);

	abyCTRPLD[14] = (unsigned char)(wCnt >> 8);

	abyCTRPLD[15] = (unsigned char)(wCnt & 0xff);

	abyCTRPLD[15] = (unsigned char)(wCnt & 0xff);





	AESv128(pbyRxKey, abyCTRPLD, abyTmp);

	AESv128(pbyRxKey, abyCTRPLD, abyTmp);

	for (kk = 0; kk < 16; kk++) {

	for (kk = 0; kk < 16; kk++)

		abyPlainText[kk] = abyTmp[kk] ^ abyLastCipher[kk];

		abyPlainText[kk] = abyTmp[kk] ^ abyLastCipher[kk];

	}

	memcpy(pbyPayload, abyPlainText, jj);

	memcpy(pbyPayload, abyPlainText, jj);

	pbyPayload += jj;

	pbyPayload += jj;





	/* for MIC calculation */

	/* for MIC calculation */

	for (ii = jj; ii < 16; ii++) {

	for (ii = jj; ii < 16; ii++)

		abyPlainText[ii] = 0x00;

		abyPlainText[ii] = 0x00;

	}

	for (kk = 0; kk < 16; kk++)

	for (kk = 0; kk < 16; kk++) {

		abyTmp[kk] = abyMIC[kk] ^ abyPlainText[kk];

		abyTmp[kk] = abyMIC[kk] ^ abyPlainText[kk];

	}

	AESv128(pbyRxKey, abyTmp, abyMIC);

	AESv128(pbyRxKey, abyTmp, abyMIC);





	/* =>above is the calculate MIC */

	/* =>above is the calculate MIC */
@@ -373,9 +364,8 @@ bool AESbGenCCMP(unsigned char *pbyRxKey, unsigned char *pbyFrame, unsigned shor 
	abyCTRPLD[14] = (unsigned char)(wCnt >> 8);

	abyCTRPLD[14] = (unsigned char)(wCnt >> 8);

	abyCTRPLD[15] = (unsigned char)(wCnt & 0xff);

	abyCTRPLD[15] = (unsigned char)(wCnt & 0xff);

	AESv128(pbyRxKey, abyCTRPLD, abyTmp);

	AESv128(pbyRxKey, abyCTRPLD, abyTmp);

	for (kk = 0; kk < 8; kk++) {

	for (kk = 0; kk < 8; kk++)

		abyTmp[kk] = abyTmp[kk] ^ pbyPayload[kk];

		abyTmp[kk] = abyTmp[kk] ^ pbyPayload[kk];

	}

	/* =>above is the dec-MIC from packet */

	/* =>above is the dec-MIC from packet */

	/* -------------------------------------------- */

	/* -------------------------------------------- */