diff options
| -rw-r--r-- | cmake/Version.cmake | 5 | ||||
| -rw-r--r-- | program/src/cert_session.cpp | 9 | ||||
| -rw-r--r-- | program/src/cert_store.cpp | 2 |
3 files changed, 12 insertions, 4 deletions
diff --git a/cmake/Version.cmake b/cmake/Version.cmake index d818f4f..3da0022 100644 --- a/cmake/Version.cmake +++ b/cmake/Version.cmake @@ -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) diff --git a/program/src/cert_session.cpp b/program/src/cert_session.cpp index 82058f0..21294e2 100644 --- a/program/src/cert_session.cpp +++ b/program/src/cert_session.cpp @@ -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; } diff --git a/program/src/cert_store.cpp b/program/src/cert_store.cpp index 738bab7..747a6a7 100644 --- a/program/src/cert_store.cpp +++ b/program/src/cert_store.cpp @@ -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); |