xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request #9009 from taosdata/fix/rename_md5_func_name 

[TD-11894]<fix> rename MD5 func name
This commit is contained in:
Yihao Deng 2021-12-09 17:13:32 +08:00 committed by GitHub
parent 175d159efd 5f4be73d7e
commit f0298ee915
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/util/tmd5.h
View File

@ -30,10 +30,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; } T_MD5_CTX;
void MD5Init(MD5_CTX *mdContext); void tMD5Init(T_MD5_CTX *mdContext);
void MD5Update(MD5_CTX *mdContext, uint8_t *inBuf, unsigned int inLen); void tMD5Update(T_MD5_CTX *mdContext, uint8_t *inBuf, unsigned int inLen);
void MD5Final(MD5_CTX *mdContext); void tMD5Final(T_MD5_CTX *mdContext);
#endif /*_TD_UTIL_MD5_H*/ #endif /*_TD_UTIL_MD5_H*/

8
include/util/tutil.h
View File

@ -47,10 +47,10 @@ void taosIp2String(uint32_t ip, char *str);
void taosIpPort2String(uint32_t ip, uint16_t port, char *str); void taosIpPort2String(uint32_t ip, uint16_t port, char *str);
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; T_MD5_CTX context;
MD5Init(&context); tMD5Init(&context);
MD5Update(&context, inBuf, (unsigned int)inLen); tMD5Update(&context, inBuf, (unsigned int)inLen);
MD5Final(&context); tMD5Final(&context);
memcpy(target, context.digest, TSDB_KEY_LEN); memcpy(target, context.digest, TSDB_KEY_LEN);
} }

24
source/libs/transport/src/rpcMain.c
View File

@ -1523,14 +1523,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; T_MD5_CTX context;
int ret = -1; int ret = -1;
MD5Init(&context); tMD5Init(&context);
MD5Update(&context, (uint8_t *)pKey, TSDB_KEY_LEN); tMD5Update(&context, (uint8_t *)pKey, TSDB_KEY_LEN);
MD5Update(&context, (uint8_t *)pMsg, msgLen); tMD5Update(&context, (uint8_t *)pMsg, msgLen);
MD5Update(&context, (uint8_t *)pKey, TSDB_KEY_LEN); tMD5Update(&context, (uint8_t *)pKey, TSDB_KEY_LEN);
MD5Final(&context); tMD5Final(&context);
if (memcmp(context.digest, pAuth, sizeof(context.digest)) == 0) ret = 0; if (memcmp(context.digest, pAuth, sizeof(context.digest)) == 0) ret = 0;
@ -1538,13 +1538,13 @@ static int rpcAuthenticateMsg(void *pMsg, int msgLen, void *pAuth, void *pKey) {
} }
static void rpcBuildAuthHead(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); tMD5Init(&context);
MD5Update(&context, (uint8_t *)pKey, TSDB_KEY_LEN); tMD5Update(&context, (uint8_t *)pKey, TSDB_KEY_LEN);
MD5Update(&context, (uint8_t *)pMsg, msgLen); tMD5Update(&context, (uint8_t *)pMsg, msgLen);
MD5Update(&context, (uint8_t *)pKey, TSDB_KEY_LEN); tMD5Update(&context, (uint8_t *)pKey, TSDB_KEY_LEN);
MD5Final(&context); tMD5Final(&context);
memcpy(pAuth, context.digest, sizeof(context.digest)); memcpy(pAuth, context.digest, sizeof(context.digest));
} }

10
source/util/src/tmd5.c
View File

@ -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 /* 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 tMD5Init(T_MD5_CTX *mdContext) {
memset(mdContext, 0, sizeof(MD5_CTX)); memset(mdContext, 0, sizeof(T_MD5_CTX));
/* Load magic initialization constants. */ /* Load magic initialization constants. */
mdContext->buf[0] = (uint32_t)0x67452301; 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] 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 tMD5Update(T_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;
@ -129,7 +129,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 tMD5Final(T_MD5_CTX *mdContext) {
uint32_t in[16]; uint32_t in[16];
int mdi; int mdi;
unsigned int i, ii; unsigned int i, ii;
@ -144,7 +144,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); tMD5Update(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)