checksum len

This commit is contained in:
dmchen 2024-04-01 09:50:42 +00:00
parent a1b7444a48
commit 463a5da0d9
1 changed files with 5 additions and 3 deletions

View File

@ -415,6 +415,8 @@ int32_t getEncryptKey(){
char encryptFile[PATH_MAX] = {0}; char encryptFile[PATH_MAX] = {0};
char checkFile[PATH_MAX] = {0}; char checkFile[PATH_MAX] = {0};
char *machineId = NULL; char *machineId = NULL;
char *encryptKey = NULL;
char *content = NULL;
snprintf(encryptFile, sizeof(encryptFile), "%s%sdnode%s%s", tsDataDir, TD_DIRSEP, TD_DIRSEP, DM_ENCRYPT_CODE_FILE); snprintf(encryptFile, sizeof(encryptFile), "%s%sdnode%s%s", tsDataDir, TD_DIRSEP, TD_DIRSEP, DM_ENCRYPT_CODE_FILE);
snprintf(checkFile, sizeof(checkFile), "%s%sdnode%s%s", tsDataDir, TD_DIRSEP, TD_DIRSEP, DM_CHECK_CODE_FILE); snprintf(checkFile, sizeof(checkFile), "%s%sdnode%s%s", tsDataDir, TD_DIRSEP, TD_DIRSEP, DM_CHECK_CODE_FILE);
@ -424,7 +426,6 @@ int32_t getEncryptKey(){
return 0; return 0;
} }
char *content = NULL;
if(readEncryptCode(encryptFile, &content) != 0){ if(readEncryptCode(encryptFile, &content) != 0){
goto _OVER; goto _OVER;
} }
@ -434,11 +435,11 @@ int32_t getEncryptKey(){
goto _OVER; goto _OVER;
} }
char *encryptKey = NULL;
if(checkAndGetCryptKey(content, machineId, &encryptKey) != 0){ if(checkAndGetCryptKey(content, machineId, &encryptKey) != 0){
goto _OVER; goto _OVER;
} }
taosMemoryFreeClear(machineId);
taosMemoryFreeClear(content); taosMemoryFreeClear(content);
if(encryptKey[0] == '\0'){ if(encryptKey[0] == '\0'){
@ -453,13 +454,14 @@ int32_t getEncryptKey(){
strncpy(tsEncryptKey, encryptKey, ENCRYPT_KEY_LEN); strncpy(tsEncryptKey, encryptKey, ENCRYPT_KEY_LEN);
taosMemoryFreeClear(encryptKey); taosMemoryFreeClear(encryptKey);
tsEncryptionKeyChksum = taosCalcChecksum(0, tsEncryptKey, ENCRYPT_KEY_LEN); tsEncryptionKeyChksum = taosCalcChecksum(0, tsEncryptKey, strlen(tsEncryptKey));
tsEncryptionKeyStat = ENCRYPT_KEY_STAT_LOADED; tsEncryptionKeyStat = ENCRYPT_KEY_STAT_LOADED;
code = 0; code = 0;
_OVER: _OVER:
if (content != NULL) taosMemoryFree(content); if (content != NULL) taosMemoryFree(content);
if (encryptKey != NULL) taosMemoryFree(encryptKey); if (encryptKey != NULL) taosMemoryFree(encryptKey);
if (machineId != NULL) taosMemoryFree(machineId);
if (code != 0) { if (code != 0) {
if (terrno == 0) terrno = TAOS_SYSTEM_ERROR(errno); if (terrno == 0) terrno = TAOS_SYSTEM_ERROR(errno);
dError("failed to get encrypt key since %s", terrstr()); dError("failed to get encrypt key since %s", terrstr());