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

enh: memory safe function

This commit is contained in:
kailixu 2024-12-17 07:11:16 +00:00
parent 80d69d4c1c
commit 9fd2d86ae3
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/libs/crypt/crypt.h
View File

@ -26,7 +26,7 @@ typedef struct SCryptOpts {
char* source; char* source;
char* result; char* result;
int32_t unitLen; int32_t unitLen;
char key[17]; char key[ENCRYPT_KEY_LEN + 1];
} SCryptOpts; } SCryptOpts;
int32_t CBC_Decrypt(SCryptOpts* opts); int32_t CBC_Decrypt(SCryptOpts* opts);

2
source/dnode/mgmt/mgmt_vnode/src/vmHandle.c
View File

@ -211,7 +211,7 @@ static void vmGenerateVnodeCfg(SCreateVnodeReq *pCreate, SVnodeCfg *pCfg) {
#if defined(TD_ENTERPRISE) #if defined(TD_ENTERPRISE)
pCfg->tdbEncryptAlgorithm = pCreate->encryptAlgorithm; pCfg->tdbEncryptAlgorithm = pCreate->encryptAlgorithm;
if (pCfg->tdbEncryptAlgorithm == DND_CA_SM4) { if (pCfg->tdbEncryptAlgorithm == DND_CA_SM4) {
tstrncpy(pCfg->tdbEncryptKey, tsEncryptKey, ENCRYPT_KEY_LEN); tstrncpy(pCfg->tdbEncryptKey, tsEncryptKey, ENCRYPT_KEY_LEN + 1);
} }
#else #else
pCfg->tdbEncryptAlgorithm = 0; pCfg->tdbEncryptAlgorithm = 0;

2
source/dnode/vnode/inc/vnode.h
View File

@ -327,7 +327,7 @@ struct SVnodeCfg {
int16_t hashSuffix; int16_t hashSuffix;
int32_t tsdbPageSize; int32_t tsdbPageSize;
int32_t tdbEncryptAlgorithm; int32_t tdbEncryptAlgorithm;
char tdbEncryptKey[ENCRYPT_KEY_LEN]; char tdbEncryptKey[ENCRYPT_KEY_LEN + 1];
int32_t s3ChunkSize; int32_t s3ChunkSize;
int32_t s3KeepLocal; int32_t s3KeepLocal;
int8_t s3Compact; int8_t s3Compact;

2
source/dnode/vnode/src/vnd/vnodeCfg.c
View File

@ -303,7 +303,7 @@ int vnodeDecodeConfig(const SJson *pJson, void *pObj) {
if (tsEncryptKey[0] == 0) { if (tsEncryptKey[0] == 0) {
return terrno = TSDB_CODE_DNODE_INVALID_ENCRYPTKEY; return terrno = TSDB_CODE_DNODE_INVALID_ENCRYPTKEY;
} else { } else {
tstrncpy(pCfg->tdbEncryptKey, tsEncryptKey, ENCRYPT_KEY_LEN); tstrncpy(pCfg->tdbEncryptKey, tsEncryptKey, ENCRYPT_KEY_LEN + 1);
} }
} }
#endif #endif