提交 82ef486d 编写于 作者: W wade zhang

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

上级 c682aa85
...@@ -177,10 +177,10 @@ static int32_t getSmlMd5ChildTableName(TAOS_SML_DATA_POINT* point, char* tableNa ...@@ -177,10 +177,10 @@ static int32_t getSmlMd5ChildTableName(TAOS_SML_DATA_POINT* point, char* tableNa
} }
size_t len = 0; size_t len = 0;
char* keyJoined = taosStringBuilderGetResult(&sb, &len); char* keyJoined = taosStringBuilderGetResult(&sb, &len);
MD5_CTX context; TAOS_MD5_CTX context;
MD5Init(&context); taos_MD5Init(&context);
MD5Update(&context, (uint8_t *)keyJoined, (uint32_t)len); taos_MD5Update(&context, (uint8_t *)keyJoined, (uint32_t)len);
MD5Final(&context); taos_MD5Final(&context);
uint64_t digest1 = *(uint64_t*)(context.digest); uint64_t digest1 = *(uint64_t*)(context.digest);
uint64_t digest2 = *(uint64_t*)(context.digest + 8); uint64_t digest2 = *(uint64_t*)(context.digest + 8);
*tableNameLen = snprintf(tableName, *tableNameLen, *tableNameLen = snprintf(tableName, *tableNameLen,
......
...@@ -350,10 +350,10 @@ int32_t httpShrinkTableName(HttpContext *pContext, int32_t pos, char *name) { ...@@ -350,10 +350,10 @@ int32_t httpShrinkTableName(HttpContext *pContext, int32_t pos, char *name) {
return pos; return pos;
} }
MD5_CTX context; TAOS_MD5_CTX context;
MD5Init(&context); taos_MD5Init(&context);
MD5Update(&context, (uint8_t *)name, (uint32_t)len); taos_MD5Update(&context, (uint8_t *)name, (uint32_t)len);
MD5Final(&context); taos_MD5Final(&context);
int32_t table_name = httpAddToSqlCmdBuffer( 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], pContext, "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x", context.digest[0],
......
...@@ -1541,14 +1541,14 @@ static SRpcHead *rpcDecompressRpcMsg(SRpcHead *pHead) { ...@@ -1541,14 +1541,14 @@ static SRpcHead *rpcDecompressRpcMsg(SRpcHead *pHead) {
} }
static int rpcAuthenticateMsg(void *pMsg, int msgLen, void *pAuth, void *pKey) { static int rpcAuthenticateMsg(void *pMsg, int msgLen, void *pAuth, void *pKey) {
MD5_CTX context; TAOS_MD5_CTX context;
int ret = -1; int ret = -1;
MD5Init(&context); taos_MD5Init(&context);
MD5Update(&context, (uint8_t *)pKey, TSDB_KEY_LEN); taos_MD5Update(&context, (uint8_t *)pKey, TSDB_KEY_LEN);
MD5Update(&context, (uint8_t *)pMsg, msgLen); taos_MD5Update(&context, (uint8_t *)pMsg, msgLen);
MD5Update(&context, (uint8_t *)pKey, TSDB_KEY_LEN); taos_MD5Update(&context, (uint8_t *)pKey, TSDB_KEY_LEN);
MD5Final(&context); taos_MD5Final(&context);
if (memcmp(context.digest, pAuth, sizeof(context.digest)) == 0) ret = 0; if (memcmp(context.digest, pAuth, sizeof(context.digest)) == 0) ret = 0;
......
...@@ -32,10 +32,10 @@ typedef struct { ...@@ -32,10 +32,10 @@ typedef struct {
uint32_t buf[4]; /* scratch buffer */ uint32_t buf[4]; /* scratch buffer */
uint8_t in[64]; /* input buffer */ uint8_t in[64]; /* input buffer */
uint8_t digest[16]; /* actual digest after MD5Final call */ uint8_t digest[16]; /* actual digest after MD5Final call */
} MD5_CTX; } TAOS_MD5_CTX;
void MD5Init(MD5_CTX *mdContext); void taos_MD5Init(MD5_CTX *mdContext);
void MD5Update(MD5_CTX *mdContext, uint8_t *inBuf, unsigned int inLen); void taos_MD5Update(MD5_CTX *mdContext, uint8_t *inBuf, unsigned int inLen);
void MD5Final(MD5_CTX *mdContext); void taos_MD5Final(MD5_CTX *mdContext);
#endif #endif
...@@ -47,10 +47,10 @@ void jsonKeyMd5(void *pMsg, int msgLen, void *pKey); ...@@ -47,10 +47,10 @@ void jsonKeyMd5(void *pMsg, int msgLen, void *pKey);
bool isValidateTag(char *input); bool isValidateTag(char *input);
static FORCE_INLINE void taosEncryptPass(uint8_t *inBuf, size_t inLen, char *target) { static FORCE_INLINE void taosEncryptPass(uint8_t *inBuf, size_t inLen, char *target) {
MD5_CTX context; TAOS_MD5_CTX context;
MD5Init(&context); taos_MD5Init(&context);
MD5Update(&context, inBuf, (unsigned int)inLen); taos_MD5Update(&context, inBuf, (unsigned int)inLen);
MD5Final(&context); taos_MD5Final(&context);
memcpy(target, context.digest, TSDB_KEY_LEN); memcpy(target, context.digest, TSDB_KEY_LEN);
} }
......
...@@ -85,8 +85,8 @@ static uint8_t PADDING[64] = {0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x ...@@ -85,8 +85,8 @@ static uint8_t PADDING[64] = {0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x
/* The routine MD5Init initializes the message-digest context /* The routine MD5Init initializes the message-digest context
mdContext. All fields are set to zero. mdContext. All fields are set to zero.
*/ */
void MD5Init(MD5_CTX *mdContext) { void taos_MD5Init(TAOS_MD5_CTX *mdContext) {
memset(mdContext, 0, sizeof(MD5_CTX)); memset(mdContext, 0, sizeof(TAOS_MD5_CTX));
/* Load magic initialization constants. */ /* Load magic initialization constants. */
mdContext->buf[0] = (uint32_t)0x67452301; mdContext->buf[0] = (uint32_t)0x67452301;
...@@ -99,7 +99,7 @@ void MD5Init(MD5_CTX *mdContext) { ...@@ -99,7 +99,7 @@ void MD5Init(MD5_CTX *mdContext) {
account for the presence of each of the characters inBuf[0..inLen-1] account for the presence of each of the characters inBuf[0..inLen-1]
in the message whose digest is being computed. in the message whose digest is being computed.
*/ */
void MD5Update(MD5_CTX *mdContext, uint8_t *inBuf, unsigned int inLen) { void taos_MD5Update(TAOS_MD5_CTX *mdContext, uint8_t *inBuf, unsigned int inLen) {
uint32_t in[16]; uint32_t in[16];
int mdi; int mdi;
unsigned int i, ii; unsigned int i, ii;
...@@ -130,7 +130,7 @@ void MD5Update(MD5_CTX *mdContext, uint8_t *inBuf, unsigned int inLen) { ...@@ -130,7 +130,7 @@ void MD5Update(MD5_CTX *mdContext, uint8_t *inBuf, unsigned int inLen) {
/* The routine MD5Final terminates the message-digest computation and /* The routine MD5Final terminates the message-digest computation and
ends with the desired message digest in mdContext->digest[0...15]. ends with the desired message digest in mdContext->digest[0...15].
*/ */
void MD5Final(MD5_CTX *mdContext) { void taos_MD5Final(TAOS_MD5_CTX *mdContext) {
uint32_t in[16]; uint32_t in[16];
int mdi; int mdi;
unsigned int i, ii; unsigned int i, ii;
...@@ -145,7 +145,7 @@ void MD5Final(MD5_CTX *mdContext) { ...@@ -145,7 +145,7 @@ void MD5Final(MD5_CTX *mdContext) {
/* pad out to 56 mod 64 */ /* pad out to 56 mod 64 */
padLen = (mdi < 56) ? (56 - mdi) : (120 - mdi); padLen = (mdi < 56) ? (56 - mdi) : (120 - mdi);
MD5Update(mdContext, PADDING, padLen); taos_MD5Update(mdContext, PADDING, padLen);
/* append length in bits and transform */ /* append length in bits and transform */
for (i = 0, ii = 0; i < 14; i++, ii += 4) for (i = 0, ii = 0; i < 14; i++, ii += 4)
......
...@@ -455,11 +455,11 @@ char *taosIpStr(uint32_t ipInt) { ...@@ -455,11 +455,11 @@ char *taosIpStr(uint32_t ipInt) {
} }
void jsonKeyMd5(void *pMsg, int msgLen, void *pKey) { void jsonKeyMd5(void *pMsg, int msgLen, void *pKey) {
MD5_CTX context; TAOS_MD5_CTX context;
MD5Init(&context); taos_MD5Init(&context);
MD5Update(&context, (uint8_t *)pMsg, msgLen); taos_MD5Update(&context, (uint8_t *)pMsg, msgLen);
MD5Final(&context); taos_MD5Final(&context);
memcpy(pKey, context.digest, sizeof(context.digest)); memcpy(pKey, context.digest, sizeof(context.digest));
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册