提交 0f65bec1 编写于 作者: B Bartlomiej Zolnierkiewicz 提交者: Greg Kroah-Hartman

Staging: rt28x0: run sta/*.c files through Lindent

Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
上级 96b3c83d
此差异已折叠。
此差异已折叠。
...@@ -47,18 +47,21 @@ ...@@ -47,18 +47,21 @@
========================================================================== ==========================================================================
*/ */
VOID AuthRspStateMachineInit( VOID AuthRspStateMachineInit(IN PRTMP_ADAPTER pAd,
IN PRTMP_ADAPTER pAd, IN PSTATE_MACHINE Sm,
IN PSTATE_MACHINE Sm, IN STATE_MACHINE_FUNC Trans[])
IN STATE_MACHINE_FUNC Trans[])
{ {
StateMachineInit(Sm, Trans, MAX_AUTH_RSP_STATE, MAX_AUTH_RSP_MSG, (STATE_MACHINE_FUNC)Drop, AUTH_RSP_IDLE, AUTH_RSP_MACHINE_BASE); StateMachineInit(Sm, Trans, MAX_AUTH_RSP_STATE, MAX_AUTH_RSP_MSG,
(STATE_MACHINE_FUNC) Drop, AUTH_RSP_IDLE,
AUTH_RSP_MACHINE_BASE);
// column 1 // column 1
StateMachineSetAction(Sm, AUTH_RSP_IDLE, MT2_PEER_DEAUTH, (STATE_MACHINE_FUNC)PeerDeauthAction); StateMachineSetAction(Sm, AUTH_RSP_IDLE, MT2_PEER_DEAUTH,
(STATE_MACHINE_FUNC) PeerDeauthAction);
// column 2 // column 2
StateMachineSetAction(Sm, AUTH_RSP_WAIT_CHAL, MT2_PEER_DEAUTH, (STATE_MACHINE_FUNC)PeerDeauthAction); StateMachineSetAction(Sm, AUTH_RSP_WAIT_CHAL, MT2_PEER_DEAUTH,
(STATE_MACHINE_FUNC) PeerDeauthAction);
} }
...@@ -70,39 +73,32 @@ VOID AuthRspStateMachineInit( ...@@ -70,39 +73,32 @@ VOID AuthRspStateMachineInit(
========================================================================== ==========================================================================
*/ */
VOID PeerAuthSimpleRspGenAndSend( VOID PeerAuthSimpleRspGenAndSend(IN PRTMP_ADAPTER pAd,
IN PRTMP_ADAPTER pAd, IN PHEADER_802_11 pHdr80211,
IN PHEADER_802_11 pHdr80211, IN USHORT Alg,
IN USHORT Alg, IN USHORT Seq,
IN USHORT Seq, IN USHORT Reason, IN USHORT Status)
IN USHORT Reason,
IN USHORT Status)
{ {
HEADER_802_11 AuthHdr; HEADER_802_11 AuthHdr;
ULONG FrameLen = 0; ULONG FrameLen = 0;
PUCHAR pOutBuffer = NULL; PUCHAR pOutBuffer = NULL;
NDIS_STATUS NStatus; NDIS_STATUS NStatus;
if (Reason != MLME_SUCCESS) if (Reason != MLME_SUCCESS) {
{ DBGPRINT(RT_DEBUG_TRACE, ("Peer AUTH fail...\n"));
DBGPRINT(RT_DEBUG_TRACE, ("Peer AUTH fail...\n")); return;
return; }
}
//Get an unused nonpaged memory //Get an unused nonpaged memory
NStatus = MlmeAllocateMemory(pAd, &pOutBuffer); NStatus = MlmeAllocateMemory(pAd, &pOutBuffer);
if (NStatus != NDIS_STATUS_SUCCESS) if (NStatus != NDIS_STATUS_SUCCESS)
return; return;
DBGPRINT(RT_DEBUG_TRACE, ("Send AUTH response (seq#2)...\n")); DBGPRINT(RT_DEBUG_TRACE, ("Send AUTH response (seq#2)...\n"));
MgtMacHeaderInit(pAd, &AuthHdr, SUBTYPE_AUTH, 0, pHdr80211->Addr2, pAd->MlmeAux.Bssid); MgtMacHeaderInit(pAd, &AuthHdr, SUBTYPE_AUTH, 0, pHdr80211->Addr2,
MakeOutgoingFrame(pOutBuffer, &FrameLen, pAd->MlmeAux.Bssid);
sizeof(HEADER_802_11), &AuthHdr, MakeOutgoingFrame(pOutBuffer, &FrameLen, sizeof(HEADER_802_11),
2, &Alg, &AuthHdr, 2, &Alg, 2, &Seq, 2, &Reason, END_OF_ARGS);
2, &Seq, MiniportMMRequest(pAd, 0, pOutBuffer, FrameLen);
2, &Reason,
END_OF_ARGS);
MiniportMMRequest(pAd, 0, pOutBuffer, FrameLen);
MlmeFreeMemory(pAd, pOutBuffer); MlmeFreeMemory(pAd, pOutBuffer);
} }
...@@ -114,35 +110,33 @@ VOID PeerAuthSimpleRspGenAndSend( ...@@ -114,35 +110,33 @@ VOID PeerAuthSimpleRspGenAndSend(
========================================================================== ==========================================================================
*/ */
VOID PeerDeauthAction( VOID PeerDeauthAction(IN PRTMP_ADAPTER pAd, IN PMLME_QUEUE_ELEM Elem)
IN PRTMP_ADAPTER pAd,
IN PMLME_QUEUE_ELEM Elem)
{ {
UCHAR Addr2[MAC_ADDR_LEN]; UCHAR Addr2[MAC_ADDR_LEN];
USHORT Reason; USHORT Reason;
if (PeerDeauthSanity(pAd, Elem->Msg, Elem->MsgLen, Addr2, &Reason))
{
if (INFRA_ON(pAd)
&& MAC_ADDR_EQUAL(Addr2, pAd->CommonCfg.Bssid)
)
{
DBGPRINT(RT_DEBUG_TRACE,("AUTH_RSP - receive DE-AUTH from our AP (Reason=%d)\n", Reason));
if (PeerDeauthSanity(pAd, Elem->Msg, Elem->MsgLen, Addr2, &Reason)) {
if (INFRA_ON(pAd)
&& MAC_ADDR_EQUAL(Addr2, pAd->CommonCfg.Bssid)
) {
DBGPRINT(RT_DEBUG_TRACE,
("AUTH_RSP - receive DE-AUTH from our AP (Reason=%d)\n",
Reason));
RtmpOSWrielessEventSend(pAd, SIOCGIWAP, -1, NULL, NULL, 0); RtmpOSWrielessEventSend(pAd, SIOCGIWAP, -1, NULL, NULL,
0);
// send wireless event - for deauthentication // send wireless event - for deauthentication
if (pAd->CommonCfg.bWirelessEvent) if (pAd->CommonCfg.bWirelessEvent)
RTMPSendWirelessEvent(pAd, IW_DEAUTH_EVENT_FLAG, pAd->MacTab.Content[BSSID_WCID].Addr, BSS0, 0); RTMPSendWirelessEvent(pAd, IW_DEAUTH_EVENT_FLAG,
pAd->MacTab.
LinkDown(pAd, TRUE); Content[BSSID_WCID].Addr,
} BSS0, 0);
}
else LinkDown(pAd, TRUE);
{ }
DBGPRINT(RT_DEBUG_TRACE,("AUTH_RSP - PeerDeauthAction() sanity check fail\n")); } else {
} DBGPRINT(RT_DEBUG_TRACE,
("AUTH_RSP - PeerDeauthAction() sanity check fail\n"));
}
} }
...@@ -36,15 +36,15 @@ ...@@ -36,15 +36,15 @@
*/ */
#include "../rt_config.h" #include "../rt_config.h"
extern UCHAR CISCO_OUI[]; extern UCHAR CISCO_OUI[];
extern UCHAR WPA_OUI[]; extern UCHAR WPA_OUI[];
extern UCHAR RSN_OUI[]; extern UCHAR RSN_OUI[];
extern UCHAR WME_INFO_ELEM[]; extern UCHAR WME_INFO_ELEM[];
extern UCHAR WME_PARM_ELEM[]; extern UCHAR WME_PARM_ELEM[];
extern UCHAR Ccx2QosInfo[]; extern UCHAR Ccx2QosInfo[];
extern UCHAR RALINK_OUI[]; extern UCHAR RALINK_OUI[];
extern UCHAR BROADCOM_OUI[]; extern UCHAR BROADCOM_OUI[];
/* /*
========================================================================== ==========================================================================
...@@ -54,27 +54,25 @@ extern UCHAR BROADCOM_OUI[]; ...@@ -54,27 +54,25 @@ extern UCHAR BROADCOM_OUI[];
TRUE if all parameters are OK, FALSE otherwise TRUE if all parameters are OK, FALSE otherwise
========================================================================== ==========================================================================
*/ */
BOOLEAN MlmeStartReqSanity( BOOLEAN MlmeStartReqSanity(IN PRTMP_ADAPTER pAd,
IN PRTMP_ADAPTER pAd, IN VOID * Msg,
IN VOID *Msg, IN ULONG MsgLen,
IN ULONG MsgLen, OUT CHAR Ssid[], OUT UCHAR * pSsidLen)
OUT CHAR Ssid[],
OUT UCHAR *pSsidLen)
{ {
MLME_START_REQ_STRUCT *Info; MLME_START_REQ_STRUCT *Info;
Info = (MLME_START_REQ_STRUCT *)(Msg); Info = (MLME_START_REQ_STRUCT *) (Msg);
if (Info->SsidLen > MAX_LEN_OF_SSID) if (Info->SsidLen > MAX_LEN_OF_SSID) {
{ DBGPRINT(RT_DEBUG_TRACE,
DBGPRINT(RT_DEBUG_TRACE, ("MlmeStartReqSanity fail - wrong SSID length\n")); ("MlmeStartReqSanity fail - wrong SSID length\n"));
return FALSE; return FALSE;
} }
*pSsidLen = Info->SsidLen; *pSsidLen = Info->SsidLen;
NdisMoveMemory(Ssid, Info->Ssid, *pSsidLen); NdisMoveMemory(Ssid, Info->Ssid, *pSsidLen);
return TRUE; return TRUE;
} }
/* /*
...@@ -88,171 +86,161 @@ BOOLEAN MlmeStartReqSanity( ...@@ -88,171 +86,161 @@ BOOLEAN MlmeStartReqSanity(
========================================================================== ==========================================================================
*/ */
BOOLEAN PeerAssocRspSanity( BOOLEAN PeerAssocRspSanity(IN PRTMP_ADAPTER pAd, IN VOID * pMsg, IN ULONG MsgLen, OUT PUCHAR pAddr2, OUT USHORT * pCapabilityInfo, OUT USHORT * pStatus, OUT USHORT * pAid, OUT UCHAR SupRate[], OUT UCHAR * pSupRateLen, OUT UCHAR ExtRate[], OUT UCHAR * pExtRateLen, OUT HT_CAPABILITY_IE * pHtCapability, OUT ADD_HT_INFO_IE * pAddHtInfo, // AP might use this additional ht info IE
IN PRTMP_ADAPTER pAd, OUT UCHAR * pHtCapabilityLen,
IN VOID *pMsg, OUT UCHAR * pAddHtInfoLen,
IN ULONG MsgLen, OUT UCHAR * pNewExtChannelOffset,
OUT PUCHAR pAddr2, OUT PEDCA_PARM pEdcaParm, OUT UCHAR * pCkipFlag)
OUT USHORT *pCapabilityInfo,
OUT USHORT *pStatus,
OUT USHORT *pAid,
OUT UCHAR SupRate[],
OUT UCHAR *pSupRateLen,
OUT UCHAR ExtRate[],
OUT UCHAR *pExtRateLen,
OUT HT_CAPABILITY_IE *pHtCapability,
OUT ADD_HT_INFO_IE *pAddHtInfo, // AP might use this additional ht info IE
OUT UCHAR *pHtCapabilityLen,
OUT UCHAR *pAddHtInfoLen,
OUT UCHAR *pNewExtChannelOffset,
OUT PEDCA_PARM pEdcaParm,
OUT UCHAR *pCkipFlag)
{ {
CHAR IeType, *Ptr; CHAR IeType, *Ptr;
PFRAME_802_11 pFrame = (PFRAME_802_11)pMsg; PFRAME_802_11 pFrame = (PFRAME_802_11) pMsg;
PEID_STRUCT pEid; PEID_STRUCT pEid;
ULONG Length = 0; ULONG Length = 0;
*pNewExtChannelOffset = 0xff; *pNewExtChannelOffset = 0xff;
*pHtCapabilityLen = 0; *pHtCapabilityLen = 0;
*pAddHtInfoLen = 0; *pAddHtInfoLen = 0;
COPY_MAC_ADDR(pAddr2, pFrame->Hdr.Addr2); COPY_MAC_ADDR(pAddr2, pFrame->Hdr.Addr2);
Ptr = (PCHAR)pFrame->Octet; Ptr = (PCHAR) pFrame->Octet;
Length += LENGTH_802_11; Length += LENGTH_802_11;
NdisMoveMemory(pCapabilityInfo, &pFrame->Octet[0], 2); NdisMoveMemory(pCapabilityInfo, &pFrame->Octet[0], 2);
Length += 2; Length += 2;
NdisMoveMemory(pStatus, &pFrame->Octet[2], 2); NdisMoveMemory(pStatus, &pFrame->Octet[2], 2);
Length += 2; Length += 2;
*pCkipFlag = 0; *pCkipFlag = 0;
*pExtRateLen = 0; *pExtRateLen = 0;
pEdcaParm->bValid = FALSE; pEdcaParm->bValid = FALSE;
if (*pStatus != MLME_SUCCESS) if (*pStatus != MLME_SUCCESS)
return TRUE; return TRUE;
NdisMoveMemory(pAid, &pFrame->Octet[4], 2); NdisMoveMemory(pAid, &pFrame->Octet[4], 2);
Length += 2; Length += 2;
// Aid already swaped byte order in RTMPFrameEndianChange() for big endian platform // Aid already swaped byte order in RTMPFrameEndianChange() for big endian platform
*pAid = (*pAid) & 0x3fff; // AID is low 14-bit *pAid = (*pAid) & 0x3fff; // AID is low 14-bit
// -- get supported rates from payload and advance the pointer // -- get supported rates from payload and advance the pointer
IeType = pFrame->Octet[6]; IeType = pFrame->Octet[6];
*pSupRateLen = pFrame->Octet[7]; *pSupRateLen = pFrame->Octet[7];
if ((IeType != IE_SUPP_RATES) || (*pSupRateLen > MAX_LEN_OF_SUPPORTED_RATES)) if ((IeType != IE_SUPP_RATES)
{ || (*pSupRateLen > MAX_LEN_OF_SUPPORTED_RATES)) {
DBGPRINT(RT_DEBUG_TRACE, ("PeerAssocRspSanity fail - wrong SupportedRates IE\n")); DBGPRINT(RT_DEBUG_TRACE,
return FALSE; ("PeerAssocRspSanity fail - wrong SupportedRates IE\n"));
} return FALSE;
else } else
NdisMoveMemory(SupRate, &pFrame->Octet[8], *pSupRateLen); NdisMoveMemory(SupRate, &pFrame->Octet[8], *pSupRateLen);
Length = Length + 2 + *pSupRateLen; Length = Length + 2 + *pSupRateLen;
// many AP implement proprietary IEs in non-standard order, we'd better // many AP implement proprietary IEs in non-standard order, we'd better
// tolerate mis-ordered IEs to get best compatibility // tolerate mis-ordered IEs to get best compatibility
pEid = (PEID_STRUCT) &pFrame->Octet[8 + (*pSupRateLen)]; pEid = (PEID_STRUCT) & pFrame->Octet[8 + (*pSupRateLen)];
// get variable fields from payload and advance the pointer // get variable fields from payload and advance the pointer
while ((Length + 2 + pEid->Len) <= MsgLen) while ((Length + 2 + pEid->Len) <= MsgLen) {
{ switch (pEid->Eid) {
switch (pEid->Eid) case IE_EXT_SUPP_RATES:
{ if (pEid->Len <= MAX_LEN_OF_SUPPORTED_RATES) {
case IE_EXT_SUPP_RATES: NdisMoveMemory(ExtRate, pEid->Octet, pEid->Len);
if (pEid->Len <= MAX_LEN_OF_SUPPORTED_RATES) *pExtRateLen = pEid->Len;
{ }
NdisMoveMemory(ExtRate, pEid->Octet, pEid->Len); break;
*pExtRateLen = pEid->Len;
} case IE_HT_CAP:
break; case IE_HT_CAP2:
if (pEid->Len >= SIZE_HT_CAP_IE) //Note: allow extension.!!
case IE_HT_CAP:
case IE_HT_CAP2:
if (pEid->Len >= SIZE_HT_CAP_IE) //Note: allow extension.!!
{ {
NdisMoveMemory(pHtCapability, pEid->Octet, SIZE_HT_CAP_IE); NdisMoveMemory(pHtCapability, pEid->Octet,
SIZE_HT_CAP_IE);
*(USHORT *)(&pHtCapability->HtCapInfo) = cpu2le16(*(USHORT *)(&pHtCapability->HtCapInfo)); *(USHORT *) (&pHtCapability->HtCapInfo) =
*(USHORT *)(&pHtCapability->ExtHtCapInfo) = cpu2le16(*(USHORT *)(&pHtCapability->ExtHtCapInfo)); cpu2le16(*(USHORT *)
(&pHtCapability->HtCapInfo));
*(USHORT *) (&pHtCapability->ExtHtCapInfo) =
cpu2le16(*(USHORT *)
(&pHtCapability->ExtHtCapInfo));
*pHtCapabilityLen = SIZE_HT_CAP_IE; *pHtCapabilityLen = SIZE_HT_CAP_IE;
} } else {
else DBGPRINT(RT_DEBUG_WARN,
{ ("PeerAssocRspSanity - wrong IE_HT_CAP. \n"));
DBGPRINT(RT_DEBUG_WARN, ("PeerAssocRspSanity - wrong IE_HT_CAP. \n"));
} }
break; break;
case IE_ADD_HT: case IE_ADD_HT:
case IE_ADD_HT2: case IE_ADD_HT2:
if (pEid->Len >= sizeof(ADD_HT_INFO_IE)) if (pEid->Len >= sizeof(ADD_HT_INFO_IE)) {
{
// This IE allows extension, but we can ignore extra bytes beyond our knowledge , so only // This IE allows extension, but we can ignore extra bytes beyond our knowledge , so only
// copy first sizeof(ADD_HT_INFO_IE) // copy first sizeof(ADD_HT_INFO_IE)
NdisMoveMemory(pAddHtInfo, pEid->Octet, sizeof(ADD_HT_INFO_IE)); NdisMoveMemory(pAddHtInfo, pEid->Octet,
sizeof(ADD_HT_INFO_IE));
*(USHORT *)(&pAddHtInfo->AddHtInfo2) = cpu2le16(*(USHORT *)(&pAddHtInfo->AddHtInfo2)); *(USHORT *) (&pAddHtInfo->AddHtInfo2) =
*(USHORT *)(&pAddHtInfo->AddHtInfo3) = cpu2le16(*(USHORT *)(&pAddHtInfo->AddHtInfo3)); cpu2le16(*(USHORT *)
(&pAddHtInfo->AddHtInfo2));
*(USHORT *) (&pAddHtInfo->AddHtInfo3) =
cpu2le16(*(USHORT *)
(&pAddHtInfo->AddHtInfo3));
*pAddHtInfoLen = SIZE_ADD_HT_INFO_IE; *pAddHtInfoLen = SIZE_ADD_HT_INFO_IE;
} } else {
else DBGPRINT(RT_DEBUG_WARN,
{ ("PeerAssocRspSanity - wrong IE_ADD_HT. \n"));
DBGPRINT(RT_DEBUG_WARN, ("PeerAssocRspSanity - wrong IE_ADD_HT. \n"));
} }
break; break;
case IE_SECONDARY_CH_OFFSET: case IE_SECONDARY_CH_OFFSET:
if (pEid->Len == 1) if (pEid->Len == 1) {
{
*pNewExtChannelOffset = pEid->Octet[0]; *pNewExtChannelOffset = pEid->Octet[0];
} else {
DBGPRINT(RT_DEBUG_WARN,
("PeerAssocRspSanity - wrong IE_SECONDARY_CH_OFFSET. \n"));
} }
else break;
{
DBGPRINT(RT_DEBUG_WARN, ("PeerAssocRspSanity - wrong IE_SECONDARY_CH_OFFSET. \n")); case IE_VENDOR_SPECIFIC:
// handle WME PARAMTER ELEMENT
if (NdisEqualMemory(pEid->Octet, WME_PARM_ELEM, 6)
&& (pEid->Len == 24)) {
PUCHAR ptr;
int i;
// parsing EDCA parameters
pEdcaParm->bValid = TRUE;
pEdcaParm->bQAck = FALSE; // pEid->Octet[0] & 0x10;
pEdcaParm->bQueueRequest = FALSE; // pEid->Octet[0] & 0x20;
pEdcaParm->bTxopRequest = FALSE; // pEid->Octet[0] & 0x40;
//pEdcaParm->bMoreDataAck = FALSE; // pEid->Octet[0] & 0x80;
pEdcaParm->EdcaUpdateCount =
pEid->Octet[6] & 0x0f;
pEdcaParm->bAPSDCapable =
(pEid->Octet[6] & 0x80) ? 1 : 0;
ptr = (PUCHAR) & pEid->Octet[8];
for (i = 0; i < 4; i++) {
UCHAR aci = (*ptr & 0x60) >> 5; // b5~6 is AC INDEX
pEdcaParm->bACM[aci] = (((*ptr) & 0x10) == 0x10); // b5 is ACM
pEdcaParm->Aifsn[aci] = (*ptr) & 0x0f; // b0~3 is AIFSN
pEdcaParm->Cwmin[aci] = *(ptr + 1) & 0x0f; // b0~4 is Cwmin
pEdcaParm->Cwmax[aci] = *(ptr + 1) >> 4; // b5~8 is Cwmax
pEdcaParm->Txop[aci] = *(ptr + 2) + 256 * (*(ptr + 3)); // in unit of 32-us
ptr += 4; // point to next AC
}
} }
break; break;
default:
case IE_VENDOR_SPECIFIC: DBGPRINT(RT_DEBUG_TRACE,
// handle WME PARAMTER ELEMENT ("PeerAssocRspSanity - ignore unrecognized EID = %d\n",
if (NdisEqualMemory(pEid->Octet, WME_PARM_ELEM, 6) && (pEid->Len == 24)) pEid->Eid));
{ break;
PUCHAR ptr; }
int i;
Length = Length + 2 + pEid->Len;
// parsing EDCA parameters pEid = (PEID_STRUCT) ((UCHAR *) pEid + 2 + pEid->Len);
pEdcaParm->bValid = TRUE; }
pEdcaParm->bQAck = FALSE; // pEid->Octet[0] & 0x10;
pEdcaParm->bQueueRequest = FALSE; // pEid->Octet[0] & 0x20; return TRUE;
pEdcaParm->bTxopRequest = FALSE; // pEid->Octet[0] & 0x40;
//pEdcaParm->bMoreDataAck = FALSE; // pEid->Octet[0] & 0x80;
pEdcaParm->EdcaUpdateCount = pEid->Octet[6] & 0x0f;
pEdcaParm->bAPSDCapable = (pEid->Octet[6] & 0x80) ? 1 : 0;
ptr = (PUCHAR)&pEid->Octet[8];
for (i=0; i<4; i++)
{
UCHAR aci = (*ptr & 0x60) >> 5; // b5~6 is AC INDEX
pEdcaParm->bACM[aci] = (((*ptr) & 0x10) == 0x10); // b5 is ACM
pEdcaParm->Aifsn[aci] = (*ptr) & 0x0f; // b0~3 is AIFSN
pEdcaParm->Cwmin[aci] = *(ptr+1) & 0x0f; // b0~4 is Cwmin
pEdcaParm->Cwmax[aci] = *(ptr+1) >> 4; // b5~8 is Cwmax
pEdcaParm->Txop[aci] = *(ptr+2) + 256 * (*(ptr+3)); // in unit of 32-us
ptr += 4; // point to next AC
}
}
break;
default:
DBGPRINT(RT_DEBUG_TRACE, ("PeerAssocRspSanity - ignore unrecognized EID = %d\n", pEid->Eid));
break;
}
Length = Length + 2 + pEid->Len;
pEid = (PEID_STRUCT)((UCHAR*)pEid + 2 + pEid->Len);
}
return TRUE;
} }
/* /*
...@@ -266,47 +254,46 @@ BOOLEAN PeerAssocRspSanity( ...@@ -266,47 +254,46 @@ BOOLEAN PeerAssocRspSanity(
========================================================================== ==========================================================================
*/ */
BOOLEAN PeerProbeReqSanity( BOOLEAN PeerProbeReqSanity(IN PRTMP_ADAPTER pAd,
IN PRTMP_ADAPTER pAd, IN VOID * Msg,
IN VOID *Msg, IN ULONG MsgLen,
IN ULONG MsgLen, OUT PUCHAR pAddr2,
OUT PUCHAR pAddr2, OUT CHAR Ssid[], OUT UCHAR * pSsidLen)
OUT CHAR Ssid[],
OUT UCHAR *pSsidLen)
{ {
UCHAR Idx; UCHAR Idx;
UCHAR RateLen; UCHAR RateLen;
CHAR IeType; CHAR IeType;
PFRAME_802_11 pFrame = (PFRAME_802_11)Msg; PFRAME_802_11 pFrame = (PFRAME_802_11) Msg;
COPY_MAC_ADDR(pAddr2, pFrame->Hdr.Addr2); COPY_MAC_ADDR(pAddr2, pFrame->Hdr.Addr2);
if ((pFrame->Octet[0] != IE_SSID) || (pFrame->Octet[1] > MAX_LEN_OF_SSID)) if ((pFrame->Octet[0] != IE_SSID)
{ || (pFrame->Octet[1] > MAX_LEN_OF_SSID)) {
DBGPRINT(RT_DEBUG_TRACE, ("PeerProbeReqSanity fail - wrong SSID IE(Type=%d,Len=%d)\n",pFrame->Octet[0],pFrame->Octet[1])); DBGPRINT(RT_DEBUG_TRACE,
return FALSE; ("PeerProbeReqSanity fail - wrong SSID IE(Type=%d,Len=%d)\n",
} pFrame->Octet[0], pFrame->Octet[1]));
return FALSE;
*pSsidLen = pFrame->Octet[1]; }
NdisMoveMemory(Ssid, &pFrame->Octet[2], *pSsidLen);
*pSsidLen = pFrame->Octet[1];
Idx = *pSsidLen + 2; NdisMoveMemory(Ssid, &pFrame->Octet[2], *pSsidLen);
// -- get supported rates from payload and advance the pointer Idx = *pSsidLen + 2;
IeType = pFrame->Octet[Idx];
RateLen = pFrame->Octet[Idx + 1]; // -- get supported rates from payload and advance the pointer
if (IeType != IE_SUPP_RATES) IeType = pFrame->Octet[Idx];
{ RateLen = pFrame->Octet[Idx + 1];
DBGPRINT(RT_DEBUG_TRACE, ("PeerProbeReqSanity fail - wrong SupportRates IE(Type=%d,Len=%d)\n",pFrame->Octet[Idx],pFrame->Octet[Idx+1])); if (IeType != IE_SUPP_RATES) {
return FALSE; DBGPRINT(RT_DEBUG_TRACE,
} ("PeerProbeReqSanity fail - wrong SupportRates IE(Type=%d,Len=%d)\n",
else pFrame->Octet[Idx], pFrame->Octet[Idx + 1]));
{ return FALSE;
if ((pAd->CommonCfg.PhyMode == PHY_11G) && (RateLen < 8)) } else {
return (FALSE); if ((pAd->CommonCfg.PhyMode == PHY_11G) && (RateLen < 8))
} return (FALSE);
}
return TRUE;
return TRUE;
} }
/* /*
...@@ -317,62 +304,58 @@ BOOLEAN PeerProbeReqSanity( ...@@ -317,62 +304,58 @@ BOOLEAN PeerProbeReqSanity(
========================================================================== ==========================================================================
*/ */
BOOLEAN GetTimBit( BOOLEAN GetTimBit(IN CHAR * Ptr,
IN CHAR *Ptr, IN USHORT Aid,
IN USHORT Aid, OUT UCHAR * TimLen,
OUT UCHAR *TimLen, OUT UCHAR * BcastFlag,
OUT UCHAR *BcastFlag, OUT UCHAR * DtimCount,
OUT UCHAR *DtimCount, OUT UCHAR * DtimPeriod, OUT UCHAR * MessageToMe)
OUT UCHAR *DtimPeriod,
OUT UCHAR *MessageToMe)
{ {
UCHAR BitCntl, N1, N2, MyByte, MyBit; UCHAR BitCntl, N1, N2, MyByte, MyBit;
CHAR *IdxPtr; CHAR *IdxPtr;
IdxPtr = Ptr; IdxPtr = Ptr;
IdxPtr ++; IdxPtr++;
*TimLen = *IdxPtr; *TimLen = *IdxPtr;
// get DTIM Count from TIM element // get DTIM Count from TIM element
IdxPtr ++; IdxPtr++;
*DtimCount = *IdxPtr; *DtimCount = *IdxPtr;
// get DTIM Period from TIM element // get DTIM Period from TIM element
IdxPtr++; IdxPtr++;
*DtimPeriod = *IdxPtr; *DtimPeriod = *IdxPtr;
// get Bitmap Control from TIM element // get Bitmap Control from TIM element
IdxPtr++; IdxPtr++;
BitCntl = *IdxPtr; BitCntl = *IdxPtr;
if ((*DtimCount == 0) && (BitCntl & 0x01)) if ((*DtimCount == 0) && (BitCntl & 0x01))
*BcastFlag = TRUE; *BcastFlag = TRUE;
else else
*BcastFlag = FALSE; *BcastFlag = FALSE;
// Parse Partial Virtual Bitmap from TIM element // Parse Partial Virtual Bitmap from TIM element
N1 = BitCntl & 0xfe; // N1 is the first bitmap byte# N1 = BitCntl & 0xfe; // N1 is the first bitmap byte#
N2 = *TimLen - 4 + N1; // N2 is the last bitmap byte# N2 = *TimLen - 4 + N1; // N2 is the last bitmap byte#
if ((Aid < (N1 << 3)) || (Aid >= ((N2 + 1) << 3))) if ((Aid < (N1 << 3)) || (Aid >= ((N2 + 1) << 3)))
*MessageToMe = FALSE; *MessageToMe = FALSE;
else else {
{ MyByte = (Aid >> 3) - N1; // my byte position in the bitmap byte-stream
MyByte = (Aid >> 3) - N1; // my byte position in the bitmap byte-stream MyBit = Aid % 16 - ((MyByte & 0x01) ? 8 : 0);
MyBit = Aid % 16 - ((MyByte & 0x01)? 8:0);
IdxPtr += (MyByte + 1); IdxPtr += (MyByte + 1);
//if (*IdxPtr) //if (*IdxPtr)
// DBGPRINT(RT_DEBUG_WARN, ("TIM bitmap = 0x%02x\n", *IdxPtr)); // DBGPRINT(RT_DEBUG_WARN, ("TIM bitmap = 0x%02x\n", *IdxPtr));
if (*IdxPtr & (0x01 << MyBit)) if (*IdxPtr & (0x01 << MyBit))
*MessageToMe = TRUE; *MessageToMe = TRUE;
else else
*MessageToMe = FALSE; *MessageToMe = FALSE;
} }
return TRUE; return TRUE;
} }
此差异已折叠。
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
*/ */
#include "../rt_config.h" #include "../rt_config.h"
void inc_byte_array(UCHAR *counter, int len); void inc_byte_array(UCHAR * counter, int len);
/* /*
======================================================================== ========================================================================
...@@ -58,33 +58,29 @@ void inc_byte_array(UCHAR *counter, int len); ...@@ -58,33 +58,29 @@ void inc_byte_array(UCHAR *counter, int len);
======================================================================== ========================================================================
*/ */
VOID RTMPReportMicError( VOID RTMPReportMicError(IN PRTMP_ADAPTER pAd, IN PCIPHER_KEY pWpaKey)
IN PRTMP_ADAPTER pAd,
IN PCIPHER_KEY pWpaKey)
{ {
ULONG Now; ULONG Now;
UCHAR unicastKey = (pWpaKey->Type == PAIRWISE_KEY ? 1:0); UCHAR unicastKey = (pWpaKey->Type == PAIRWISE_KEY ? 1 : 0);
// Record Last MIC error time and count // Record Last MIC error time and count
NdisGetSystemUpTime(&Now); NdisGetSystemUpTime(&Now);
if (pAd->StaCfg.MicErrCnt == 0) if (pAd->StaCfg.MicErrCnt == 0) {
{
pAd->StaCfg.MicErrCnt++; pAd->StaCfg.MicErrCnt++;
pAd->StaCfg.LastMicErrorTime = Now; pAd->StaCfg.LastMicErrorTime = Now;
NdisZeroMemory(pAd->StaCfg.ReplayCounter, 8); NdisZeroMemory(pAd->StaCfg.ReplayCounter, 8);
} } else if (pAd->StaCfg.MicErrCnt == 1) {
else if (pAd->StaCfg.MicErrCnt == 1) if ((pAd->StaCfg.LastMicErrorTime + (60 * OS_HZ)) < Now) {
{
if ((pAd->StaCfg.LastMicErrorTime + (60 * OS_HZ)) < Now)
{
// Update Last MIC error time, this did not violate two MIC errors within 60 seconds // Update Last MIC error time, this did not violate two MIC errors within 60 seconds
pAd->StaCfg.LastMicErrorTime = Now; pAd->StaCfg.LastMicErrorTime = Now;
} } else {
else
{
if (pAd->CommonCfg.bWirelessEvent) if (pAd->CommonCfg.bWirelessEvent)
RTMPSendWirelessEvent(pAd, IW_COUNTER_MEASURES_EVENT_FLAG, pAd->MacTab.Content[BSSID_WCID].Addr, BSS0, 0); RTMPSendWirelessEvent(pAd,
IW_COUNTER_MEASURES_EVENT_FLAG,
pAd->MacTab.
Content[BSSID_WCID].Addr,
BSS0, 0);
pAd->StaCfg.LastMicErrorTime = Now; pAd->StaCfg.LastMicErrorTime = Now;
// Violate MIC error counts, MIC countermeasures kicks in // Violate MIC error counts, MIC countermeasures kicks in
...@@ -101,154 +97,139 @@ VOID RTMPReportMicError( ...@@ -101,154 +97,139 @@ VOID RTMPReportMicError(
// RTMPRingCleanUp(pAd, QID_AC_VO); // RTMPRingCleanUp(pAd, QID_AC_VO);
// RTMPRingCleanUp(pAd, QID_HCCA); // RTMPRingCleanUp(pAd, QID_HCCA);
} }
} } else {
else
{
// MIC error count >= 2 // MIC error count >= 2
// This should not happen // This should not happen
; ;
} }
MlmeEnqueue(pAd, MlmeEnqueue(pAd,
MLME_CNTL_STATE_MACHINE, MLME_CNTL_STATE_MACHINE,
OID_802_11_MIC_FAILURE_REPORT_FRAME, OID_802_11_MIC_FAILURE_REPORT_FRAME, 1, &unicastKey);
1,
&unicastKey); if (pAd->StaCfg.MicErrCnt == 2) {
RTMPSetTimer(&pAd->StaCfg.WpaDisassocAndBlockAssocTimer, 100);
if (pAd->StaCfg.MicErrCnt == 2) }
{
RTMPSetTimer(&pAd->StaCfg.WpaDisassocAndBlockAssocTimer, 100);
}
} }
#define LENGTH_EAP_H 4 #define LENGTH_EAP_H 4
// If the received frame is EAP-Packet ,find out its EAP-Code (Request(0x01), Response(0x02), Success(0x03), Failure(0x04)). // If the received frame is EAP-Packet ,find out its EAP-Code (Request(0x01), Response(0x02), Success(0x03), Failure(0x04)).
INT WpaCheckEapCode( INT WpaCheckEapCode(IN PRTMP_ADAPTER pAd,
IN PRTMP_ADAPTER pAd, IN PUCHAR pFrame, IN USHORT FrameLen, IN USHORT OffSet)
IN PUCHAR pFrame,
IN USHORT FrameLen,
IN USHORT OffSet)
{ {
PUCHAR pData; PUCHAR pData;
INT result = 0; INT result = 0;
if( FrameLen < OffSet + LENGTH_EAPOL_H + LENGTH_EAP_H ) if (FrameLen < OffSet + LENGTH_EAPOL_H + LENGTH_EAP_H)
return result; return result;
pData = pFrame + OffSet; // skip offset bytes pData = pFrame + OffSet; // skip offset bytes
if(*(pData+1) == EAPPacket) // 802.1x header - Packet Type if (*(pData + 1) == EAPPacket) // 802.1x header - Packet Type
{ {
result = *(pData+4); // EAP header - Code result = *(pData + 4); // EAP header - Code
} }
return result; return result;
} }
VOID WpaSendMicFailureToWpaSupplicant( VOID WpaSendMicFailureToWpaSupplicant(IN PRTMP_ADAPTER pAd, IN BOOLEAN bUnicast)
IN PRTMP_ADAPTER pAd,
IN BOOLEAN bUnicast)
{ {
char custom[IW_CUSTOM_MAX] = {0}; char custom[IW_CUSTOM_MAX] = { 0 };
sprintf(custom, "MLME-MICHAELMICFAILURE.indication"); sprintf(custom, "MLME-MICHAELMICFAILURE.indication");
if(bUnicast) if (bUnicast)
sprintf(custom, "%s unicast", custom); sprintf(custom, "%s unicast", custom);
RtmpOSWrielessEventSend(pAd, IWEVCUSTOM, -1, NULL, (PUCHAR)custom, strlen(custom)); RtmpOSWrielessEventSend(pAd, IWEVCUSTOM, -1, NULL, (PUCHAR) custom,
strlen(custom));
return; return;
} }
VOID WpaMicFailureReportFrame( VOID WpaMicFailureReportFrame(IN PRTMP_ADAPTER pAd, IN MLME_QUEUE_ELEM * Elem)
IN PRTMP_ADAPTER pAd,
IN MLME_QUEUE_ELEM *Elem)
{ {
PUCHAR pOutBuffer = NULL; PUCHAR pOutBuffer = NULL;
UCHAR Header802_3[14]; UCHAR Header802_3[14];
ULONG FrameLen = 0; ULONG FrameLen = 0;
EAPOL_PACKET Packet; EAPOL_PACKET Packet;
UCHAR Mic[16]; UCHAR Mic[16];
BOOLEAN bUnicast; BOOLEAN bUnicast;
DBGPRINT(RT_DEBUG_TRACE, ("WpaMicFailureReportFrame ----->\n")); DBGPRINT(RT_DEBUG_TRACE, ("WpaMicFailureReportFrame ----->\n"));
bUnicast = (Elem->Msg[0] == 1 ? TRUE:FALSE); bUnicast = (Elem->Msg[0] == 1 ? TRUE : FALSE);
pAd->Sequence = ((pAd->Sequence) + 1) & (MAX_SEQ_NUMBER); pAd->Sequence = ((pAd->Sequence) + 1) & (MAX_SEQ_NUMBER);
// init 802.3 header and Fill Packet // init 802.3 header and Fill Packet
MAKE_802_3_HEADER(Header802_3, pAd->CommonCfg.Bssid, pAd->CurrentAddress, EAPOL); MAKE_802_3_HEADER(Header802_3, pAd->CommonCfg.Bssid,
pAd->CurrentAddress, EAPOL);
NdisZeroMemory(&Packet, sizeof(Packet)); NdisZeroMemory(&Packet, sizeof(Packet));
Packet.ProVer = EAPOL_VER; Packet.ProVer = EAPOL_VER;
Packet.ProType = EAPOLKey; Packet.ProType = EAPOLKey;
Packet.KeyDesc.Type = WPA1_KEY_DESC; Packet.KeyDesc.Type = WPA1_KEY_DESC;
// Request field presented // Request field presented
Packet.KeyDesc.KeyInfo.Request = 1; Packet.KeyDesc.KeyInfo.Request = 1;
if(pAd->StaCfg.WepStatus == Ndis802_11Encryption3Enabled) if (pAd->StaCfg.WepStatus == Ndis802_11Encryption3Enabled) {
{
Packet.KeyDesc.KeyInfo.KeyDescVer = 2; Packet.KeyDesc.KeyInfo.KeyDescVer = 2;
} } else // TKIP
else // TKIP
{ {
Packet.KeyDesc.KeyInfo.KeyDescVer = 1; Packet.KeyDesc.KeyInfo.KeyDescVer = 1;
} }
Packet.KeyDesc.KeyInfo.KeyType = (bUnicast ? PAIRWISEKEY : GROUPKEY); Packet.KeyDesc.KeyInfo.KeyType = (bUnicast ? PAIRWISEKEY : GROUPKEY);
// KeyMic field presented // KeyMic field presented
Packet.KeyDesc.KeyInfo.KeyMic = 1; Packet.KeyDesc.KeyInfo.KeyMic = 1;
// Error field presented // Error field presented
Packet.KeyDesc.KeyInfo.Error = 1; Packet.KeyDesc.KeyInfo.Error = 1;
// Update packet length after decide Key data payload // Update packet length after decide Key data payload
SET_UINT16_TO_ARRARY(Packet.Body_Len, LEN_EAPOL_KEY_MSG) SET_UINT16_TO_ARRARY(Packet.Body_Len, LEN_EAPOL_KEY_MSG)
// Key Replay Count
// Key Replay Count NdisMoveMemory(Packet.KeyDesc.ReplayCounter,
NdisMoveMemory(Packet.KeyDesc.ReplayCounter, pAd->StaCfg.ReplayCounter, LEN_KEY_DESC_REPLAY); pAd->StaCfg.ReplayCounter, LEN_KEY_DESC_REPLAY);
inc_byte_array(pAd->StaCfg.ReplayCounter, 8); inc_byte_array(pAd->StaCfg.ReplayCounter, 8);
// Convert to little-endian format. // Convert to little-endian format.
*((USHORT *)&Packet.KeyDesc.KeyInfo) = cpu2le16(*((USHORT *)&Packet.KeyDesc.KeyInfo)); *((USHORT *) & Packet.KeyDesc.KeyInfo) =
cpu2le16(*((USHORT *) & Packet.KeyDesc.KeyInfo));
MlmeAllocateMemory(pAd, (PUCHAR *)&pOutBuffer); // allocate memory MlmeAllocateMemory(pAd, (PUCHAR *) & pOutBuffer); // allocate memory
if(pOutBuffer == NULL) if (pOutBuffer == NULL) {
{
return; return;
} }
// Prepare EAPOL frame for MIC calculation // Prepare EAPOL frame for MIC calculation
// Be careful, only EAPOL frame is counted for MIC calculation // Be careful, only EAPOL frame is counted for MIC calculation
MakeOutgoingFrame(pOutBuffer, &FrameLen, MakeOutgoingFrame(pOutBuffer, &FrameLen,
CONV_ARRARY_TO_UINT16(Packet.Body_Len) + 4, &Packet, CONV_ARRARY_TO_UINT16(Packet.Body_Len) + 4, &Packet,
END_OF_ARGS); END_OF_ARGS);
// Prepare and Fill MIC value // Prepare and Fill MIC value
NdisZeroMemory(Mic, sizeof(Mic)); NdisZeroMemory(Mic, sizeof(Mic));
if(pAd->StaCfg.WepStatus == Ndis802_11Encryption3Enabled) if (pAd->StaCfg.WepStatus == Ndis802_11Encryption3Enabled) { // AES
{ // AES UCHAR digest[20] = { 0 };
UCHAR digest[20] = {0}; HMAC_SHA1(pAd->StaCfg.PTK, LEN_EAP_MICK, pOutBuffer, FrameLen,
HMAC_SHA1(pAd->StaCfg.PTK, LEN_EAP_MICK, pOutBuffer, FrameLen, digest, SHA1_DIGEST_SIZE); digest, SHA1_DIGEST_SIZE);
NdisMoveMemory(Mic, digest, LEN_KEY_DESC_MIC); NdisMoveMemory(Mic, digest, LEN_KEY_DESC_MIC);
} } else { // TKIP
else HMAC_MD5(pAd->StaCfg.PTK, LEN_EAP_MICK, pOutBuffer, FrameLen,
{ // TKIP Mic, MD5_DIGEST_SIZE);
HMAC_MD5(pAd->StaCfg.PTK, LEN_EAP_MICK, pOutBuffer, FrameLen, Mic, MD5_DIGEST_SIZE);
} }
NdisMoveMemory(Packet.KeyDesc.KeyMic, Mic, LEN_KEY_DESC_MIC); NdisMoveMemory(Packet.KeyDesc.KeyMic, Mic, LEN_KEY_DESC_MIC);
// copy frame to Tx ring and send MIC failure report frame to authenticator // copy frame to Tx ring and send MIC failure report frame to authenticator
RTMPToWirelessSta(pAd, &pAd->MacTab.Content[BSSID_WCID], RTMPToWirelessSta(pAd, &pAd->MacTab.Content[BSSID_WCID],
Header802_3, LENGTH_802_3, Header802_3, LENGTH_802_3,
(PUCHAR)&Packet, (PUCHAR) & Packet,
CONV_ARRARY_TO_UINT16(Packet.Body_Len) + 4, FALSE); CONV_ARRARY_TO_UINT16(Packet.Body_Len) + 4, FALSE);
MlmeFreeMemory(pAd, (PUCHAR)pOutBuffer); MlmeFreeMemory(pAd, (PUCHAR) pOutBuffer);
DBGPRINT(RT_DEBUG_TRACE, ("WpaMicFailureReportFrame <-----\n")); DBGPRINT(RT_DEBUG_TRACE, ("WpaMicFailureReportFrame <-----\n"));
} }
...@@ -262,7 +243,7 @@ VOID WpaMicFailureReportFrame( ...@@ -262,7 +243,7 @@ VOID WpaMicFailureReportFrame(
* rolling over to more significant bytes if the byte was incremented from * rolling over to more significant bytes if the byte was incremented from
* 0xff to 0x00. * 0xff to 0x00.
*/ */
void inc_byte_array(UCHAR *counter, int len) void inc_byte_array(UCHAR * counter, int len)
{ {
int pos = len - 1; int pos = len - 1;
while (pos >= 0) { while (pos >= 0) {
...@@ -273,26 +254,27 @@ void inc_byte_array(UCHAR *counter, int len) ...@@ -273,26 +254,27 @@ void inc_byte_array(UCHAR *counter, int len)
} }
} }
VOID WpaDisassocApAndBlockAssoc( VOID WpaDisassocApAndBlockAssoc(IN PVOID SystemSpecific1,
IN PVOID SystemSpecific1, IN PVOID FunctionContext,
IN PVOID FunctionContext, IN PVOID SystemSpecific2,
IN PVOID SystemSpecific2, IN PVOID SystemSpecific3)
IN PVOID SystemSpecific3)
{ {
RTMP_ADAPTER *pAd = (PRTMP_ADAPTER)FunctionContext; RTMP_ADAPTER *pAd = (PRTMP_ADAPTER) FunctionContext;
MLME_DISASSOC_REQ_STRUCT DisassocReq; MLME_DISASSOC_REQ_STRUCT DisassocReq;
// disassoc from current AP first // disassoc from current AP first
DBGPRINT(RT_DEBUG_TRACE, ("RTMPReportMicError - disassociate with current AP after sending second continuous EAPOL frame\n")); DBGPRINT(RT_DEBUG_TRACE,
DisassocParmFill(pAd, &DisassocReq, pAd->CommonCfg.Bssid, REASON_MIC_FAILURE); ("RTMPReportMicError - disassociate with current AP after sending second continuous EAPOL frame\n"));
MlmeEnqueue(pAd, ASSOC_STATE_MACHINE, MT2_MLME_DISASSOC_REQ, sizeof(MLME_DISASSOC_REQ_STRUCT), &DisassocReq); DisassocParmFill(pAd, &DisassocReq, pAd->CommonCfg.Bssid,
REASON_MIC_FAILURE);
MlmeEnqueue(pAd, ASSOC_STATE_MACHINE, MT2_MLME_DISASSOC_REQ,
sizeof(MLME_DISASSOC_REQ_STRUCT), &DisassocReq);
pAd->Mlme.CntlMachine.CurrState = CNTL_WAIT_DISASSOC; pAd->Mlme.CntlMachine.CurrState = CNTL_WAIT_DISASSOC;
pAd->StaCfg.bBlockAssoc = TRUE; pAd->StaCfg.bBlockAssoc = TRUE;
} }
VOID WpaStaPairwiseKeySetting( VOID WpaStaPairwiseKeySetting(IN PRTMP_ADAPTER pAd)
IN PRTMP_ADAPTER pAd)
{ {
PCIPHER_KEY pSharedKey; PCIPHER_KEY pSharedKey;
PMAC_TABLE_ENTRY pEntry; PMAC_TABLE_ENTRY pEntry;
...@@ -307,9 +289,11 @@ VOID WpaStaPairwiseKeySetting( ...@@ -307,9 +289,11 @@ VOID WpaStaPairwiseKeySetting(
// Prepare pair-wise key information into shared key table // Prepare pair-wise key information into shared key table
NdisZeroMemory(pSharedKey, sizeof(CIPHER_KEY)); NdisZeroMemory(pSharedKey, sizeof(CIPHER_KEY));
pSharedKey->KeyLen = LEN_TKIP_EK; pSharedKey->KeyLen = LEN_TKIP_EK;
NdisMoveMemory(pSharedKey->Key, &pAd->StaCfg.PTK[32], LEN_TKIP_EK); NdisMoveMemory(pSharedKey->Key, &pAd->StaCfg.PTK[32], LEN_TKIP_EK);
NdisMoveMemory(pSharedKey->RxMic, &pAd->StaCfg.PTK[48], LEN_TKIP_RXMICK); NdisMoveMemory(pSharedKey->RxMic, &pAd->StaCfg.PTK[48],
NdisMoveMemory(pSharedKey->TxMic, &pAd->StaCfg.PTK[48+LEN_TKIP_RXMICK], LEN_TKIP_TXMICK); LEN_TKIP_RXMICK);
NdisMoveMemory(pSharedKey->TxMic,
&pAd->StaCfg.PTK[48 + LEN_TKIP_RXMICK], LEN_TKIP_TXMICK);
// Decide its ChiperAlg // Decide its ChiperAlg
if (pAd->StaCfg.PairCipher == Ndis802_11Encryption2Enabled) if (pAd->StaCfg.PairCipher == Ndis802_11Encryption2Enabled)
...@@ -320,37 +304,35 @@ VOID WpaStaPairwiseKeySetting( ...@@ -320,37 +304,35 @@ VOID WpaStaPairwiseKeySetting(
pSharedKey->CipherAlg = CIPHER_NONE; pSharedKey->CipherAlg = CIPHER_NONE;
// Update these related information to MAC_TABLE_ENTRY // Update these related information to MAC_TABLE_ENTRY
NdisMoveMemory(pEntry->PairwiseKey.Key, &pAd->StaCfg.PTK[32], LEN_TKIP_EK); NdisMoveMemory(pEntry->PairwiseKey.Key, &pAd->StaCfg.PTK[32],
NdisMoveMemory(pEntry->PairwiseKey.RxMic, &pAd->StaCfg.PTK[48], LEN_TKIP_RXMICK); LEN_TKIP_EK);
NdisMoveMemory(pEntry->PairwiseKey.TxMic, &pAd->StaCfg.PTK[48+LEN_TKIP_RXMICK], LEN_TKIP_TXMICK); NdisMoveMemory(pEntry->PairwiseKey.RxMic, &pAd->StaCfg.PTK[48],
LEN_TKIP_RXMICK);
NdisMoveMemory(pEntry->PairwiseKey.TxMic,
&pAd->StaCfg.PTK[48 + LEN_TKIP_RXMICK], LEN_TKIP_TXMICK);
pEntry->PairwiseKey.CipherAlg = pSharedKey->CipherAlg; pEntry->PairwiseKey.CipherAlg = pSharedKey->CipherAlg;
// Update pairwise key information to ASIC Shared Key Table // Update pairwise key information to ASIC Shared Key Table
AsicAddSharedKeyEntry(pAd, AsicAddSharedKeyEntry(pAd,
BSS0, BSS0,
0, 0,
pSharedKey->CipherAlg, pSharedKey->CipherAlg,
pSharedKey->Key, pSharedKey->Key,
pSharedKey->TxMic, pSharedKey->TxMic, pSharedKey->RxMic);
pSharedKey->RxMic);
// Update ASIC WCID attribute table and IVEIV table // Update ASIC WCID attribute table and IVEIV table
RTMPAddWcidAttributeEntry(pAd, RTMPAddWcidAttributeEntry(pAd, BSS0, 0, pSharedKey->CipherAlg, pEntry);
BSS0,
0,
pSharedKey->CipherAlg,
pEntry);
STA_PORT_SECURED(pAd); STA_PORT_SECURED(pAd);
pAd->IndicateMediaState = NdisMediaStateConnected; pAd->IndicateMediaState = NdisMediaStateConnected;
DBGPRINT(RT_DEBUG_TRACE, ("%s : AID(%d) port secured\n", __func__, pEntry->Aid)); DBGPRINT(RT_DEBUG_TRACE,
("%s : AID(%d) port secured\n", __func__, pEntry->Aid));
} }
VOID WpaStaGroupKeySetting( VOID WpaStaGroupKeySetting(IN PRTMP_ADAPTER pAd)
IN PRTMP_ADAPTER pAd)
{ {
PCIPHER_KEY pSharedKey; PCIPHER_KEY pSharedKey;
pSharedKey = &pAd->SharedKey[BSS0][pAd->StaCfg.DefaultKeyId]; pSharedKey = &pAd->SharedKey[BSS0][pAd->StaCfg.DefaultKeyId];
...@@ -358,8 +340,10 @@ VOID WpaStaGroupKeySetting( ...@@ -358,8 +340,10 @@ VOID WpaStaGroupKeySetting(
NdisZeroMemory(pSharedKey, sizeof(CIPHER_KEY)); NdisZeroMemory(pSharedKey, sizeof(CIPHER_KEY));
pSharedKey->KeyLen = LEN_TKIP_EK; pSharedKey->KeyLen = LEN_TKIP_EK;
NdisMoveMemory(pSharedKey->Key, pAd->StaCfg.GTK, LEN_TKIP_EK); NdisMoveMemory(pSharedKey->Key, pAd->StaCfg.GTK, LEN_TKIP_EK);
NdisMoveMemory(pSharedKey->RxMic, &pAd->StaCfg.GTK[16], LEN_TKIP_RXMICK); NdisMoveMemory(pSharedKey->RxMic, &pAd->StaCfg.GTK[16],
NdisMoveMemory(pSharedKey->TxMic, &pAd->StaCfg.GTK[24], LEN_TKIP_TXMICK); LEN_TKIP_RXMICK);
NdisMoveMemory(pSharedKey->TxMic, &pAd->StaCfg.GTK[24],
LEN_TKIP_TXMICK);
// Update Shared Key CipherAlg // Update Shared Key CipherAlg
pSharedKey->CipherAlg = CIPHER_NONE; pSharedKey->CipherAlg = CIPHER_NONE;
...@@ -374,18 +358,16 @@ VOID WpaStaGroupKeySetting( ...@@ -374,18 +358,16 @@ VOID WpaStaGroupKeySetting(
// Update group key information to ASIC Shared Key Table // Update group key information to ASIC Shared Key Table
AsicAddSharedKeyEntry(pAd, AsicAddSharedKeyEntry(pAd,
BSS0, BSS0,
pAd->StaCfg.DefaultKeyId, pAd->StaCfg.DefaultKeyId,
pSharedKey->CipherAlg, pSharedKey->CipherAlg,
pSharedKey->Key, pSharedKey->Key,
pSharedKey->TxMic, pSharedKey->TxMic, pSharedKey->RxMic);
pSharedKey->RxMic);
// Update ASIC WCID attribute table and IVEIV table // Update ASIC WCID attribute table and IVEIV table
RTMPAddWcidAttributeEntry(pAd, RTMPAddWcidAttributeEntry(pAd,
BSS0, BSS0,
pAd->StaCfg.DefaultKeyId, pAd->StaCfg.DefaultKeyId,
pSharedKey->CipherAlg, pSharedKey->CipherAlg, NULL);
NULL);
} }
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册