Commit 9018154f authored by Sergio Paracuellos's avatar Sergio Paracuellos Committed by Greg Kroah-Hartman

staging: ks7010: avoid camel cases in MichaelGetMIC function

This commit avoid camel cases in MichaelGetMIC function and params
renaming it to michael_get_mic.
Signed-off-by: default avatarSergio Paracuellos <sergio.paracuellos@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ca0bda15
...@@ -91,34 +91,33 @@ static void michael_append(struct michael_mic_t *mic, uint8_t *src, int bytes) ...@@ -91,34 +91,33 @@ static void michael_append(struct michael_mic_t *mic, uint8_t *src, int bytes)
} }
} }
static static void michael_get_mic(struct michael_mic_t *mic, uint8_t *dst)
void MichaelGetMIC(struct michael_mic_t *Mic, uint8_t *dst)
{ {
u8 *data = Mic->m; u8 *data = mic->m;
switch (Mic->m_bytes) { switch (mic->m_bytes) {
case 0: case 0:
Mic->l ^= 0x5a; mic->l ^= 0x5a;
break; break;
case 1: case 1:
Mic->l ^= data[0] | 0x5a00; mic->l ^= data[0] | 0x5a00;
break; break;
case 2: case 2:
Mic->l ^= data[0] | (data[1] << 8) | 0x5a0000; mic->l ^= data[0] | (data[1] << 8) | 0x5a0000;
break; break;
case 3: case 3:
Mic->l ^= data[0] | (data[1] << 8) | (data[2] << 16) | mic->l ^= data[0] | (data[1] << 8) | (data[2] << 16) |
0x5a000000; 0x5a000000;
break; break;
} }
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.
michael_clear(Mic); michael_clear(mic);
} }
void michael_mic_function(struct michael_mic_t *mic, u8 *key, void michael_mic_function(struct michael_mic_t *mic, u8 *key,
...@@ -139,5 +138,5 @@ void michael_mic_function(struct michael_mic_t *mic, u8 *key, ...@@ -139,5 +138,5 @@ void michael_mic_function(struct michael_mic_t *mic, u8 *key,
michael_append(mic, (uint8_t *)data, 12); /* |DA|SA| */ michael_append(mic, (uint8_t *)data, 12); /* |DA|SA| */
michael_append(mic, pad_data, 4); /* |Priority|0|0|0| */ michael_append(mic, pad_data, 4); /* |Priority|0|0|0| */
michael_append(mic, (uint8_t *)(data + 12), len - 12); /* |Data| */ michael_append(mic, (uint8_t *)(data + 12), len - 12); /* |Data| */
MichaelGetMIC(mic, result); michael_get_mic(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