sim1222/rtl8188eus
1
0
Fork 0
mirror of https://github.com/drygdryg/rtl8188eus.git synced 2025-04-29 02:37:16 +09:00
Code Issues Projects Releases Wiki Activity

Merge branch 'v5.3.9' into v5.3.9

Browse Source
This commit is contained in:
darkalexpp 2020-10-01 07:20:55 -05:00 committed by GitHub
commit 46f55fb6f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
.gitgnore Normal file
View File

2
README.md
View File

@ -18,7 +18,7 @@
* MESH Support
* Monitor mode
* Frame injection
* Up to kernel v5.3+
* Up to kernel v5.8+
... And a bunch of various wifi chipsets
# Howto build/install

17
core/rtw_security.c
View File

@ -2133,6 +2133,7 @@ BIP_exit:
#ifndef PLATFORM_FREEBSD
#if defined(CONFIG_TDLS)
/* compress 512-bits */
#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0))
static int sha256_compress(struct sha256_state *md, unsigned char *buf)
{
u32 S[8], W[64], t0, t1;
@ -2179,8 +2180,10 @@ static int sha256_compress(struct sha256_state *md, unsigned char *buf)
md->state[i] = md->state[i] + S[i];
return 0;
}
#endif
/* Initialize the hash state */
#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0))
static void sha256_init(struct sha256_state *md)
{
md->curlen = 0;
@ -2194,6 +2197,7 @@ static void sha256_init(struct sha256_state *md)
md->state[6] = 0x1F83D9ABUL;
md->state[7] = 0x5BE0CD19UL;
}
#endif
/**
Process a block of memory though the hash
@ -2202,6 +2206,8 @@ static void sha256_init(struct sha256_state *md)
@param inlen The length of the data (octets)
@return CRYPT_OK if successful
*/
#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0))
static int sha256_process(struct sha256_state *md, unsigned char *in,
unsigned long inlen)
{
@ -2235,7 +2241,7 @@ static int sha256_process(struct sha256_state *md, unsigned char *in,
return 0;
}
#endif
/**
Terminate the hash to get the digest
@ -2243,6 +2249,7 @@ static int sha256_process(struct sha256_state *md, unsigned char *in,
@param out [out] The destination of the hash (32 bytes)
@return CRYPT_OK if successful
*/
#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0))
static int sha256_done(struct sha256_state *md, unsigned char *out)
{
int i;
@ -2281,6 +2288,7 @@ static int sha256_done(struct sha256_state *md, unsigned char *out)
return 0;
}
#endif
/**
* sha256_vector - SHA256 hash for data vector
@ -2290,6 +2298,8 @@ static int sha256_done(struct sha256_state *md, unsigned char *out)
* @mac: Buffer for the hash
* Returns: 0 on success, -1 of failure
*/
#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0))
static int sha256_vector(size_t num_elem, u8 *addr[], size_t *len,
u8 *mac)
{
@ -2304,6 +2314,7 @@ static int sha256_vector(size_t num_elem, u8 *addr[], size_t *len,
return -1;
return 0;
}
#endif
static u8 os_strlen(const char *s)
{
@ -2344,6 +2355,7 @@ static int os_memcmp(const void *s1, const void *s2, u8 n)
* @mac: Buffer for the hash (32 bytes)
*/
#if defined(CONFIG_TDLS)
#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0))
static void hmac_sha256_vector(u8 *key, size_t key_len, size_t num_elem,
u8 *addr[], size_t *len, u8 *mac)
{
@ -2405,6 +2417,7 @@ static void hmac_sha256_vector(u8 *key, size_t key_len, size_t num_elem,
_len[1] = 32;
sha256_vector(2, _addr, _len, mac);
}
#endif
#endif /* CONFIG_TDLS */
#endif /* PLATFORM_FREEBSD */
/**
@ -2422,6 +2435,7 @@ static void hmac_sha256_vector(u8 *key, size_t key_len, size_t num_elem,
*/
#ifndef PLATFORM_FREEBSD /* Baron */
#if defined(CONFIG_TDLS)
#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0))
static void sha256_prf(u8 *key, size_t key_len, char *label,
u8 *data, size_t data_len, u8 *buf, size_t buf_len)
{
@ -2459,6 +2473,7 @@ static void sha256_prf(u8 *key, size_t key_len, char *label,
}
}
#endif
#endif
#endif /* PLATFORM_FREEBSD Baron */
/* AES tables*/

15
os_dep/linux/ioctl_cfg80211.c
View File

@ -7101,6 +7101,10 @@ static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy,
#endif
{
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0))
u32 rtw_mask = BIT(IEEE80211_STYPE_PROBE_REQ >> 4);
#endif
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0))
struct net_device *ndev = wdev_to_ndev(wdev);
#endif
@ -7121,8 +7125,13 @@ static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy,
pwdev_priv = adapter_wdev_data(adapter);
#ifdef CONFIG_DEBUG_CFG80211
#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0))
RTW_INFO(FUNC_ADPT_FMT" frame_type:%x, reg:%d\n", FUNC_ADPT_ARG(adapter),
frame_type, reg);
#else
RTW_INFO(FUNC_ADPT_FMT " old_regs:%x new_regs:%x\n",
FUNC_ADPT_ARG(adapter), pwdev_priv->mgmt_mask, upd->interface_stypes);
#endif
#endif
/* Wait QC Verify */
@ -7143,6 +7152,12 @@ static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy,
default:
break;
}
#else
if ((upd->interface_stypes & rtw_mask) == (pwdev_priv->mgmt_mask & rtw_mask))
return;
pwdev_priv->mgmt_mask = upd->interface_stypes;
#endif
exit:
return;

4
os_dep/linux/ioctl_cfg80211.h
View File

@ -168,6 +168,10 @@ struct rtw_wdev_priv {
bool block_scan;
bool power_mgmt;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,8,0)
u32 mgmt_mask;
#endif
/* report mgmt_frame registered */
u16 report_mgmt;