Merge pull request #11058 from taosdata/TS-1368

TS-1368: Rename MD5 related names which conflict with names in system library

src/client/src/tscParseLineProtocol.c

@@ -177,10 +177,10 @@ static int32_t getSmlMd5ChildTableName(TAOS_SML_DATA_POINT* point, char* tableNa
   }
   size_t len = 0;
   char* keyJoined = taosStringBuilderGetResult(&sb, &len);
-  MD5_CTX context;
-  MD5Init(&context);
-  MD5Update(&context, (uint8_t *)keyJoined, (uint32_t)len);
-  MD5Final(&context);
+  T_MD5_CTX context;
+  tMD5Init(&context);
+  tMD5Update(&context, (uint8_t *)keyJoined, (uint32_t)len);
+  tMD5Final(&context);
   uint64_t digest1 = *(uint64_t*)(context.digest);
   uint64_t digest2 = *(uint64_t*)(context.digest + 8);
   *tableNameLen = snprintf(tableName, *tableNameLen,

src/plugins/http/src/httpUtil.c

@@ -350,10 +350,10 @@ int32_t httpShrinkTableName(HttpContext *pContext, int32_t pos, char *name) {
     return pos;
   }
 
-  MD5_CTX context;
-  MD5Init(&context);
-  MD5Update(&context, (uint8_t *)name, (uint32_t)len);
-  MD5Final(&context);
+  T_MD5_CTX context;
+  tMD5Init(&context);
+  tMD5Update(&context, (uint8_t *)name, (uint32_t)len);
+  tMD5Final(&context);
 
   int32_t table_name = httpAddToSqlCmdBuffer(
       pContext, "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x", context.digest[0],

src/rpc/src/rpcMain.c

@@ -1541,14 +1541,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;
 
@@ -1556,13 +1556,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));
 }

src/util/inc/tmd5.h

@@ -31,11 +31,17 @@ typedef struct {
   uint32_t i[2];       /* number of _bits_ handled mod 2^64 */
   uint32_t buf[4];     /* scratch buffer */
   uint8_t  in[64];     /* input buffer */
-  uint8_t  digest[16]; /* actual digest after MD5Final call */
+  uint8_t  digest[16]; /* actual digest after tMD5Final call */
 } MD5_CTX;
 
-void MD5Init(MD5_CTX *mdContext);
-void MD5Update(MD5_CTX *mdContext, uint8_t *inBuf, unsigned int inLen);
-void MD5Final(MD5_CTX *mdContext);
+typedef MD5_CTX T_MD5_CTX;
+
+void MD5Init(T_MD5_CTX *mdContext);
+void MD5Update(T_MD5_CTX *mdContext, uint8_t *inBuf, unsigned int inLen);
+void MD5Final(T_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

src/util/inc/tutil.h

@@ -47,10 +47,10 @@ void jsonKeyMd5(void *pMsg, int msgLen, void *pKey);
 bool isValidateTag(char *input);
 
 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);
 }
 

src/util/src/tmd5.c

@@ -2,9 +2,9 @@
  ***********************************************************************
  **  Message-digest routines:                                         **
  **  To form the message digest for a message M                       **
- **    (1) Initialize a context buffer mdContext using MD5Init        **
- **    (2) Call MD5Update on mdContext and M                          **
- **    (3) Call MD5Final on mdContext                                 **
+ **    (1) Initialize a context buffer mdContext using tMD5Init        **
+ **    (2) Call tMD5Update on mdContext and M                          **
+ **    (3) Call tMD5Final on mdContext                                 **
  **  The message digest is now in mdContext->digest[0...15]           **
  ***********************************************************************
  */
@@ -82,11 +82,11 @@ static uint8_t PADDING[64] = {0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x
     (a) += (b);                                     \
   }
 
-/* The routine MD5Init initializes the message-digest context
+/* The routine tMD5Init 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;
@@ -94,12 +94,15 @@ void MD5Init(MD5_CTX *mdContext) {
   mdContext->buf[2] = (uint32_t)0x98badcfe;
   mdContext->buf[3] = (uint32_t)0x10325476;
 }
+void MD5Init(MD5_CTX *mdContext) {
+  return tMD5Init(mdContext);
+}
 
-/* The routine MD5Update updates the message-digest context to
+/* The routine tMD5Update updates the message-digest context to
 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;
@@ -126,11 +129,14 @@ void MD5Update(MD5_CTX *mdContext, uint8_t *inBuf, unsigned int inLen) {
     }
   }
 }
+void MD5Update(MD5_CTX *mdContext, uint8_t *inBuf, unsigned int inLen) {
+  return tMD5Update(mdContext, inBuf, inLen);
+}
 
-/* The routine MD5Final terminates the message-digest computation and
+/* The routine tMD5Final 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;
@@ -145,7 +151,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)
@@ -161,6 +167,9 @@ void MD5Final(MD5_CTX *mdContext) {
     mdContext->digest[ii + 3] = (uint8_t)((mdContext->buf[i] >> 24) & 0xFF);
   }
 }
+void MD5Final(MD5_CTX *mdContext) {
+  return tMD5Final(mdContext);
+}
 
 /* Basic MD5 step. Transforms buf based on in.
  */

src/util/src/tutil.c

@@ -455,11 +455,11 @@ char *taosIpStr(uint32_t ipInt) {
 }
 
 void jsonKeyMd5(void *pMsg, int msgLen, void *pKey) {
-  MD5_CTX context;
+  T_MD5_CTX context;
 
-  MD5Init(&context);
-  MD5Update(&context, (uint8_t *)pMsg, msgLen);
-  MD5Final(&context);
+  tMD5Init(&context);
+  tMD5Update(&context, (uint8_t *)pMsg, msgLen);
+  tMD5Final(&context);
 
   memcpy(pKey, context.digest, sizeof(context.digest));
 }