|
@@ -658,8 +658,8 @@ static void lim_generate_pmkid(struct pe_session *pe_session)
|
|
|
*/
|
|
|
static void lim_generate_pmk(struct pe_session *pe_session)
|
|
|
{
|
|
|
- uint8_t nounce[2 * SIR_FILS_NONCE_LENGTH] = {0};
|
|
|
- uint8_t nounce_len = 2 * SIR_FILS_NONCE_LENGTH;
|
|
|
+ uint8_t nonce[2 * SIR_FILS_NONCE_LENGTH] = {0};
|
|
|
+ uint8_t nonce_len = 2 * SIR_FILS_NONCE_LENGTH;
|
|
|
uint8_t *addr[1];
|
|
|
uint32_t len[1];
|
|
|
struct pe_fils_session *fils_info = pe_session->fils_info;
|
|
@@ -667,11 +667,11 @@ static void lim_generate_pmk(struct pe_session *pe_session)
|
|
|
if (!fils_info)
|
|
|
return;
|
|
|
|
|
|
- /* Snounce */
|
|
|
- qdf_mem_copy(nounce, pe_session->fils_info->fils_nonce,
|
|
|
+ /* Snonce */
|
|
|
+ qdf_mem_copy(nonce, pe_session->fils_info->fils_nonce,
|
|
|
SIR_FILS_NONCE_LENGTH);
|
|
|
- /* anounce */
|
|
|
- qdf_mem_copy(nounce + SIR_FILS_NONCE_LENGTH,
|
|
|
+ /* anonce */
|
|
|
+ qdf_mem_copy(nonce + SIR_FILS_NONCE_LENGTH,
|
|
|
pe_session->fils_info->auth_info.fils_nonce,
|
|
|
SIR_FILS_NONCE_LENGTH);
|
|
|
fils_info->fils_pmk_len = lim_get_pmk_length(fils_info->akm);
|
|
@@ -685,9 +685,9 @@ static void lim_generate_pmk(struct pe_session *pe_session)
|
|
|
|
|
|
addr[0] = fils_info->fils_rmsk;
|
|
|
len[0] = fils_info->fils_rmsk_len;
|
|
|
- lim_fils_data_dump("Nonce", nounce, nounce_len);
|
|
|
- if (qdf_get_hmac_hash(lim_get_hmac_crypto_type(fils_info->akm), nounce,
|
|
|
- nounce_len, 1, &addr[0], &len[0],
|
|
|
+ lim_fils_data_dump("Nonce", nonce, nonce_len);
|
|
|
+ if (qdf_get_hmac_hash(lim_get_hmac_crypto_type(fils_info->akm), nonce,
|
|
|
+ nonce_len, 1, &addr[0], &len[0],
|
|
|
fils_info->fils_pmk) < 0)
|
|
|
pe_err("failed to generate PMK");
|
|
|
}
|
|
@@ -1047,11 +1047,11 @@ void lim_add_fils_data_to_auth_frame(struct pe_session *session,
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- /* ***Nounce*** */
|
|
|
+ /* ***Nonce*** */
|
|
|
/* Add element id */
|
|
|
*body = SIR_MAX_ELEMENT_ID;
|
|
|
body++;
|
|
|
- /* Add nounce length + 1 for ext element id */
|
|
|
+ /* Add nonce length + 1 for ext element id */
|
|
|
*body = SIR_FILS_NONCE_LENGTH + 1;
|
|
|
body++;
|
|
|
/* Add ext element */
|
|
@@ -1069,7 +1069,7 @@ void lim_add_fils_data_to_auth_frame(struct pe_session *session,
|
|
|
/* Add element id */
|
|
|
*body = SIR_MAX_ELEMENT_ID;
|
|
|
body++;
|
|
|
- /* Add nounce length + 1 for ext element id */
|
|
|
+ /* Add nonce length + 1 for ext element id */
|
|
|
*body = SIR_FILS_SESSION_LENGTH + 1;
|
|
|
body++;
|
|
|
/* Add ext element */
|
|
@@ -1618,7 +1618,7 @@ QDF_STATUS lim_create_fils_auth_data(struct mac_context *mac_ctx,
|
|
|
|
|
|
if (auth_frame->authAlgoNumber == SIR_FILS_SK_WITHOUT_PFS) {
|
|
|
frm_len += session->fils_info->rsn_ie_len;
|
|
|
- /* FILS nounce */
|
|
|
+ /* FILS nonce */
|
|
|
frm_len += SIR_FILS_NONCE_LENGTH + EXTENDED_IE_HEADER_LEN;
|
|
|
/* FILS Session */
|
|
|
frm_len += SIR_FILS_SESSION_LENGTH + EXTENDED_IE_HEADER_LEN;
|