Commit 3fc9b584 authored by Charles Clément's avatar Charles Clément Committed by Greg Kroah-Hartman
Browse files

Staging: vt6655: remove BYTE typedef 



Replace all occurrences with unsigned char type.

Signed-off-by: default avatarCharles Clément <caratorn@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 2986db5f

drivers/staging/vt6655/80211hdr.h

+10 −10
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ 
#define IEEE_ADDR_GROUP             0x01



typedef struct {

    BYTE            abyAddr[6];

    unsigned char abyAddr[6];

} IEEE_ADDR, *PIEEE_ADDR;



/* 802.11 Header Format */
@@ -299,8 +299,8 @@ typedef struct tagWLAN_80211HDR_A2 { 


    unsigned short wFrameCtl;

    unsigned short wDurationID;

    BYTE    abyAddr1[WLAN_ADDR_LEN];

    BYTE    abyAddr2[WLAN_ADDR_LEN];

    unsigned char abyAddr1[WLAN_ADDR_LEN];

    unsigned char abyAddr2[WLAN_ADDR_LEN];



} __attribute__ ((__packed__))

WLAN_80211HDR_A2, *PWLAN_80211HDR_A2;
@@ -309,9 +309,9 @@ typedef struct tagWLAN_80211HDR_A3 { 


    unsigned short wFrameCtl;

    unsigned short wDurationID;

    BYTE    abyAddr1[WLAN_ADDR_LEN];

    BYTE    abyAddr2[WLAN_ADDR_LEN];

    BYTE    abyAddr3[WLAN_ADDR_LEN];

    unsigned char abyAddr1[WLAN_ADDR_LEN];

    unsigned char abyAddr2[WLAN_ADDR_LEN];

    unsigned char abyAddr3[WLAN_ADDR_LEN];

    unsigned short wSeqCtl;



}__attribute__ ((__packed__))
@@ -321,11 +321,11 @@ typedef struct tagWLAN_80211HDR_A4 { 


    unsigned short wFrameCtl;

    unsigned short wDurationID;

    BYTE    abyAddr1[WLAN_ADDR_LEN];

    BYTE    abyAddr2[WLAN_ADDR_LEN];

    BYTE    abyAddr3[WLAN_ADDR_LEN];

    unsigned char abyAddr1[WLAN_ADDR_LEN];

    unsigned char abyAddr2[WLAN_ADDR_LEN];

    unsigned char abyAddr3[WLAN_ADDR_LEN];

    unsigned short wSeqCtl;

    BYTE    abyAddr4[WLAN_ADDR_LEN];

    unsigned char abyAddr4[WLAN_ADDR_LEN];



} __attribute__ ((__packed__))

WLAN_80211HDR_A4, *PWLAN_80211HDR_A4;

drivers/staging/vt6655/80211mgr.h

+104 −104
Original line number Diff line number Diff line
@@ -230,8 +230,8 @@ 


#pragma pack(1)

typedef struct tagWLAN_IE {

    BYTE   byElementID;

    BYTE   len;

    unsigned char byElementID;

    unsigned char len;

}__attribute__ ((__packed__))

WLAN_IE, *PWLAN_IE;
@@ -239,9 +239,9 @@ WLAN_IE, *PWLAN_IE; 
// Service Set Identity (SSID)

#pragma pack(1)

typedef struct tagWLAN_IE_SSID {

    BYTE   byElementID;

    BYTE   len;

    BYTE   abySSID[1];

    unsigned char byElementID;

    unsigned char len;

    unsigned char abySSID[1];

}__attribute__ ((__packed__))

WLAN_IE_SSID, *PWLAN_IE_SSID;
@@ -249,9 +249,9 @@ WLAN_IE_SSID, *PWLAN_IE_SSID; 
// Supported Rates

#pragma pack(1)

typedef struct tagWLAN_IE_SUPP_RATES {

    BYTE   byElementID;

    BYTE   len;

    BYTE   abyRates[1];

    unsigned char byElementID;

    unsigned char len;

    unsigned char abyRates[1];

}__attribute__ ((__packed__))

WLAN_IE_SUPP_RATES,  *PWLAN_IE_SUPP_RATES;
@@ -260,20 +260,20 @@ WLAN_IE_SUPP_RATES, *PWLAN_IE_SUPP_RATES; 
// FH Parameter Set

#pragma pack(1)

