Commit efc83959 authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman
Browse files

staging: vt6656: dead code remove wpa2.c 



Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1184337b

drivers/staging/vt6656/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ vt6656_stage-y += main_usb.o \ 
			wctl.o  \

			80211mgr.o \

			wcmd.o\

			wpa2.o \

			rxtx.o \

			dpc.o \

			power.o \

drivers/staging/vt6656/wmgr.h

+0 −2
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ 
#include "80211hdr.h"

#include "wcmd.h"

#include "bssdb.h"

#include "wpa2.h"

#include "card.h"



// Scan time
@@ -324,7 +323,6 @@ struct vnt_manager { 
	KnownNodeDB sNodeDBTable[MAX_NODE_NUM + 1];



	/* WPA2 PMKID Cache */

	SPMKIDCache gsPMKIDCache;

	int bRoaming;



	/* associate info */

drivers/staging/vt6656/wpa2.c

deleted100644 → 0
+0 −235
Original line number Diff line number Diff line 
/*

 * Copyright (c) 1996, 2003 VIA Networking Technologies, Inc.

 * All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License along

 * with this program; if not, write to the Free Software Foundation, Inc.,

 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

 *

 *

 * File: wpa2.c

 *

 * Purpose: Handles the Basic Service Set & Node Database functions

 *

 * Functions:

 *

 * Revision History:

 *

 * Author: Yiching Chen

 *

 * Date: Oct. 4, 2004

 *

 */



#include "device.h"

#include "wpa2.h"



static int          msglevel                =MSG_LEVEL_INFO;

//static int          msglevel                =MSG_LEVEL_DEBUG;



static const u8 abyOUIGK[4]      = { 0x00, 0x0F, 0xAC, 0x00 };

static const u8 abyOUIWEP40[4]   = { 0x00, 0x0F, 0xAC, 0x01 };

static const u8 abyOUIWEP104[4]  = { 0x00, 0x0F, 0xAC, 0x05 };

static const u8 abyOUITKIP[4]    = { 0x00, 0x0F, 0xAC, 0x02 };

static const u8 abyOUICCMP[4]    = { 0x00, 0x0F, 0xAC, 0x04 };



static const u8 abyOUI8021X[4]   = { 0x00, 0x0F, 0xAC, 0x01 };

static const u8 abyOUIPSK[4]     = { 0x00, 0x0F, 0xAC, 0x02 };



/*+

 *

 * Description:

 *    Clear RSN information in BSSList.

 *

 * Parameters:

 *  In:

 *      pBSSNode - BSS list.

 *  Out:

 *      none

 *

 * Return Value: none.

 *

-*/

void

WPA2_ClearRSN (

     PKnownBSS        pBSSNode

    )

{

    int ii;



    pBSSNode->bWPA2Valid = false;



    pBSSNode->byCSSGK = WLAN_11i_CSS_CCMP;

    for (ii=0; ii < 4; ii ++)

        pBSSNode->abyCSSPK[ii] = WLAN_11i_CSS_CCMP;

    pBSSNode->wCSSPKCount = 1;

    for (ii=0; ii < 4; ii ++)

        pBSSNode->abyAKMSSAuthType[ii] = WLAN_11i_AKMSS_802_1X;

    pBSSNode->wAKMSSAuthCount = 1;

    pBSSNode->sRSNCapObj.bRSNCapExist = false;

    pBSSNode->sRSNCapObj.wRSNCap = 0;

}



/*+

 *

 * Description:

 *    Parse RSN IE.

 *

 * Parameters:

 *  In:

 *      pBSSNode - BSS list.

 *      pRSN - Pointer to the RSN IE.

 *  Out:

 *      none

 *

 * Return Value: none.

 *

-*/

void

WPA2vParseRSN (

     PKnownBSS        pBSSNode,

     PWLAN_IE_RSN     pRSN

    )

{

    int                 i, j;

    u16                m = 0, n = 0;

    u8 *               pbyOUI;

    bool                bUseGK = false;



    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"WPA2_ParseRSN: [%d]\n", pRSN->len);



    WPA2_ClearRSN(pBSSNode);



    if (pRSN->len == 2) { // ver(2)

        if ((pRSN->byElementID == WLAN_EID_RSN) && (pRSN->wVersion == 1)) {

            pBSSNode->bWPA2Valid = true;

        }

        return;

    }



    if (pRSN->len < 6) { // ver(2) + GK(4)

        // invalid CSS, P802.11i/D10.0, p31

        return;

    }



    // information element header makes sense

    if ((pRSN->byElementID == WLAN_EID_RSN) &&

        (pRSN->wVersion == 1)) {



        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Legal 802.11i RSN\n");



        pbyOUI = &(pRSN->abyRSN[0]);

        if ( !memcmp(pbyOUI, abyOUIWEP40, 4))

            pBSSNode->byCSSGK = WLAN_11i_CSS_WEP40;

        else if ( !memcmp(pbyOUI, abyOUITKIP, 4))

            pBSSNode->byCSSGK = WLAN_11i_CSS_TKIP;

        else if ( !memcmp(pbyOUI, abyOUICCMP, 4))

            pBSSNode->byCSSGK = WLAN_11i_CSS_CCMP;

        else if ( !memcmp(pbyOUI, abyOUIWEP104, 4))

            pBSSNode->byCSSGK = WLAN_11i_CSS_WEP104;

        else if ( !memcmp(pbyOUI, abyOUIGK, 4)) {

            // invalid CSS, P802.11i/D10.0, p32

            return;

        } else

            // any vendor checks here

            pBSSNode->byCSSGK = WLAN_11i_CSS_UNKNOWN;



        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"802.11i CSS: %X\n", pBSSNode->byCSSGK);



        if (pRSN->len == 6) {

            pBSSNode->bWPA2Valid = true;

            return;

        }



        if (pRSN->len >= 8) { // ver(2) + GK(4) + PK count(2)

            pBSSNode->wCSSPKCount = *((u16 *) &(pRSN->abyRSN[4]));

            j = 0;

            pbyOUI = &(pRSN->abyRSN[6]);



            for (i = 0; (i < pBSSNode->wCSSPKCount) && (j < sizeof(pBSSNode->abyCSSPK)/sizeof(u8)); i++) {



                if (pRSN->len >= 8+i*4+4) { // ver(2)+GK(4)+PKCnt(2)+PKS(4*i)

                    if ( !memcmp(pbyOUI, abyOUIGK, 4)) {

                        pBSSNode->abyCSSPK[j++] = WLAN_11i_CSS_USE_GROUP;

                        bUseGK = true;

                    } else if ( !memcmp(pbyOUI, abyOUIWEP40, 4)) {

                        // Invalid CSS, continue parsing

                    } else if ( !memcmp(pbyOUI, abyOUITKIP, 4)) {

                        if (pBSSNode->byCSSGK != WLAN_11i_CSS_CCMP)

                            pBSSNode->abyCSSPK[j++] = WLAN_11i_CSS_TKIP;

                        else

                            ; // Invalid CSS, continue parsing

                    } else if ( !memcmp(pbyOUI, abyOUICCMP, 4)) {

                        pBSSNode->abyCSSPK[j++] = WLAN_11i_CSS_CCMP;

                    } else if ( !memcmp(pbyOUI, abyOUIWEP104, 4)) {

                        // Invalid CSS, continue parsing

                    } else {

                        // any vendor checks here

                        pBSSNode->abyCSSPK[j++] = WLAN_11i_CSS_UNKNOWN;

                    }

                    pbyOUI += 4;

                    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"abyCSSPK[%d]: %X\n", j-1, pBSSNode->abyCSSPK[j-1]);

                } else

                    break;

            } //for



            if (bUseGK == true) {

                if (j != 1) {

                    // invalid CSS, This should be only PK CSS.

                    return;

                }

                if (pBSSNode->byCSSGK == WLAN_11i_CSS_CCMP) {

                    // invalid CSS, If CCMP is enable , PK can't be CSSGK.

                    return;

                }

            }

            if ((pBSSNode->wCSSPKCount != 0) && (j == 0)) {

                // invalid CSS, No valid PK.

                return;

            }

            pBSSNode->wCSSPKCount = (u16)j;

            DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"wCSSPKCount: %d\n", pBSSNode->wCSSPKCount);

        }



        m = *((u16 *) &(pRSN->abyRSN[4]));



        if (pRSN->len >= 10+m*4) { // ver(2) + GK(4) + PK count(2) + PKS(4*m) + AKMSS count(2)

            pBSSNode->wAKMSSAuthCount = *((u16 *) &(pRSN->abyRSN[6+4*m]));

            j = 0;

            pbyOUI = &(pRSN->abyRSN[8+4*m]);

            for (i = 0; (i < pBSSNode->wAKMSSAuthCount) && (j < sizeof(pBSSNode->abyAKMSSAuthType)/sizeof(u8)); i++) {

                if (pRSN->len >= 10+(m+i)*4+4) { // ver(2)+GK(4)+PKCnt(2)+PKS(4*m)+AKMSS(2)+AKS(4*i)

                    if ( !memcmp(pbyOUI, abyOUI8021X, 4))

                        pBSSNode->abyAKMSSAuthType[j++] = WLAN_11i_AKMSS_802_1X;

                    else if ( !memcmp(pbyOUI, abyOUIPSK, 4))

                        pBSSNode->abyAKMSSAuthType[j++] = WLAN_11i_AKMSS_PSK;

                    else

                        // any vendor checks here

                        pBSSNode->abyAKMSSAuthType[j++] = WLAN_11i_AKMSS_UNKNOWN;

                    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"abyAKMSSAuthType[%d]: %X\n", j-1, pBSSNode->abyAKMSSAuthType[j-1]);

                } else

                    break;

            }

            pBSSNode->wAKMSSAuthCount = (u16)j;

            DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"wAKMSSAuthCount: %d\n", pBSSNode->wAKMSSAuthCount);



            n = *((u16 *) &(pRSN->abyRSN[6+4*m]));

            if (pRSN->len >= 12+4*m+4*n) { // ver(2)+GK(4)+PKCnt(2)+PKS(4*m)+AKMSSCnt(2)+AKMSS(4*n)+Cap(2)

                pBSSNode->sRSNCapObj.bRSNCapExist = true;

                pBSSNode->sRSNCapObj.wRSNCap = *((u16 *) &(pRSN->abyRSN[8+4*m+4*n]));

            }

        }

        //ignore PMKID lists bcs only (Re)Assocrequest has this field

        pBSSNode->bWPA2Valid = true;

    }

}

