gfwleak/tango-maat
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

maat json文件支持aes-256-cbc加密，密码通过MAAT_OPT_DECRYPT_KEY选项指定，只在内存中解密，iris格式的中间状态文件也被加密。

Browse Source
This commit is contained in:
zhengchao
2020-01-22 20:49:45 +08:00
parent 1df85b7825
commit cc40446df7
8 changed files with 144 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/maat_redis_tool.cpp
View File

@@ -239,7 +239,7 @@ int main(int argc, char * argv[])
unsigned long json_file_size=0,read_size=0;
long long desired_version=0;
char* json_buff=NULL;
size_t json_buff_sz=0;
while((oc=getopt(argc,argv,"h:p:n:d:v:f:j:t:"))!=-1)
{
switch(oc)
@@ -327,12 +327,12 @@ int main(int argc, char * argv[])
}
else if(model==WORK_MODE_JSON)
{
ret=load_file_to_memory(json_file, &json_buff);
ret=load_file_to_memory(json_file, (unsigned char**)&json_buff, &json_buff_sz);
if(ret<0)
{
printf("open %s failed.\n", json_file);
}
ret=json2iris(json_buff, json_file, NULL, NULL, ctx, tmp_iris_path, sizeof(tmp_iris_path), NULL);
ret=json2iris(json_buff, json_file, NULL, NULL, ctx, tmp_iris_path, sizeof(tmp_iris_path), NULL, NULL, NULL);
if(ret<0)
{
printf("Invalid json format.\n");