typedef struct _WLAN_IE_FH_PARMS {

    BYTE    byElementID;

    BYTE    len;

    unsigned char byElementID;

    unsigned char len;

    unsigned short wDwellTime;

    BYTE    byHopSet;

    BYTE    byHopPattern;

    BYTE    byHopIndex;

    unsigned char byHopSet;

    unsigned char byHopPattern;

    unsigned char byHopIndex;

} WLAN_IE_FH_PARMS,  *PWLAN_IE_FH_PARMS;



// DS Parameter Set

#pragma pack(1)

typedef struct tagWLAN_IE_DS_PARMS {

    BYTE   byElementID;

    BYTE   len;

    BYTE   byCurrChannel;

    unsigned char byElementID;

    unsigned char len;

    unsigned char byCurrChannel;

}__attribute__ ((__packed__))

WLAN_IE_DS_PARMS,  *PWLAN_IE_DS_PARMS;
@@ -281,10 +281,10 @@ WLAN_IE_DS_PARMS, *PWLAN_IE_DS_PARMS; 
// CF Parameter Set

#pragma pack(1)

typedef struct tagWLAN_IE_CF_PARMS {

    BYTE   byElementID;

    BYTE   len;

    BYTE   byCFPCount;

    BYTE   byCFPPeriod;

    unsigned char byElementID;

    unsigned char len;

    unsigned char byCFPCount;

    unsigned char byCFPPeriod;

    unsigned short wCFPMaxDuration;

    unsigned short wCFPDurRemaining;

}__attribute__ ((__packed__))
@@ -294,12 +294,12 @@ WLAN_IE_CF_PARMS, *PWLAN_IE_CF_PARMS; 
// TIM

#pragma pack(1)

typedef struct tagWLAN_IE_TIM {

    BYTE   byElementID;

    BYTE   len;

    BYTE   byDTIMCount;

    BYTE   byDTIMPeriod;

    BYTE   byBitMapCtl;

    BYTE   byVirtBitMap[1];

    unsigned char byElementID;

    unsigned char len;

    unsigned char byDTIMCount;

    unsigned char byDTIMPeriod;

    unsigned char byBitMapCtl;

    unsigned char byVirtBitMap[1];

}__attribute__ ((__packed__))

WLAN_IE_TIM,  *PWLAN_IE_TIM;
@@ -307,8 +307,8 @@ WLAN_IE_TIM, *PWLAN_IE_TIM; 
// IBSS Parameter Set

#pragma pack(1)

typedef struct tagWLAN_IE_IBSS_PARMS {

    BYTE   byElementID;

    BYTE   len;

    unsigned char byElementID;

    unsigned char len;

    unsigned short wATIMWindow;

}__attribute__ ((__packed__))

WLAN_IE_IBSS_PARMS, *PWLAN_IE_IBSS_PARMS;
@@ -317,23 +317,23 @@ WLAN_IE_IBSS_PARMS, *PWLAN_IE_IBSS_PARMS; 
// Challenge Text

#pragma pack(1)

typedef struct tagWLAN_IE_CHALLENGE {

    BYTE   byElementID;

    BYTE   len;

    BYTE   abyChallenge[1];

    unsigned char byElementID;

    unsigned char len;

    unsigned char abyChallenge[1];

}__attribute__ ((__packed__))

WLAN_IE_CHALLENGE,  *PWLAN_IE_CHALLENGE;





#pragma pack(1)