drivers/staging/vt6656/wpa2.h

deleted100644 → 0
+0 −53
Original line number Diff line number Diff line 
/*

 * Copyright (c) 1996, 2003 VIA Networking Technologies, Inc.

 * All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License along

 * with this program; if not, write to the Free Software Foundation, Inc.,

 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

 *

 *

 * File: wpa2.h

 *

 * Purpose: Defines the macros, types, and functions for dealing

 *          with WPA2 informations.

 *

 * Author: Yiching Chen

 *

 * Date: Oct. 4, 2004

 *

 */



#ifndef __WPA2_H__

#define __WPA2_H__



#include "80211mgr.h"

#include "80211hdr.h"

#include "bssdb.h"



#define MAX_PMKID_CACHE         16



typedef struct tagsPMKIDInfo {

    u8    abyBSSID[6];

    u8    abyPMKID[16];

} PMKIDInfo, *PPMKIDInfo;



typedef struct tagSPMKIDCache {

	u32 BSSIDInfoCount;

	PMKIDInfo BSSIDInfo[MAX_PMKID_CACHE];

} SPMKIDCache, *PSPMKIDCache;



void WPA2_ClearRSN(PKnownBSS pBSSNode);

void WPA2vParseRSN(PKnownBSS pBSSNode, PWLAN_IE_RSN pRSN);



#endif /* __WPA2_H__ */