diff --git a/src/mnode/src/mnodeUser.c b/src/mnode/src/mnodeUser.c index 0acf501aa2e3a1c87c3e47b1e30df7ee84d68e15..2ebe644de189ec459383122837cd82a4d37643bb 100644 --- a/src/mnode/src/mnodeUser.c +++ b/src/mnode/src/mnodeUser.c @@ -116,7 +116,7 @@ static void mnodePrintUserAuth() { pIter = mnodeGetNextUser(pIter, &pUser); if (pUser == NULL) break; - char *base64 = taos_base64_encode((const unsigned char *)pUser->pass, TSDB_KEY_LEN * 2); + char *base64 = base64_encode((const unsigned char *)pUser->pass, TSDB_KEY_LEN * 2); fprintf(fp, "user:%24s auth:%s\n", pUser->user, base64); free(base64); diff --git a/src/plugins/http/src/httpAuth.c b/src/plugins/http/src/httpAuth.c index d8c75b810ebaa185f0f8c3c65dc61e2e62cc0da1..2ef5406823b63862ba8e529ed4caea5bf7e4ec32 100644 --- a/src/plugins/http/src/httpAuth.c +++ b/src/plugins/http/src/httpAuth.c @@ -104,7 +104,7 @@ int32_t httpGenTaosdAuthToken(HttpContext *pContext, char *token, int32_t maxLen tstrncpy(buffer + sizeof(pContext->user), pContext->pass, size); char *encrypt = taosDesEncode(KEY_DES_4, buffer, TSDB_USER_LEN + HTTP_PASSWORD_LEN); - char *base64 = taos_base64_encode((const unsigned char *)encrypt, TSDB_USER_LEN + HTTP_PASSWORD_LEN); + char *base64 = base64_encode((const unsigned char *)encrypt, TSDB_USER_LEN + HTTP_PASSWORD_LEN); size_t len = strlen(base64); tstrncpy(token, base64, len + 1); diff --git a/src/util/inc/tkey.h b/src/util/inc/tkey.h index 1a3ff25b22763d23557675248e526df2c22e6cad..28a0d3a84e467f2771c5f7c0848fb7cedbade325 100644 --- a/src/util/inc/tkey.h +++ b/src/util/inc/tkey.h @@ -25,7 +25,7 @@ extern "C" { #include "tutil.h" unsigned char *base64_decode(const char *value, int inlen, int *outlen); -char *taos_base64_encode(const unsigned char *value, int vlen); +char *base64_encode(const unsigned char *value, int vlen); char *taosDesEncode(int64_t key, char *src, int len); char *taosDesDecode(int64_t key, char *src, int len); diff --git a/src/util/src/tbase64.c b/src/util/src/tbase64.c index 7a5dc989b349b6c64801836547f426b317b7894e..1b1f53df17d83313744d0ea528bfb013878eb53d 100644 --- a/src/util/src/tbase64.c +++ b/src/util/src/tbase64.c @@ -18,7 +18,7 @@ // deprecated this file for bug prone // base64 encode static char basis_64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; -char *taos_base64_encode(const unsigned char *value, int vlen) { +char *base64_encode(const unsigned char *value, int vlen) { unsigned char oval = 0; char * result = (char *)malloc((size_t)(vlen * 4) / 3 + 10); char * out = result;