From 5f4be73d7ec2c95d7e2566dbc166d6f7eb1cf5ea Mon Sep 17 00:00:00 2001
From: yihaoDeng <luomoxyz@126.com>
Date: Thu, 9 Dec 2021 17:11:45 +0800
Subject: [PATCH] [TD-11894]<fix> rename MD5 func name

---
 include/util/tmd5.h                 |  8 ++++----
 include/util/tutil.h                |  8 ++++----
 source/libs/transport/src/rpcMain.c | 24 ++++++++++++------------
 source/util/src/tmd5.c              | 10 +++++-----
 4 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/include/util/tmd5.h b/include/util/tmd5.h
index 329f4acf11..f8114ad57b 100644
--- a/include/util/tmd5.h
+++ b/include/util/tmd5.h
@@ -30,10 +30,10 @@ typedef struct {
   uint32_t buf[4];     /* scratch buffer */
   uint8_t  in[64];     /* input buffer */
   uint8_t  digest[16]; /* actual digest after MD5Final call */
-} MD5_CTX;
+} T_MD5_CTX;
 
-void MD5Init(MD5_CTX *mdContext);
-void MD5Update(MD5_CTX *mdContext, uint8_t *inBuf, unsigned int inLen);
-void MD5Final(MD5_CTX *mdContext);
+void tMD5Init(T_MD5_CTX *mdContext);
+void tMD5Update(T_MD5_CTX *mdContext, uint8_t *inBuf, unsigned int inLen);
+void tMD5Final(T_MD5_CTX *mdContext);
 
 #endif /*_TD_UTIL_MD5_H*/
diff --git a/include/util/tutil.h b/include/util/tutil.h
index 8dbcb7e8d5..0bb8f0fbfc 100644
--- a/include/util/tutil.h
+++ b/include/util/tutil.h
@@ -45,10 +45,10 @@ char *   taosIpStr(uint32_t ipInt);
 uint32_t ip2uint(const char *const ip_addr);
 
 static FORCE_INLINE void taosEncryptPass(uint8_t *inBuf, size_t inLen, char *target) {
-  MD5_CTX context;
-  MD5Init(&context);
-  MD5Update(&context, inBuf, (unsigned int)inLen);
-  MD5Final(&context);
+  T_MD5_CTX context;
+  tMD5Init(&context);
+  tMD5Update(&context, inBuf, (unsigned int)inLen);
+  tMD5Final(&context);
   memcpy(target, context.digest, TSDB_KEY_LEN);
 }
 
diff --git a/source/libs/transport/src/rpcMain.c b/source/libs/transport/src/rpcMain.c
index a2041c76fc..fbdc94e800 100644
--- a/source/libs/transport/src/rpcMain.c
+++ b/source/libs/transport/src/rpcMain.c
@@ -1527,14 +1527,14 @@ static SRpcHead *rpcDecompressRpcMsg(SRpcHead *pHead) {
 }
 
 static int rpcAuthenticateMsg(void *pMsg, int msgLen, void *pAuth, void *pKey) {
-  MD5_CTX context;
+  T_MD5_CTX context;
   int     ret = -1;
 
-  MD5Init(&context);
-  MD5Update(&context, (uint8_t *)pKey, TSDB_KEY_LEN);
-  MD5Update(&context, (uint8_t *)pMsg, msgLen);
-  MD5Update(&context, (uint8_t *)pKey, TSDB_KEY_LEN);
-  MD5Final(&context);
+  tMD5Init(&context);
+  tMD5Update(&context, (uint8_t *)pKey, TSDB_KEY_LEN);
+  tMD5Update(&context, (uint8_t *)pMsg, msgLen);
+  tMD5Update(&context, (uint8_t *)pKey, TSDB_KEY_LEN);
+  tMD5Final(&context);
 
   if (memcmp(context.digest, pAuth, sizeof(context.digest)) == 0) ret = 0;
 
@@ -1542,13 +1542,13 @@ static int rpcAuthenticateMsg(void *pMsg, int msgLen, void *pAuth, void *pKey) {
 }
 
 static void rpcBuildAuthHead(void *pMsg, int msgLen, void *pAuth, void *pKey) {
-  MD5_CTX context;
+  T_MD5_CTX context;
 
-  MD5Init(&context);
-  MD5Update(&context, (uint8_t *)pKey, TSDB_KEY_LEN);
-  MD5Update(&context, (uint8_t *)pMsg, msgLen);
-  MD5Update(&context, (uint8_t *)pKey, TSDB_KEY_LEN);
-  MD5Final(&context);
+  tMD5Init(&context);
+  tMD5Update(&context, (uint8_t *)pKey, TSDB_KEY_LEN);
+  tMD5Update(&context, (uint8_t *)pMsg, msgLen);
+  tMD5Update(&context, (uint8_t *)pKey, TSDB_KEY_LEN);
+  tMD5Final(&context);
 
   memcpy(pAuth, context.digest, sizeof(context.digest));
 }
diff --git a/source/util/src/tmd5.c b/source/util/src/tmd5.c
index 9cc4b3b9d5..807f3c8122 100644
--- a/source/util/src/tmd5.c
+++ b/source/util/src/tmd5.c
@@ -84,8 +84,8 @@ static uint8_t PADDING[64] = {0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x
 /* The routine MD5Init initializes the message-digest context
    mdContext. All fields are set to zero.
  */
-void MD5Init(MD5_CTX *mdContext) {
-  memset(mdContext, 0, sizeof(MD5_CTX));
+void tMD5Init(T_MD5_CTX *mdContext) {
+  memset(mdContext, 0, sizeof(T_MD5_CTX));
 
   /* Load magic initialization constants. */
   mdContext->buf[0] = (uint32_t)0x67452301;
@@ -98,7 +98,7 @@ void MD5Init(MD5_CTX *mdContext) {
 account for the presence of each of the characters inBuf[0..inLen-1]
 in the message whose digest is being computed.
 */
-void MD5Update(MD5_CTX *mdContext, uint8_t *inBuf, unsigned int inLen) {
+void tMD5Update(T_MD5_CTX *mdContext, uint8_t *inBuf, unsigned int inLen) {
   uint32_t     in[16];
   int          mdi;
   unsigned int i, ii;
@@ -129,7 +129,7 @@ void MD5Update(MD5_CTX *mdContext, uint8_t *inBuf, unsigned int inLen) {
 /* The routine MD5Final terminates the message-digest computation and
 ends with the desired message digest in mdContext->digest[0...15].
 */
-void MD5Final(MD5_CTX *mdContext) {
+void tMD5Final(T_MD5_CTX *mdContext) {
   uint32_t     in[16];
   int          mdi;
   unsigned int i, ii;
@@ -144,7 +144,7 @@ void MD5Final(MD5_CTX *mdContext) {
 
   /* pad out to 56 mod 64 */
   padLen = (mdi < 56) ? (56 - mdi) : (120 - mdi);
-  MD5Update(mdContext, PADDING, padLen);
+  tMD5Update(mdContext, PADDING, padLen);
 
   /* append length in bits and transform */
   for (i = 0, ii = 0; i < 14; i++, ii += 4)
-- 
GitLab