mirror of
https://github.com/armbian/build.git
synced 2025-08-13 22:56:57 +02:00
3b3d85e25c
* Bump imx6 edge to 5.12.y * Bump odroid xu4 edge to 5.12.y * Bump Jetson nano edge to 5.12.y * WIP: Bump sunxi to 5.12.y - create a copy of patches and make a new link - wireless patches needs adjutement to 5.12 - some patches are still failing * Adjust wireless patches to build on 5.12.y * Remove template wireless patch * Move Espressobin edge to 5.12.y * Bump mvebu to 5.12 - patch 92-mvebu-gpio-remove-hardcoded-timer-assignment.patch was disabled @heisath - adjusted wireless driver for 8723ds * Adjust sunxi / sunxi64 edge to compile * Fix kernel config for Jetson nano edge * bump meson64 to 5.12.y * bump rockchip edge to 5.12.y * Bump rockchip64 to 5.12.y * Bump rk322x edge to 5.12.y @paolosabatino * Cleanup im6, re-add 5.10.y patches since one is missing in 5.12.y * Update odroidxu4 edge links * rk322x: moved rk322x-edge to kernel 5.12, fix overlay compilation, retouched included kernel modules * Cleanup: remove deprecated config Co-authored-by: Paolo Sabatino <paolo.sabatino@gmail.com>
63 lines
2.2 KiB
Diff
63 lines
2.2 KiB
Diff
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);
|