mirrors/rtl8812au
1
0
Fork 0
mirror of https://github.com/aircrack-ng/rtl8812au.git synced 2024-11-30 00:47:38 +00:00
Code Releases Activity

Use endian macros from kernel + removed spaces

Browse Source
This commit is contained in:
Christian kimocoder 2017-10-24 15:10:27 +02:00 committed by GitHub
parent c7f1aeb257
commit 4615068c76
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/rtw_security.h
View File

@ -20,7 +20,6 @@
#ifndef __RTW_SECURITY_H_ #ifndef __RTW_SECURITY_H_
#define __RTW_SECURITY_H_ #define __RTW_SECURITY_H_
#define _NO_PRIVACY_ 0x0 #define _NO_PRIVACY_ 0x0
#define _WEP40_ 0x1 #define _WEP40_ 0x1
#define _TKIP_ 0x2 #define _TKIP_ 0x2
@ -63,7 +62,6 @@ typedef enum {
ENCRYP_PROTOCOL_MAX ENCRYP_PROTOCOL_MAX
} ENCRYP_PROTOCOL_E; } ENCRYP_PROTOCOL_E;
#ifndef Ndis802_11AuthModeWPA2 #ifndef Ndis802_11AuthModeWPA2
#define Ndis802_11AuthModeWPA2 (Ndis802_11AuthModeWPANone + 1) #define Ndis802_11AuthModeWPA2 (Ndis802_11AuthModeWPANone + 1)
#endif #endif
@ -76,7 +74,7 @@ union pn48 {
u64 val; u64 val;
#ifdef CONFIG_LITTLE_ENDIAN #ifdef __LITTLE_ENDIAN
struct { struct {
u8 TSC0; u8 TSC0;
@ -89,7 +87,7 @@ struct {
u8 TSC7; u8 TSC7;
} _byte_; } _byte_;
#elif defined(CONFIG_BIG_ENDIAN) #else
struct { struct {
u8 TSC7; u8 TSC7;
@ -111,7 +109,6 @@ union Keytype {
u32 lkey[4]; u32 lkey[4];
}; };
typedef struct _RT_PMKID_LIST { typedef struct _RT_PMKID_LIST {
u8 bUsed; u8 bUsed;
u8 Bssid[6]; u8 Bssid[6];
@ -121,7 +118,6 @@ typedef struct _RT_PMKID_LIST {
u16 ssid_length; u16 ssid_length;
} RT_PMKID_LIST, *PRT_PMKID_LIST; } RT_PMKID_LIST, *PRT_PMKID_LIST;
struct security_priv { struct security_priv {
u32 dot11AuthAlgrthm; /* 802.11 auth, could be open, shared, 8021x and authswitch */ u32 dot11AuthAlgrthm; /* 802.11 auth, could be open, shared, 8021x and authswitch */
u32 dot11PrivacyAlgrthm; /* This specify the privacy for shared auth. algorithm. */ u32 dot11PrivacyAlgrthm; /* This specify the privacy for shared auth. algorithm. */
@ -162,7 +158,6 @@ struct security_priv {
u8 wps_ie[MAX_WPS_IE_LEN];/* added in assoc req */ u8 wps_ie[MAX_WPS_IE_LEN];/* added in assoc req */
int wps_ie_len; int wps_ie_len;
u8 binstallGrpkey; u8 binstallGrpkey;
#ifdef CONFIG_GTK_OL #ifdef CONFIG_GTK_OL
u8 binstallKCK_KEK; u8 binstallKCK_KEK;
@ -182,7 +177,6 @@ struct security_priv {
s32 hw_decrypted;/* if the rx packets is hw_decrypted==_FALSE, it means the hw has not been ready. */ s32 hw_decrypted;/* if the rx packets is hw_decrypted==_FALSE, it means the hw has not been ready. */
/* keeps the auth_type & enc_status from upper layer ioctl(wpa_supplicant or wzc) */ /* keeps the auth_type & enc_status from upper layer ioctl(wpa_supplicant or wzc) */
u32 ndisauthtype; /* NDIS_802_11_AUTHENTICATION_MODE */ u32 ndisauthtype; /* NDIS_802_11_AUTHENTICATION_MODE */
u32 ndisencryptstatus; /* NDIS_802_11_ENCRYPTION_STATUS */ u32 ndisencryptstatus; /* NDIS_802_11_ENCRYPTION_STATUS */
@ -198,7 +192,6 @@ struct security_priv {
u8 authenticator_ie[256]; /* store ap security information element */ u8 authenticator_ie[256]; /* store ap security information element */
u8 supplicant_ie[256]; /* store sta security information element */ u8 supplicant_ie[256]; /* store sta security information element */
/* for tkip countermeasure */ /* for tkip countermeasure */
u32 last_mic_err_time; u32 last_mic_err_time;
u8 btkip_countermeasure; u8 btkip_countermeasure;
@ -297,7 +290,6 @@ struct sha256_state {
} \ } \
} while (0) } while (0)
#define GET_TKIP_PN(iv, dot11txpn)\ #define GET_TKIP_PN(iv, dot11txpn)\
do {\ do {\
dot11txpn._byte_.TSC0 = iv[2];\ dot11txpn._byte_.TSC0 = iv[2];\
@ -308,7 +300,6 @@ struct sha256_state {
dot11txpn._byte_.TSC5 = iv[7];\ dot11txpn._byte_.TSC5 = iv[7];\
} while (0) } while (0)
#define ROL32(A, n) (((A) << (n)) | (((A)>>(32-(n))) & ((1UL << (n)) - 1))) #define ROL32(A, n) (((A) << (n)) | (((A)>>(32-(n))) & ((1UL << (n)) - 1)))
#define ROR32(A, n) ROL32((A), 32-(n)) #define ROR32(A, n) ROL32((A), 32-(n))
@ -425,7 +416,6 @@ static const unsigned long K[64] = {
0x90befffaUL, 0xa4506cebUL, 0xbef9a3f7UL, 0xc67178f2UL 0x90befffaUL, 0xa4506cebUL, 0xbef9a3f7UL, 0xc67178f2UL
}; };
/* Various logical functions */ /* Various logical functions */
#define RORc(x, y) \ #define RORc(x, y) \
(((((unsigned long) (x) & 0xFFFFFFFFUL) >> (unsigned long) ((y) & 31)) | \ (((((unsigned long) (x) & 0xFFFFFFFFUL) >> (unsigned long) ((y) & 31)) | \