typedef struct tagWLAN_IE_RSN_EXT {

    BYTE byElementID;

    BYTE len;

    BYTE abyOUI[4];

    unsigned char byElementID;

    unsigned char len;

    unsigned char abyOUI[4];

    unsigned short wVersion;

    BYTE abyMulticast[4];

    unsigned char abyMulticast[4];

    unsigned short wPKCount;

    struct {

        BYTE abyOUI[4];

        unsigned char abyOUI[4];

    } PKSList[1]; // the rest is variable so need to

    // overlay ieauth structure

} WLAN_IE_RSN_EXT, *PWLAN_IE_RSN_EXT;
@@ -342,59 +342,59 @@ typedef struct tagWLAN_IE_RSN_EXT { 
typedef struct tagWLAN_IE_RSN_AUTH {

    unsigned short wAuthCount;

    struct {

        BYTE abyOUI[4];

        unsigned char abyOUI[4];

    } AuthKSList[1];

} WLAN_IE_RSN_AUTH, *PWLAN_IE_RSN_AUTH;



// RSN Identity

#pragma pack(1)

typedef struct tagWLAN_IE_RSN {

    BYTE   byElementID;

    BYTE   len;

    unsigned char byElementID;

    unsigned char len;

    unsigned short wVersion;

    BYTE   abyRSN[WLAN_MIN_ARRAY];

    unsigned char abyRSN[WLAN_MIN_ARRAY];

} WLAN_IE_RSN, *PWLAN_IE_RSN;





// ERP

#pragma pack(1)

typedef struct tagWLAN_IE_ERP {

    BYTE   byElementID;

    BYTE   len;

    BYTE   byContext;

    unsigned char byElementID;

    unsigned char len;

    unsigned char byContext;

}__attribute__ ((__packed__))

WLAN_IE_ERP,  *PWLAN_IE_ERP;





#pragma pack(1)

typedef struct _MEASEURE_REQ {

    BYTE                byChannel;

    BYTE                abyStartTime[8];

    BYTE                abyDuration[2];

    unsigned char byChannel;

    unsigned char abyStartTime[8];

    unsigned char abyDuration[2];

} MEASEURE_REQ, *PMEASEURE_REQ,

  MEASEURE_REQ_BASIC, *PMEASEURE_REQ_BASIC,

  MEASEURE_REQ_CCA, *PMEASEURE_REQ_CCA,

  MEASEURE_REQ_RPI, *PMEASEURE_REQ_RPI;



typedef struct _MEASEURE_REP_BASIC {

    BYTE                byChannel;

    BYTE                abyStartTime[8];

    BYTE                abyDuration[2];

    BYTE                byMap;

    unsigned char byChannel;

    unsigned char abyStartTime[8];

    unsigned char abyDuration[2];

    unsigned char byMap;

} MEASEURE_REP_BASIC, *PMEASEURE_REP_BASIC;



typedef struct _MEASEURE_REP_CCA {

    BYTE                byChannel;

    BYTE                abyStartTime[8];

    BYTE                abyDuration[2];

    BYTE                byCCABusyFraction;

    unsigned char byChannel;

    unsigned char abyStartTime[8];

    unsigned char abyDuration[2];

    unsigned char byCCABusyFraction;

} MEASEURE_REP_CCA, *PMEASEURE_REP_CCA;



typedef struct _MEASEURE_REP_RPI {

    BYTE                byChannel;

    BYTE                abyStartTime[8];

    BYTE                abyDuration[2];

    BYTE                abyRPIdensity[8];

    unsigned char byChannel;

    unsigned char abyStartTime[8];

    unsigned char abyDuration[2];

    unsigned char abyRPIdensity[8];

} MEASEURE_REP_RPI, *PMEASEURE_REP_RPI;



typedef union _MEASEURE_REP {
@@ -406,85 +406,85 @@ typedef union _MEASEURE_REP { 
} MEASEURE_REP, *PMEASEURE_REP;



typedef struct _WLAN_IE_MEASURE_REQ {

    BYTE                byElementID;

    BYTE                len;

    BYTE                byToken;

    BYTE                byMode;

    BYTE                byType;

    unsigned char byElementID;

    unsigned char len;

    unsigned char byToken;

    unsigned char byMode;

    unsigned char byType;

    MEASEURE_REQ        sReq;

} WLAN_IE_MEASURE_REQ, *PWLAN_IE_MEASURE_REQ;



typedef struct _WLAN_IE_MEASURE_REP {

    BYTE                byElementID;

    BYTE                len;

    BYTE                byToken;

    BYTE                byMode;

    BYTE                byType;

    unsigned char byElementID;

    unsigned char len;

    unsigned char byToken;

    unsigned char byMode;

    unsigned char byType;

    MEASEURE_REP        sRep;

} WLAN_IE_MEASURE_REP, *PWLAN_IE_MEASURE_REP;



typedef struct _WLAN_IE_CH_SW {

    BYTE                byElementID;

    BYTE                len;

    BYTE                byMode;

    BYTE                byChannel;

    BYTE                byCount;

    unsigned char byElementID;

    unsigned char len;

    unsigned char byMode;

    unsigned char byChannel;

    unsigned char byCount;

} WLAN_IE_CH_SW, *PWLAN_IE_CH_SW;



typedef struct _WLAN_IE_QUIET {

    BYTE                byElementID;

    BYTE                len;

    BYTE                byQuietCount;

    BYTE                byQuietPeriod;

    BYTE                abyQuietDuration[2];

    BYTE                abyQuietOffset[2];

    unsigned char byElementID;

    unsigned char len;

    unsigned char byQuietCount;

    unsigned char byQuietPeriod;

    unsigned char abyQuietDuration[2];

    unsigned char abyQuietOffset[2];

} WLAN_IE_QUIET, *PWLAN_IE_QUIET;



typedef struct _WLAN_IE_COUNTRY {

    BYTE                byElementID;

    BYTE                len;

    BYTE                abyCountryString[3];

    BYTE                abyCountryInfo[3];

    unsigned char byElementID;

    unsigned char len;

    unsigned char abyCountryString[3];

    unsigned char abyCountryInfo[3];

} WLAN_IE_COUNTRY, *PWLAN_IE_COUNTRY;



typedef struct _WLAN_IE_PW_CONST {

    BYTE                byElementID;

    BYTE                len;

    BYTE                byPower;

    unsigned char byElementID;

    unsigned char len;

    unsigned char byPower;

} WLAN_IE_PW_CONST, *PWLAN_IE_PW_CONST;



typedef struct _WLAN_IE_PW_CAP {

    BYTE                byElementID;

    BYTE                len;

    BYTE                byMinPower;

    BYTE                byMaxPower;

    unsigned char byElementID;

    unsigned char len;

    unsigned char byMinPower;

    unsigned char byMaxPower;

} WLAN_IE_PW_CAP, *PWLAN_IE_PW_CAP;



typedef struct _WLAN_IE_SUPP_CH {

    BYTE                byElementID;

    BYTE                len;

    BYTE                abyChannelTuple[2];

    unsigned char byElementID;

    unsigned char len;

    unsigned char abyChannelTuple[2];

} WLAN_IE_SUPP_CH, *PWLAN_IE_SUPP_CH;



typedef struct _WLAN_IE_TPC_REQ {

    BYTE                byElementID;

    BYTE                len;

    unsigned char byElementID;

    unsigned char len;

} WLAN_IE_TPC_REQ, *PWLAN_IE_TPC_REQ;



typedef struct _WLAN_IE_TPC_REP {

    BYTE                byElementID;

    BYTE                len;

    BYTE                byTxPower;

    BYTE                byLinkMargin;

    unsigned char byElementID;

    unsigned char len;

    unsigned char byTxPower;

    unsigned char byLinkMargin;

} WLAN_IE_TPC_REP, *PWLAN_IE_TPC_REP;





typedef struct _WLAN_IE_IBSS_DFS {

    BYTE                byElementID;

    BYTE                len;

    BYTE                abyDFSOwner[6];

    BYTE                byDFSRecovery;

    BYTE                abyChannelMap[2];

    unsigned char byElementID;

    unsigned char len;

    unsigned char abyDFSOwner[6];

    unsigned char byDFSRecovery;

    unsigned char abyChannelMap[2];

} WLAN_IE_IBSS_DFS, *PWLAN_IE_IBSS_DFS;



#pragma pack()

drivers/staging/vt6655/IEEE11h.c

+17 −17
Original line number Diff line number Diff line
@@ -47,40 +47,40 @@ static int msglevel =MSG_LEVEL_INFO; 


typedef struct _WLAN_FRAME_ACTION {

    WLAN_80211HDR_A3    Header;

    BYTE                byCategory;

    BYTE                byAction;

    BYTE                abyVars[1];

    unsigned char byCategory;

    unsigned char byAction;

    unsigned char abyVars[1];

} WLAN_FRAME_ACTION, *PWLAN_FRAME_ACTION;



typedef struct _WLAN_FRAME_MSRREQ {

    WLAN_80211HDR_A3    Header;

    BYTE                byCategory;

    BYTE                byAction;

    BYTE                byDialogToken;

    unsigned char byCategory;

    unsigned char byAction;

    unsigned char byDialogToken;

    WLAN_IE_MEASURE_REQ sMSRReqEIDs[1];

} WLAN_FRAME_MSRREQ, *PWLAN_FRAME_MSRREQ;



typedef struct _WLAN_FRAME_MSRREP {

    WLAN_80211HDR_A3    Header;

    BYTE                byCategory;

    BYTE                byAction;

    BYTE                byDialogToken;

    unsigned char byCategory;

    unsigned char byAction;

    unsigned char byDialogToken;

    WLAN_IE_MEASURE_REP sMSRRepEIDs[1];

} WLAN_FRAME_MSRREP, *PWLAN_FRAME_MSRREP;



typedef struct _WLAN_FRAME_TPCREQ {

    WLAN_80211HDR_A3    Header;

    BYTE                byCategory;

    BYTE                byAction;

    BYTE                byDialogToken;

    unsigned char byCategory;

    unsigned char byAction;

    unsigned char byDialogToken;

    WLAN_IE_TPC_REQ     sTPCReqEIDs;

} WLAN_FRAME_TPCREQ, *PWLAN_FRAME_TPCREQ;



typedef struct _WLAN_FRAME_TPCREP {

    WLAN_80211HDR_A3    Header;

    BYTE                byCategory;

    BYTE                byAction;

    BYTE                byDialogToken;

    unsigned char byCategory;

    unsigned char byAction;

    unsigned char byDialogToken;

    WLAN_IE_TPC_REP     sTPCRepEIDs;

} WLAN_FRAME_TPCREP, *PWLAN_FRAME_TPCREP;
@@ -118,7 +118,7 @@ static BOOL s_bRxMSRReq(PSMgmtObject pMgmt, PWLAN_FRAME_MSRREQ pMSRReq, 
}





static BOOL s_bRxTPCReq(PSMgmtObject pMgmt, PWLAN_FRAME_TPCREQ pTPCReq, BYTE byRate, BYTE byRSSI)

static BOOL s_bRxTPCReq(PSMgmtObject pMgmt, PWLAN_FRAME_TPCREQ pTPCReq, unsigned char byRate, unsigned char byRSSI)

{

    PWLAN_FRAME_TPCREP  pFrame;

    PSTxMgmtPacket      pTxPacket = NULL;
@@ -235,7 +235,7 @@ IEEE11hbMgrRxAction ( 
                return (s_bRxTPCReq(pMgmt,

                                    (PWLAN_FRAME_TPCREQ) pAction,

                                    ((PSRxMgmtPacket)pRxPacket)->byRxRate,

                                    (BYTE) ((PSRxMgmtPacket)pRxPacket)->uRSSI));

                                    (unsigned char) ((PSRxMgmtPacket)pRxPacket)->uRSSI));

                break;

            case ACTION_TPCREP:

                break;

drivers/staging/vt6655/aes_ccmp.c

+38 −38
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ 
 * SBOX Table

 */



BYTE sbox_table[256] =

unsigned char sbox_table[256] =

{

0x63, 0x7c, 0x77, 0x7b, 0xf2, 0x6b, 0x6f, 0xc5, 0x30, 0x01, 0x67, 0x2b, 0xfe, 0xd7, 0xab, 0x76,

0xca, 0x82, 0xc9, 0x7d, 0xfa, 0x59, 0x47, 0xf0, 0xad, 0xd4, 0xa2, 0xaf, 0x9c, 0xa4, 0x72, 0xc0,
@@ -66,7 +66,7 @@ BYTE sbox_table[256] = 
0x8c, 0xa1, 0x89, 0x0d, 0xbf, 0xe6, 0x42, 0x68, 0x41, 0x99, 0x2d, 0x0f, 0xb0, 0x54, 0xbb, 0x16

};



BYTE dot2_table[256] = {

unsigned char dot2_table[256] = {

0x00, 0x02, 0x04, 0x06, 0x08, 0x0a, 0x0c, 0x0e, 0x10, 0x12, 0x14, 0x16, 0x18, 0x1a, 0x1c, 0x1e,

0x20, 0x22, 0x24, 0x26, 0x28, 0x2a, 0x2c, 0x2e, 0x30, 0x32, 0x34, 0x36, 0x38, 0x3a, 0x3c, 0x3e,

0x40, 0x42, 0x44, 0x46, 0x48, 0x4a, 0x4c, 0x4e, 0x50, 0x52, 0x54, 0x56, 0x58, 0x5a, 0x5c, 0x5e,
@@ -85,7 +85,7 @@ BYTE dot2_table[256] = { 
0xfb, 0xf9, 0xff, 0xfd, 0xf3, 0xf1, 0xf7, 0xf5, 0xeb, 0xe9, 0xef, 0xed, 0xe3, 0xe1, 0xe7, 0xe5

};



BYTE dot3_table[256] = {

unsigned char dot3_table[256] = {

0x00, 0x03, 0x06, 0x05, 0x0c, 0x0f, 0x0a, 0x09, 0x18, 0x1b, 0x1e, 0x1d, 0x14, 0x17, 0x12, 0x11,

0x30, 0x33, 0x36, 0x35, 0x3c, 0x3f, 0x3a, 0x39, 0x28, 0x2b, 0x2e, 0x2d, 0x24, 0x27, 0x22, 0x21,

0x60, 0x63, 0x66, 0x65, 0x6c, 0x6f, 0x6a, 0x69, 0x78, 0x7b, 0x7e, 0x7d, 0x74, 0x77, 0x72, 0x71,
@@ -110,7 +110,7 @@ BYTE dot3_table[256] = { 


/*---------------------  Export Functions  --------------------------*/



void xor_128(BYTE *a, BYTE *b, BYTE *out)

void xor_128(unsigned char *a, unsigned char *b, unsigned char *out)

{

unsigned long *dwPtrA = (unsigned long *) a;

unsigned long *dwPtrB = (unsigned long *) b;
@@ -123,7 +123,7 @@ unsigned long *dwPtrOut =(unsigned long *) out; 
}





void xor_32(BYTE *a, BYTE *b, BYTE *out)

void xor_32(unsigned char *a, unsigned char *b, unsigned char *out)

{

unsigned long *dwPtrA = (unsigned long *) a;

unsigned long *dwPtrB = (unsigned long *) b;
@@ -132,10 +132,10 @@ unsigned long *dwPtrOut =(unsigned long *) out; 
    (*dwPtrOut++) = (*dwPtrA++) ^ (*dwPtrB++);

}



void AddRoundKey(BYTE *key, int round)

void AddRoundKey(unsigned char *key, int round)

{

BYTE sbox_key[4];

BYTE rcon_table[10] = { 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36};

unsigned char sbox_key[4];

unsigned char rcon_table[10] = { 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36};



    sbox_key[0] = sbox_table[key[13]];

    sbox_key[1] = sbox_table[key[14]];
@@ -150,7 +150,7 @@ BYTE rcon_table[10] = { 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x 
    xor_32(&key[12], &key[8], &key[12]);

}



void SubBytes(BYTE *in, BYTE *out)

void SubBytes(unsigned char *in, unsigned char *out)

{

int i;
@@ -160,7 +160,7 @@ int i; 
    }

}



void ShiftRows(BYTE *in, BYTE *out)

void ShiftRows(unsigned char *in, unsigned char *out)

{

    out[0]  = in[0];

    out[1]  = in[5];
@@ -180,7 +180,7 @@ void ShiftRows(BYTE *in, BYTE *out) 
    out[15] = in[11];

}



void MixColumns(BYTE *in, BYTE *out)

void MixColumns(unsigned char *in, unsigned char *out)

{



    out[0] = dot2_table[in[0]] ^ dot3_table[in[1]] ^ in[2] ^ in[3];
@@ -190,13 +190,13 @@ void MixColumns(BYTE *in, BYTE *out) 
}





void AESv128(BYTE *key, BYTE *data, BYTE *ciphertext)

void AESv128(unsigned char *key, unsigned char *data, unsigned char *ciphertext)

{

int  i;

int  round;

BYTE TmpdataA[16];

BYTE TmpdataB[16];

BYTE abyRoundKey[16];

unsigned char TmpdataA[16];

unsigned char TmpdataB[16];

unsigned char abyRoundKey[16];



    for(i=0; i<16; i++)

        abyRoundKey[i] = key[i];
@@ -245,15 +245,15 @@ BYTE abyRoundKey[16]; 
 */

BOOL AESbGenCCMP(unsigned char *pbyRxKey, unsigned char *pbyFrame, unsigned short wFrameSize)

{

BYTE            abyNonce[13];

BYTE            MIC_IV[16];

BYTE            MIC_HDR1[16];

BYTE            MIC_HDR2[16];

BYTE            abyMIC[16];

BYTE            abyCTRPLD[16];

BYTE            abyTmp[16];

BYTE            abyPlainText[16];

BYTE            abyLastCipher[16];

unsigned char abyNonce[13];

unsigned char MIC_IV[16];

unsigned char MIC_HDR1[16];

unsigned char MIC_HDR2[16];

unsigned char abyMIC[16];

unsigned char abyCTRPLD[16];

unsigned char abyTmp[16];

unsigned char abyPlainText[16];

unsigned char abyLastCipher[16];



PS802_11Header  pMACHeader = (PS802_11Header) pbyFrame;

unsigned char *pbyIV;
@@ -261,7 +261,7 @@ unsigned char *pbyPayload; 
unsigned short wHLen = 22;

unsigned short wPayloadSize = wFrameSize - 8 - 8 - 4 - WLAN_HDR_ADDR3_LEN;//8 is IV, 8 is MIC, 4 is CRC

BOOL            bA4 = FALSE;

BYTE            byTmp;

unsigned char byTmp;

unsigned short wCnt;

int             ii,jj,kk;
@@ -288,15 +288,15 @@ int ii,jj,kk; 
    //MIC_IV

    MIC_IV[0] = 0x59;

    memcpy(&(MIC_IV[1]), &(abyNonce[0]), 13);

    MIC_IV[14] = (BYTE)(wPayloadSize >> 8);

    MIC_IV[15] = (BYTE)(wPayloadSize & 0xff);

    MIC_IV[14] = (unsigned char)(wPayloadSize >> 8);

    MIC_IV[15] = (unsigned char)(wPayloadSize & 0xff);



    //MIC_HDR1

    MIC_HDR1[0] = (BYTE)(wHLen >> 8);

    MIC_HDR1[1] = (BYTE)(wHLen & 0xff);

    byTmp = (BYTE)(pMACHeader->wFrameCtl & 0xff);

    MIC_HDR1[0] = (unsigned char)(wHLen >> 8);

    MIC_HDR1[1] = (unsigned char)(wHLen & 0xff);

    byTmp = (unsigned char)(pMACHeader->wFrameCtl & 0xff);

    MIC_HDR1[2] = byTmp & 0x8f;

    byTmp = (BYTE)(pMACHeader->wFrameCtl >> 8);

    byTmp = (unsigned char)(pMACHeader->wFrameCtl >> 8);

    byTmp &= 0x87;

    MIC_HDR1[3] = byTmp | 0x40;

    memcpy(&(MIC_HDR1[4]), pMACHeader->abyAddr1, ETH_ALEN);
@@ -304,7 +304,7 @@ int ii,jj,kk; 


    //MIC_HDR2

    memcpy(&(MIC_HDR2[0]), pMACHeader->abyAddr3, ETH_ALEN);

    byTmp = (BYTE)(pMACHeader->wSeqCtl & 0xff);

    byTmp = (unsigned char)(pMACHeader->wSeqCtl & 0xff);

    MIC_HDR2[6] = byTmp & 0x0f;

    MIC_HDR2[7] = 0;

    if ( bA4 ) {
@@ -337,8 +337,8 @@ int ii,jj,kk; 


    for(jj=wPayloadSize; jj>16; jj=jj-16) {



        abyCTRPLD[14] = (BYTE) (wCnt >> 8);

        abyCTRPLD[15] = (BYTE) (wCnt & 0xff);

        abyCTRPLD[14] = (unsigned char) (wCnt >> 8);

        abyCTRPLD[15] = (unsigned char) (wCnt & 0xff);



        AESv128(pbyRxKey,abyCTRPLD,abyTmp);
@@ -361,8 +361,8 @@ int ii,jj,kk; 
        abyLastCipher[ii] = 0x00;

    }



    abyCTRPLD[14] = (BYTE) (wCnt >> 8);

    abyCTRPLD[15] = (BYTE) (wCnt & 0xff);

    abyCTRPLD[14] = (unsigned char) (wCnt >> 8);

    abyCTRPLD[15] = (unsigned char) (wCnt & 0xff);



    AESv128(pbyRxKey,abyCTRPLD,abyTmp);

    for ( kk=0; kk<16; kk++ ) {
@@ -384,8 +384,8 @@ int ii,jj,kk; 
    //--------------------------------------------



    wCnt = 0;

    abyCTRPLD[14] = (BYTE) (wCnt >> 8);

    abyCTRPLD[15] = (BYTE) (wCnt & 0xff);

    abyCTRPLD[14] = (unsigned char) (wCnt >> 8);

    abyCTRPLD[15] = (unsigned char) (wCnt & 0xff);

    AESv128(pbyRxKey,abyCTRPLD,abyTmp);

    for ( kk=0; kk<8; kk++ ) {

        abyTmp[kk] = abyTmp[kk] ^ pbyPayload[kk];

drivers/staging/vt6655/baseband.c

+43 −43

File changed.

Preview size limit exceeded, changes collapsed.