Commit cab898fb authored by Wolfram Sang's avatar Wolfram Sang Committed by Greg Kroah-Hartman

staging: ks7010: indent michael_mic.c

Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1df65547
...@@ -34,11 +34,11 @@ ...@@ -34,11 +34,11 @@
A->nBytesInM = 0; A->nBytesInM = 0;
static static
void MichaelInitializeFunction( struct michel_mic_t *Mic, uint8_t *key ) void MichaelInitializeFunction(struct michel_mic_t *Mic, uint8_t * key)
{ {
// Set the key // Set the key
Mic->K0 = getUInt32( key , 0 ); Mic->K0 = getUInt32(key, 0);
Mic->K1 = getUInt32( key , 4 ); Mic->K1 = getUInt32(key, 4);
//clear(); //clear();
MichaelClear(Mic); MichaelClear(Mic);
...@@ -56,11 +56,10 @@ do{ \ ...@@ -56,11 +56,10 @@ do{ \
L += R; \ L += R; \
}while(0) }while(0)
static static
void MichaelAppend( struct michel_mic_t *Mic, uint8_t *src, int nBytes ) void MichaelAppend(struct michel_mic_t *Mic, uint8_t * src, int nBytes)
{ {
int addlen ; int addlen;
if (Mic->nBytesInM) { if (Mic->nBytesInM) {
addlen = 4 - Mic->nBytesInM; addlen = 4 - Mic->nBytesInM;
if (addlen > nBytes) if (addlen > nBytes)
...@@ -73,13 +72,13 @@ void MichaelAppend( struct michel_mic_t *Mic, uint8_t *src, int nBytes ) ...@@ -73,13 +72,13 @@ void MichaelAppend( struct michel_mic_t *Mic, uint8_t *src, int nBytes )
if (Mic->nBytesInM < 4) if (Mic->nBytesInM < 4)
return; return;
Mic->L ^= getUInt32(Mic->M,0); Mic->L ^= getUInt32(Mic->M, 0);
MichaelBlockFunction(Mic->L, Mic->R); MichaelBlockFunction(Mic->L, Mic->R);
Mic->nBytesInM = 0; Mic->nBytesInM = 0;
} }
while(nBytes >= 4){ while (nBytes >= 4) {
Mic->L ^= getUInt32(src,0); Mic->L ^= getUInt32(src, 0);
MichaelBlockFunction(Mic->L, Mic->R); MichaelBlockFunction(Mic->L, Mic->R);
src += 4; src += 4;
nBytes -= 4; nBytes -= 4;
...@@ -92,7 +91,7 @@ void MichaelAppend( struct michel_mic_t *Mic, uint8_t *src, int nBytes ) ...@@ -92,7 +91,7 @@ void MichaelAppend( struct michel_mic_t *Mic, uint8_t *src, int nBytes )
} }
static static
void MichaelGetMIC( struct michel_mic_t *Mic, uint8_t *dst ) void MichaelGetMIC(struct michel_mic_t *Mic, uint8_t * dst)
{ {
uint8_t *data = Mic->M; uint8_t *data = Mic->M;
switch (Mic->nBytesInM) { switch (Mic->nBytesInM) {
...@@ -113,18 +112,18 @@ void MichaelGetMIC( struct michel_mic_t *Mic, uint8_t *dst ) ...@@ -113,18 +112,18 @@ void MichaelGetMIC( struct michel_mic_t *Mic, uint8_t *dst )
MichaelBlockFunction(Mic->L, Mic->R); MichaelBlockFunction(Mic->L, Mic->R);
MichaelBlockFunction(Mic->L, Mic->R); MichaelBlockFunction(Mic->L, Mic->R);
// The appendByte function has already computed the result. // The appendByte function has already computed the result.
putUInt32( dst, 0, Mic->L ); putUInt32(dst, 0, Mic->L);
putUInt32( dst, 4, Mic->R ); putUInt32(dst, 4, Mic->R);
// Reset to the empty message. // Reset to the empty message.
MichaelClear(Mic); MichaelClear(Mic);
} }
void MichaelMICFunction( struct michel_mic_t *Mic, uint8_t *Key, void MichaelMICFunction(struct michel_mic_t *Mic, uint8_t * Key,
uint8_t *Data, int Len, uint8_t priority, uint8_t * Data, int Len, uint8_t priority,
uint8_t *Result ) uint8_t * Result)
{ {
uint8_t pad_data[4] = {priority,0,0,0}; uint8_t pad_data[4] = { priority, 0, 0, 0 };
// Compute the MIC value // Compute the MIC value
/* /*
* IEEE802.11i page 47 * IEEE802.11i page 47
...@@ -135,9 +134,9 @@ void MichaelMICFunction( struct michel_mic_t *Mic, uint8_t *Key, ...@@ -135,9 +134,9 @@ void MichaelMICFunction( struct michel_mic_t *Mic, uint8_t *Key,
* |DA|SA|Priority|0 |Data|M0|M1|M2|M3|M4|M5|M6|M7| * |DA|SA|Priority|0 |Data|M0|M1|M2|M3|M4|M5|M6|M7|
* +--+--+--------+--+----+--+--+--+--+--+--+--+--+ * +--+--+--------+--+----+--+--+--+--+--+--+--+--+
*/ */
MichaelInitializeFunction( Mic, Key ) ; MichaelInitializeFunction(Mic, Key);
MichaelAppend( Mic, (uint8_t*)Data, 12 ); /* |DA|SA| */ MichaelAppend(Mic, (uint8_t *) Data, 12); /* |DA|SA| */
MichaelAppend( Mic, pad_data, 4 ); /* |Priority|0|0|0| */ MichaelAppend(Mic, pad_data, 4); /* |Priority|0|0|0| */
MichaelAppend( Mic, (uint8_t*)(Data+12), Len -12 ); /* |Data| */ MichaelAppend(Mic, (uint8_t *) (Data + 12), Len - 12); /* |Data| */
MichaelGetMIC( Mic, Result ) ; MichaelGetMIC(Mic, Result);
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment