From 35fffb25c493911ef38429069807df28594ffc19 Mon Sep 17 00:00:00 2001 From: Biswapriyo Nath <[email protected]> Date: Sat, 29 Jul 2023 00:17:49 +0530 Subject: [PATCH] headers: Add missing symbols in wlantypes.h
Signed-off-by: Biswapriyo Nath <[email protected]> --- mingw-w64-headers/include/wlantypes.h | 58 +++++++++++++++++++++++++-- 1 file changed, 54 insertions(+), 4 deletions(-) diff --git a/mingw-w64-headers/include/wlantypes.h b/mingw-w64-headers/include/wlantypes.h index 65bf630..f1b0404 100644 --- a/mingw-w64-headers/include/wlantypes.h +++ b/mingw-w64-headers/include/wlantypes.h @@ -23,6 +23,17 @@ extern "C" { #define DOT11_AUTH_ALGORITHM_WPA_NONE DOT11_AUTH_ALGO_WPA_NONE #define DOT11_AUTH_ALGORITHM_RSNA DOT11_AUTH_ALGO_RSNA #define DOT11_AUTH_ALGORITHM_RSNA_PSK DOT11_AUTH_ALGO_RSNA_PSK +#define DOT11_AUTH_ALGORITHM_WPA3 DOT11_AUTH_ALGO_WPA3 +#if NTDDI_VERSION >= NTDDI_WIN10_FE +#define DOT11_AUTH_ALGORITHM_WPA3_ENT_192 DOT11_AUTH_ALGO_WPA3_ENT_192 +#endif +#define DOT11_AUTH_ALGORITHM_WPA3_SAE DOT11_AUTH_ALGO_WPA3_SAE +#if NTDDI_VERSION >= NTDDI_WIN10_VB +#define DOT11_AUTH_ALGORITHM_OWE DOT11_AUTH_ALGO_OWE +#endif +#if NTDDI_VERSION >= NTDDI_WIN10_FE +#define DOT11_AUTH_ALGORITHM_WPA3_ENT DOT11_AUTH_ALGO_WPA3_ENT +#endif #ifdef __WIDL__ typedef [v1_enum] enum _DOT11_AUTH_ALGORITHM { @@ -36,8 +47,19 @@ typedef enum _DOT11_AUTH_ALGORITHM { DOT11_AUTH_ALGO_WPA_NONE = 5, DOT11_AUTH_ALGO_RSNA = 6, DOT11_AUTH_ALGO_RSNA_PSK = 7, - DOT11_AUTH_ALGO_IHV_START = 0x80000000, - DOT11_AUTH_ALGO_IHV_END = 0xffffffff + DOT11_AUTH_ALGO_WPA3 = 8 +#if NTDDI_VERSION >= NTDDI_WIN10_FE + , DOT11_AUTH_ALGO_WPA3_ENT_192 = DOT11_AUTH_ALGO_WPA3 +#endif + , DOT11_AUTH_ALGO_WPA3_SAE = 9 +#if NTDDI_VERSION >= NTDDI_WIN10_VB + , DOT11_AUTH_ALGO_OWE = 10 +#endif +#if NTDDI_VERSION >= NTDDI_WIN10_FE + , DOT11_AUTH_ALGO_WPA3_ENT = 11 +#endif + , DOT11_AUTH_ALGO_IHV_START = 0x80000000 + , DOT11_AUTH_ALGO_IHV_END = 0xffffffff } DOT11_AUTH_ALGORITHM; typedef DOT11_AUTH_ALGORITHM *PDOT11_AUTH_ALGORITHM; @@ -52,11 +74,18 @@ typedef enum _DOT11_CIPHER_ALGORITHM { DOT11_CIPHER_ALGO_TKIP = 0x02, DOT11_CIPHER_ALGO_CCMP = 0x04, DOT11_CIPHER_ALGO_WEP104 = 0x05, + DOT11_CIPHER_ALGO_BIP = 0x06, + DOT11_CIPHER_ALGO_GCMP = 0x08, + DOT11_CIPHER_ALGO_GCMP_256 = 0x09, + DOT11_CIPHER_ALGO_CCMP_256 = 0x0a, + DOT11_CIPHER_ALGO_BIP_GMAC_128 = 0x0b, + DOT11_CIPHER_ALGO_BIP_GMAC_256 = 0x0c, + DOT11_CIPHER_ALGO_BIP_CMAC_256 = 0x0d, DOT11_CIPHER_ALGO_WPA_USE_GROUP = 0x100, DOT11_CIPHER_ALGO_RSN_USE_GROUP = 0x100, DOT11_CIPHER_ALGO_WEP = 0x101, DOT11_CIPHER_ALGO_IHV_START = 0x80000000, - DOT11_CIPHER_ALGO_IHV_END = 0xffffffff + DOT11_CIPHER_ALGO_IHV_END = 0xffffffff } DOT11_CIPHER_ALGORITHM; typedef DOT11_CIPHER_ALGORITHM *PDOT11_CIPHER_ALGORITHM; @@ -64,7 +93,7 @@ typedef DOT11_CIPHER_ALGORITHM *PDOT11_CIPHER_ALGORITHM; typedef enum _DOT11_BSS_TYPE { dot11_BSS_type_infrastructure = 1, dot11_BSS_type_independent = 2, - dot11_BSS_type_any = 3 + dot11_BSS_type_any = 3 } DOT11_BSS_TYPE, *PDOT11_BSS_TYPE; typedef struct _DOT11_AUTH_CIPHER_PAIR { @@ -72,11 +101,32 @@ typedef struct _DOT11_AUTH_CIPHER_PAIR { DOT11_CIPHER_ALGORITHM CipherAlgoId; } DOT11_AUTH_CIPHER_PAIR, *PDOT11_AUTH_CIPHER_PAIR; +#define DOT11_OI_MAX_LENGTH 5 +#define DOT11_OI_MIN_LENGTH 3 + +typedef struct _DOT11_OI { + USHORT OILength; + UCHAR OI[DOT11_OI_MAX_LENGTH]; +} DOT11_OI, *PDOT11_OI; + +typedef struct DOT11_ACCESSNETWORKOPTIONS { + UINT8 AccessNetworkType; + UINT8 Internet; + UINT8 ASRA; + UINT8 ESR; + UINT8 UESA; +} DOT11_ACCESSNETWORKOPTIONS, *PDOT11_ACCESSNETWORKOPTIONS; + typedef struct _DOT11_SSID { ULONG uSSIDLength; UCHAR ucSSID[DOT11_SSID_MAX_LENGTH]; } DOT11_SSID, *PDOT11_SSID; +typedef struct DOT11_VENUEINFO { + UINT8 VenueGroup; + UINT8 VenueType; +} DOT11_VENUEINFO, *PDOT11_VENUEINFO; + #ifdef __cplusplus } #endif -- 2.41.0
_______________________________________________ Mingw-w64-public mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
