bd17d4dbd0
- Chanaged default x.org configuration to disable glamor - Reintroduce patch to use DRM cursor plane as overlay in rk322x-current and -dev - Updated wifi patches for kernel 5.8.10 - Bumped rk322x to u-boot v2020.07, removed reserved zones from device trees - Updated OPTEE to v3.10, using ddrbin v1.10 - Bumped rk322x-current to kernel 5.8.y - Imported new patches from knaerzche's LibreELEC fork for rk322x-dev (kernel 5.8.y) - Adjusted existing patches to match changes, updated rk322x-dev kernel config file - Add default modprobe conf file for esp8089 to force the crystal frequency to 40Mhz for rk322x targets - Removed ssv6051 firmware packages to move to armbian-firmware repository - Switching ssv6051-wifi.cfg to /lib/firmware for rk322x-legacy - Removed P2P interface for esp8089 driver for rk322x-legacy - Optimized ssv6051 performance: kernel module gains -Os flag, disabled p2p interface, enabled HW crypto for CCMP cipher - Enabled remote control interface, IR GPIO kernel module and HDMI CEC modules
249 lines
8.9 KiB
Diff
249 lines
8.9 KiB
Diff
diff --git a/drivers/net/wireless/rtl8189es/include/rtw_security.h b/drivers/net/wireless/rtl8189es/include/rtw_security.h
|
|
index 5820a55..3e8e428 100644
|
|
--- a/drivers/net/wireless/rtl8189es/include/rtw_security.h
|
|
+++ b/drivers/net/wireless/rtl8189es/include/rtw_security.h
|
|
@@ -238,7 +238,7 @@ struct security_priv
|
|
#endif /* DBG_SW_SEC_CNT */
|
|
};
|
|
|
|
-struct sha256_state {
|
|
+struct rtl_sha256_state {
|
|
u64 length;
|
|
u32 state[8], curlen;
|
|
u8 buf[64];
|
|
diff --git a/drivers/net/wireless/rtl8189es/core/rtw_security.c b/drivers/net/wireless/rtl8189es/core/rtw_security.c
|
|
index 8dac771..9b3a1f9 100644
|
|
--- a/drivers/net/wireless/rtl8189es/core/rtw_security.c
|
|
+++ b/drivers/net/wireless/rtl8189es/core/rtw_security.c
|
|
@@ -2281,7 +2281,7 @@ BIP_exit:
|
|
|
|
#ifndef PLATFORM_FREEBSD
|
|
/* compress 512-bits */
|
|
-static int sha256_compress(struct sha256_state *md, unsigned char *buf)
|
|
+static int sha256_compress(struct rtl_sha256_state *md, unsigned char *buf)
|
|
{
|
|
u32 S[8], W[64], t0, t1;
|
|
u32 t;
|
|
@@ -2323,7 +2323,7 @@ static int sha256_compress(struct sha256_state *md, unsigned char *buf)
|
|
}
|
|
|
|
/* Initialize the hash state */
|
|
-static void sha256_init(struct sha256_state *md)
|
|
+static void sha256_init(struct rtl_sha256_state *md)
|
|
{
|
|
md->curlen = 0;
|
|
md->length = 0;
|
|
@@ -2344,7 +2344,7 @@ static void sha256_init(struct sha256_state *md)
|
|
@param inlen The length of the data (octets)
|
|
@return CRYPT_OK if successful
|
|
*/
|
|
-static int sha256_process(struct sha256_state *md, unsigned char *in,
|
|
+static int sha256_process(struct rtl_sha256_state *md, unsigned char *in,
|
|
unsigned long inlen)
|
|
{
|
|
unsigned long n;
|
|
@@ -2385,7 +2385,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
|
|
*/
|
|
-static int sha256_done(struct sha256_state *md, unsigned char *out)
|
|
+static int sha256_done(struct rtl_sha256_state *md, unsigned char *out)
|
|
{
|
|
int i;
|
|
|
|
@@ -2437,7 +2437,7 @@ static int sha256_done(struct sha256_state *md, unsigned char *out)
|
|
static int sha256_vector(size_t num_elem, u8 *addr[], size_t *len,
|
|
u8 *mac)
|
|
{
|
|
- struct sha256_state ctx;
|
|
+ struct rtl_sha256_state ctx;
|
|
size_t i;
|
|
|
|
sha256_init(&ctx);
|
|
diff --git a/drivers/net/wireless/rtl8811cu/include/rtw_security.h b/drivers/net/wireless/rtl8811cu/include/rtw_security.h
|
|
index ac8432e..5f74fb7 100755
|
|
--- a/drivers/net/wireless/rtl8811cu/include/rtw_security.h
|
|
+++ b/drivers/net/wireless/rtl8811cu/include/rtw_security.h
|
|
@@ -249,7 +249,7 @@ struct security_priv {
|
|
#define SEC_IS_BIP_KEY_INSTALLED(sec) _FALSE
|
|
#endif
|
|
|
|
-struct sha256_state {
|
|
+struct rtl_sha256_state {
|
|
u64 length;
|
|
u32 state[8], curlen;
|
|
u8 buf[64];
|
|
diff --git a/drivers/net/wireless/rtl8811cu/core/rtw_security.c b/drivers/net/wireless/rtl8811cu/core/rtw_security.c
|
|
index b537a26..f8c42f4 100755
|
|
--- a/drivers/net/wireless/rtl8811cu/core/rtw_security.c
|
|
+++ b/drivers/net/wireless/rtl8811cu/core/rtw_security.c
|
|
@@ -2133,7 +2133,7 @@ BIP_exit:
|
|
#ifndef PLATFORM_FREEBSD
|
|
#if defined(CONFIG_TDLS)
|
|
/* compress 512-bits */
|
|
-static int sha256_compress(struct sha256_state *md, unsigned char *buf)
|
|
+static int sha256_compress(struct rtl_sha256_state *md, unsigned char *buf)
|
|
{
|
|
u32 S[8], W[64], t0, t1;
|
|
u32 t;
|
|
@@ -2181,7 +2181,7 @@ static int sha256_compress(struct sha256_state *md, unsigned char *buf)
|
|
}
|
|
|
|
/* Initialize the hash state */
|
|
-static void sha256_init(struct sha256_state *md)
|
|
+static void sha256_init(struct rtl_sha256_state *md)
|
|
{
|
|
md->curlen = 0;
|
|
md->length = 0;
|
|
@@ -2202,7 +2202,7 @@ static void sha256_init(struct sha256_state *md)
|
|
@param inlen The length of the data (octets)
|
|
@return CRYPT_OK if successful
|
|
*/
|
|
-static int sha256_process(struct sha256_state *md, unsigned char *in,
|
|
+static int sha256_process(struct rtl_sha256_state *md, unsigned char *in,
|
|
unsigned long inlen)
|
|
{
|
|
unsigned long n;
|
|
@@ -2243,7 +2243,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
|
|
*/
|
|
-static int sha256_done(struct sha256_state *md, unsigned char *out)
|
|
+static int sha256_done(struct rtl_sha256_state *md, unsigned char *out)
|
|
{
|
|
int i;
|
|
|
|
@@ -2293,7 +2293,7 @@ static int sha256_done(struct sha256_state *md, unsigned char *out)
|
|
static int sha256_vector(size_t num_elem, u8 *addr[], size_t *len,
|
|
u8 *mac)
|
|
{
|
|
- struct sha256_state ctx;
|
|
+ struct rtl_sha256_state ctx;
|
|
size_t i;
|
|
|
|
sha256_init(&ctx);
|
|
diff --git a/drivers/net/wireless/rtl8188eu/include/rtw_security.h b/drivers/net/wireless/rtl8188eu/include/rtw_security.h
|
|
index 0adc700..2a9cf9d 100644
|
|
--- a/drivers/net/wireless/rtl8188eu/include/rtw_security.h
|
|
+++ b/drivers/net/wireless/rtl8188eu/include/rtw_security.h
|
|
@@ -249,7 +249,7 @@ struct security_priv {
|
|
#define SEC_IS_BIP_KEY_INSTALLED(sec) _FALSE
|
|
#endif
|
|
|
|
-struct sha256_state {
|
|
+struct rtl_sha256_state {
|
|
u64 length;
|
|
u32 state[8], curlen;
|
|
u8 buf[64];
|
|
diff --git a/drivers/net/wireless/rtl8188eu/core/rtw_security.c b/drivers/net/wireless/rtl8188eu/core/rtw_security.c
|
|
index 5807521..0b3eed2 100644
|
|
--- a/drivers/net/wireless/rtl8188eu/core/rtw_security.c
|
|
+++ b/drivers/net/wireless/rtl8188eu/core/rtw_security.c
|
|
@@ -2133,7 +2133,7 @@ BIP_exit:
|
|
#ifndef PLATFORM_FREEBSD
|
|
#if defined(CONFIG_TDLS)
|
|
/* compress 512-bits */
|
|
-static int sha256_compress(struct sha256_state *md, unsigned char *buf)
|
|
+static int sha256_compress(struct rtl_sha256_state *md, unsigned char *buf)
|
|
{
|
|
u32 S[8], W[64], t0, t1;
|
|
u32 t;
|
|
@@ -2181,7 +2181,7 @@ static int sha256_compress(struct sha256_state *md, unsigned char *buf)
|
|
}
|
|
|
|
/* Initialize the hash state */
|
|
-static void sha256_init(struct sha256_state *md)
|
|
+static void sha256_init(struct rtl_sha256_state *md)
|
|
{
|
|
md->curlen = 0;
|
|
md->length = 0;
|
|
@@ -2202,7 +2202,7 @@ static void sha256_init(struct sha256_state *md)
|
|
@param inlen The length of the data (octets)
|
|
@return CRYPT_OK if successful
|
|
*/
|
|
-static int sha256_process(struct sha256_state *md, unsigned char *in,
|
|
+static int sha256_process(struct rtl_sha256_state *md, unsigned char *in,
|
|
unsigned long inlen)
|
|
{
|
|
unsigned long n;
|
|
@@ -2243,7 +2243,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
|
|
*/
|
|
-static int sha256_done(struct sha256_state *md, unsigned char *out)
|
|
+static int sha256_done(struct rtl_sha256_state *md, unsigned char *out)
|
|
{
|
|
int i;
|
|
|
|
@@ -2293,7 +2293,7 @@ static int sha256_done(struct sha256_state *md, unsigned char *out)
|
|
static int sha256_vector(size_t num_elem, u8 *addr[], size_t *len,
|
|
u8 *mac)
|
|
{
|
|
- struct sha256_state ctx;
|
|
+ struct rtl_sha256_state ctx;
|
|
size_t i;
|
|
|
|
sha256_init(&ctx);
|
|
diff --git a/drivers/net/wireless/rtl88x2bu/include/rtw_security.h b/drivers/net/wireless/rtl88x2bu/include/rtw_security.h
|
|
index ac8432e..5f74fb7 100644
|
|
--- a/drivers/net/wireless/rtl88x2bu/include/rtw_security.h
|
|
+++ b/drivers/net/wireless/rtl88x2bu/include/rtw_security.h
|
|
@@ -249,7 +249,7 @@ struct security_priv {
|
|
#define SEC_IS_BIP_KEY_INSTALLED(sec) _FALSE
|
|
#endif
|
|
|
|
-struct sha256_state {
|
|
+struct rtl_sha256_state {
|
|
u64 length;
|
|
u32 state[8], curlen;
|
|
u8 buf[64];
|
|
diff --git a/drivers/net/wireless/rtl88x2bu/core/rtw_security.c b/drivers/net/wireless/rtl88x2bu/core/rtw_security.c
|
|
index b537a26..f8c42f4 100644
|
|
--- a/drivers/net/wireless/rtl88x2bu/core/rtw_security.c
|
|
+++ b/drivers/net/wireless/rtl88x2bu/core/rtw_security.c
|
|
@@ -2133,7 +2133,7 @@ BIP_exit:
|
|
#ifndef PLATFORM_FREEBSD
|
|
#if defined(CONFIG_TDLS)
|
|
/* compress 512-bits */
|
|
-static int sha256_compress(struct sha256_state *md, unsigned char *buf)
|
|
+static int sha256_compress(struct rtl_sha256_state *md, unsigned char *buf)
|
|
{
|
|
u32 S[8], W[64], t0, t1;
|
|
u32 t;
|
|
@@ -2181,7 +2181,7 @@ static int sha256_compress(struct sha256_state *md, unsigned char *buf)
|
|
}
|
|
|
|
/* Initialize the hash state */
|
|
-static void sha256_init(struct sha256_state *md)
|
|
+static void sha256_init(struct rtl_sha256_state *md)
|
|
{
|
|
md->curlen = 0;
|
|
md->length = 0;
|
|
@@ -2202,7 +2202,7 @@ static void sha256_init(struct sha256_state *md)
|
|
@param inlen The length of the data (octets)
|
|
@return CRYPT_OK if successful
|
|
*/
|
|
-static int sha256_process(struct sha256_state *md, unsigned char *in,
|
|
+static int sha256_process(struct rtl_sha256_state *md, unsigned char *in,
|
|
unsigned long inlen)
|
|
{
|
|
unsigned long n;
|
|
@@ -2243,7 +2243,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
|
|
*/
|
|
-static int sha256_done(struct sha256_state *md, unsigned char *out)
|
|
+static int sha256_done(struct rtl_sha256_state *md, unsigned char *out)
|
|
{
|
|
int i;
|
|
|
|
@@ -2293,7 +2293,7 @@ static int sha256_done(struct sha256_state *md, unsigned char *out)
|
|
static int sha256_vector(size_t num_elem, u8 *addr[], size_t *len,
|
|
u8 *mac)
|
|
{
|
|
- struct sha256_state ctx;
|
|
+ struct rtl_sha256_state ctx;
|
|
size_t i;
|
|
|
|
sha256_init(&ctx);
|