FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-28 04:17:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

staging: ks7010: avoid camel cases in MichaelMICFunction

Browse Source 
This commit replace camel cases for name and params used in
MichaelMICFunction. This improves a bit readability.

Signed-off-by: Sergio Paracuellos <sergio.paracuellos@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Sergio Paracuellos 2018-03-28 17:24:17 +02:00 committed by Greg Kroah-Hartman
parent f47ecc0cf3
commit c9be56329a
3 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/staging/ks7010/ks_hostif.c
View File

@ -341,12 +341,12 @@ int hostif_data_indication_wpa(struct ks_wlan_private *priv,
memcpy(&recv_mic[0], (priv->rxp) + ((priv->rx_size) - 8), 8);
priv->rx_size = priv->rx_size - 8;
if (auth_type > 0 && auth_type < 4) { /* auth_type check */
MichaelMICFunction(&michael_mic,
(uint8_t *)key->rx_mic_key,
(uint8_t *)priv->rxp,
(int)priv->rx_size,
(uint8_t)0, /* priority */
(uint8_t *)michael_mic.result);
michael_mic_function(&michael_mic,
(uint8_t *)key->rx_mic_key,
(uint8_t *)priv->rxp,
(int)priv->rx_size,
(uint8_t)0, /* priority */
(uint8_t *)michael_mic.result);
}
if (memcmp(michael_mic.result, recv_mic, 8) != 0) {
now = jiffies;
@ -1172,12 +1172,12 @@ int hostif_data_request(struct ks_wlan_private *priv, struct sk_buff *skb)
pp->auth_type = cpu_to_le16((uint16_t)TYPE_AUTH);
} else {
if (priv->wpa.pairwise_suite == IW_AUTH_CIPHER_TKIP) {
MichaelMICFunction(&michael_mic,
(uint8_t *)priv->wpa.key[0].tx_mic_key,
(uint8_t *)&pp->data[0],
(int)skb_len,
(uint8_t)0, /* priority */
(uint8_t *)michael_mic.result);
michael_mic_function(&michael_mic,
(uint8_t *)priv->wpa.key[0].tx_mic_key,
(uint8_t *)&pp->data[0],
(int)skb_len,
(uint8_t)0, /* priority */
(uint8_t *)michael_mic.result);
memcpy(p, michael_mic.result, 8);
length += 8;
skb_len += 8;

15
drivers/staging/ks7010/michael_mic.c
View File

@ -123,9 +123,8 @@ void MichaelGetMIC(struct michael_mic_t *Mic, uint8_t *dst)
MichaelClear(Mic);
}
void MichaelMICFunction(struct michael_mic_t *Mic, u8 *Key,
u8 *Data, int Len, u8 priority,
u8 *Result)
void michael_mic_function(struct michael_mic_t *mic, u8 *key,
u8 *data, int len, u8 priority, u8 *result)
{
u8 pad_data[4] = { priority, 0, 0, 0 };
// Compute the MIC value
@ -138,9 +137,9 @@ void MichaelMICFunction(struct michael_mic_t *Mic, u8 *Key,
* |DA|SA|Priority|0 |Data|M0|M1|M2|M3|M4|M5|M6|M7|
* +--+--+--------+--+----+--+--+--+--+--+--+--+--+
*/
MichaelInitializeFunction(Mic, Key);
MichaelAppend(Mic, (uint8_t *)Data, 12); /* |DA|SA| */
MichaelAppend(Mic, pad_data, 4); /* |Priority|0|0|0| */
MichaelAppend(Mic, (uint8_t *)(Data + 12), Len - 12); /* |Data| */
MichaelGetMIC(Mic, Result);
MichaelInitializeFunction(mic, key);
MichaelAppend(mic, (uint8_t *)data, 12); /* |DA|SA| */
MichaelAppend(mic, pad_data, 4); /* |Priority|0|0|0| */
MichaelAppend(mic, (uint8_t *)(data + 12), len - 12); /* |Data| */
MichaelGetMIC(mic, result);
}

5
drivers/staging/ks7010/michael_mic.h
View File

@ -20,6 +20,5 @@ struct michael_mic_t {
u8 result[8];
};
void MichaelMICFunction(struct michael_mic_t *Mic, u8 *Key,
u8 *Data, int Len, u8 priority,
u8 *Result);
void michael_mic_function(struct michael_mic_t *mic, u8 *key,
u8 *data, int len, u8 priority, u8 *result);