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

*修复RPM版本号问题

Browse Source 
*修复本地默认证书签发问题
This commit is contained in:
fengweihao
2020-06-24 16:30:38 +08:00
parent 0f61ddee77
commit 7515a1934f
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmake/Version.cmake
View File

@@ -18,6 +18,11 @@ include(${__VERSION_CONFIG})
string(REGEX REPLACE "^v([0-9]+)\\..*" "\\1" TARGET_MAJOR "${VCS_TAG}")
string(REGEX REPLACE "^v[0-9]+\\.([0-9]+).*" "\\1" TARGET_MINOR "${VCS_TAG}")
string(REGEX REPLACE "^v[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" TARGET_PATCH "${VCS_TAG}")
string(REGEX MATCH "[^-]*$" TARGET_TAGS "${VCS_TAG}")
if(TARGET_TAGS)
set(TARGET_PATCH ${TARGET_PATCH}.${TARGET_TAGS})
endif()
if(NOT TARGET_MAJOR)
set(TARGET_MAJOR 1)

9
program/src/cert_session.cpp
View File

@@ -1133,6 +1133,7 @@ static int x509_online_append(struct x509_object_ctx *def, struct tfe_http_reque
int is_valid = request->is_valid; int keyring_id = request->keyring_id;
int expire_time = 0; char *serial = NULL;
X509 *cacrt = NULL; EVP_PKEY *cakey = NULL;
char *v3_ctl=NULL, *public_algo=NULL;
struct config_bucket_t *rte = cfg_instanec();
@@ -1153,7 +1154,7 @@ static int x509_online_append(struct x509_object_ctx *def, struct tfe_http_reque
}
else
{
mesa_runtime_log(RLOG_LV_DEBUG, MODULE_NAME, "Certificate issued by table id %d", keyring_id);
mesa_runtime_log(RLOG_LV_DEBUG, MODULE_NAME, "Get the keypar %d, sign cert", keyring_id);
}
}
else
@@ -1161,7 +1162,7 @@ static int x509_online_append(struct x509_object_ctx *def, struct tfe_http_reque
cacrt = (is_valid == 1) ? def->root : def->insec_root;
cakey = (is_valid == 1) ? def->key : def->insec_key;
expire_time = cfg_instanec()->expire_after;
mesa_runtime_log(RLOG_LV_DEBUG, MODULE_NAME, "Certificate issued by local cert");
mesa_runtime_log(RLOG_LV_FATAL, MODULE_NAME, "Warning: Use local keypair, sign cert!!!");
goto modify;
}
}
@@ -1180,10 +1181,12 @@ static int x509_online_append(struct x509_object_ctx *def, struct tfe_http_reque
}
cacrt = pxy_obj->issuer;
cakey = pxy_obj->key;
v3_ctl = pxy_obj->v3_ctl;
public_algo =pxy_obj->public_algo;
expire_time = pxy_obj->expire_time;
*stack_ca = pxy_obj->stack_ca;
modify:
x509 = ssl_x509_forge(cacrt, cakey, request->origin, pkey, &expire_time, pxy_obj->v3_ctl, pxy_obj->public_algo);
x509 = ssl_x509_forge(cacrt, cakey, request->origin, pkey, &expire_time, v3_ctl, public_algo);
if (!x509){
goto finish;
}

2
program/src/cert_store.cpp
View File

@@ -45,7 +45,7 @@ void cert_preview ()
struct config_bucket_t *rte = cfg_instanec();
printf("\r\nBasic Configuration of CertStore \n");
printf("%30s:%45s\n", "Run Mode", (rte->mode == 1)?"rsync":"sync");
printf("%30s:%45s\n", "Run Mode", (rte->mode == 1)?"async":"sync");
printf("%30s:%45d\n", "The Threads", rte->thread_nu);
printf("%30s:%45s\n", "Store Redis Ip", rte->addr_t.store_ip);
printf("%30s:%45d\n", "Store Redis Port", rte->addr_t.store_port);