1*4882a593SmuzhiyunFrom 19aee91e45788d594615a9be58fa5d0879ec816a Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: youcai <omegacoleman@gmail.com> 3*4882a593SmuzhiyunDate: Tue, 18 Aug 2020 00:43:16 +0800 4*4882a593SmuzhiyunSubject: [PATCH] rename sha256_state to rtl_sha256_state to avoid name 5*4882a593Smuzhiyun conflict with crypto 6*4882a593Smuzhiyun 7*4882a593Smuzhiyun[Upstream: https://github.com/abperiasamy/rtl8812AU_8821AU_linux/pull/338/commits/af6f6c1578f16145478326a939bb7593bbcdb4e7.patch] 8*4882a593SmuzhiyunSigned-off-by: Coleman <omegacoleman@gmail.com> 9*4882a593SmuzhiyunSigned-off-by: Christian Stewart <christian@paral.in> 10*4882a593Smuzhiyun--- 11*4882a593Smuzhiyun core/rtw_security.c | 10 +++++----- 12*4882a593Smuzhiyun include/rtw_security.h | 2 +- 13*4882a593Smuzhiyun 2 files changed, 6 insertions(+), 6 deletions(-) 14*4882a593Smuzhiyun 15*4882a593Smuzhiyundiff --git a/core/rtw_security.c b/core/rtw_security.c 16*4882a593Smuzhiyunindex d54e6af..de2d91f 100644 17*4882a593Smuzhiyun--- a/core/rtw_security.c 18*4882a593Smuzhiyun+++ b/core/rtw_security.c 19*4882a593Smuzhiyun@@ -2200,7 +2200,7 @@ BIP_exit: 20*4882a593Smuzhiyun 21*4882a593Smuzhiyun #ifndef PLATFORM_FREEBSD 22*4882a593Smuzhiyun /* compress 512-bits */ 23*4882a593Smuzhiyun-static int sha256_compress(struct sha256_state *md, unsigned char *buf) 24*4882a593Smuzhiyun+static int sha256_compress(struct rtl_sha256_state *md, unsigned char *buf) 25*4882a593Smuzhiyun { 26*4882a593Smuzhiyun u32 S[8], W[64], t0, t1; 27*4882a593Smuzhiyun u32 t; 28*4882a593Smuzhiyun@@ -2249,7 +2249,7 @@ static int sha256_compress(struct sha256_state *md, unsigned char *buf) 29*4882a593Smuzhiyun } 30*4882a593Smuzhiyun 31*4882a593Smuzhiyun /* Initialize the hash state */ 32*4882a593Smuzhiyun-static void sha256_init(struct sha256_state *md) 33*4882a593Smuzhiyun+static void sha256_init(struct rtl_sha256_state *md) 34*4882a593Smuzhiyun { 35*4882a593Smuzhiyun md->curlen = 0; 36*4882a593Smuzhiyun md->length = 0; 37*4882a593Smuzhiyun@@ -2270,7 +2270,7 @@ static void sha256_init(struct sha256_state *md) 38*4882a593Smuzhiyun @param inlen The length of the data (octets) 39*4882a593Smuzhiyun @return CRYPT_OK if successful 40*4882a593Smuzhiyun */ 41*4882a593Smuzhiyun-static int sha256_process(struct sha256_state *md, unsigned char *in, 42*4882a593Smuzhiyun+static int sha256_process(struct rtl_sha256_state *md, unsigned char *in, 43*4882a593Smuzhiyun unsigned long inlen) 44*4882a593Smuzhiyun { 45*4882a593Smuzhiyun unsigned long n; 46*4882a593Smuzhiyun@@ -2311,7 +2311,7 @@ static int sha256_process(struct sha256_state *md, unsigned char *in, 47*4882a593Smuzhiyun @param out [out] The destination of the hash (32 bytes) 48*4882a593Smuzhiyun @return CRYPT_OK if successful 49*4882a593Smuzhiyun */ 50*4882a593Smuzhiyun-static int sha256_done(struct sha256_state *md, unsigned char *out) 51*4882a593Smuzhiyun+static int sha256_done(struct rtl_sha256_state *md, unsigned char *out) 52*4882a593Smuzhiyun { 53*4882a593Smuzhiyun int i; 54*4882a593Smuzhiyun 55*4882a593Smuzhiyun@@ -2363,7 +2363,7 @@ static int sha256_done(struct sha256_state *md, unsigned char *out) 56*4882a593Smuzhiyun static int sha256_vector(size_t num_elem, u8 *addr[], size_t *len, 57*4882a593Smuzhiyun u8 *mac) 58*4882a593Smuzhiyun { 59*4882a593Smuzhiyun- struct sha256_state ctx; 60*4882a593Smuzhiyun+ struct rtl_sha256_state ctx; 61*4882a593Smuzhiyun size_t i; 62*4882a593Smuzhiyun 63*4882a593Smuzhiyun sha256_init(&ctx); 64*4882a593Smuzhiyundiff --git a/include/rtw_security.h b/include/rtw_security.h 65*4882a593Smuzhiyunindex d41014e..98feb69 100644 66*4882a593Smuzhiyun--- a/include/rtw_security.h 67*4882a593Smuzhiyun+++ b/include/rtw_security.h 68*4882a593Smuzhiyun@@ -233,7 +233,7 @@ struct security_priv { 69*4882a593Smuzhiyun #endif /* DBG_SW_SEC_CNT */ 70*4882a593Smuzhiyun }; 71*4882a593Smuzhiyun 72*4882a593Smuzhiyun-struct sha256_state { 73*4882a593Smuzhiyun+struct rtl_sha256_state { 74*4882a593Smuzhiyun u64 length; 75*4882a593Smuzhiyun u32 state[8], curlen; 76*4882a593Smuzhiyun u8 buf[64]; 77*4882a593Smuzhiyun-- 78*4882a593Smuzhiyun2.28.0 79*4882a593Smuzhiyun 80