diff options
| author | fengweihao <[email protected]> | 2022-11-11 10:43:59 +0800 |
|---|---|---|
| committer | fengweihao <[email protected]> | 2022-11-11 10:43:59 +0800 |
| commit | 0cd8b50bee96bcf51ab3bda33091fd41c66ea76f (patch) | |
| tree | 3950a69e210ec2b923e1295f73bc8974172b9ac4 | |
| parent | 2eeae529d03a3911726f713c4dedacb98a8ff5f9 (diff) | |
TSG-12599 certstore适配非可信证书读取keyring_idv2.2.3-20221111
| -rw-r--r-- | program/src/cert_session.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/program/src/cert_session.cpp b/program/src/cert_session.cpp index f541dfb..3ad22e6 100644 --- a/program/src/cert_session.cpp +++ b/program/src/cert_session.cpp @@ -1143,14 +1143,13 @@ static int x509_online_append(struct x509_object_ctx *def, struct tfe_http_reque STACK_OF(X509) **stack_ca) { X509* x509 = NULL; - int is_valid = request->is_valid; int keyring_id = request->keyring_id; + int is_valid = 1; 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(); - if (is_valid == 0 && keyring_id != 0) keyring_id = 0; if (is_valid == 1 && keyring_id == 0) keyring_id = 1; struct pxy_obj_keyring *pxy_obj = get_obj_for_id(keyring_id); @@ -1159,7 +1158,6 @@ static int x509_online_append(struct x509_object_ctx *def, struct tfe_http_reque if (!rte->local_debug) { if (1==is_valid) pxy_obj = get_obj_for_id(1); - if (0==is_valid) pxy_obj = get_obj_for_id(0); if (pxy_obj == NULL) { mesa_runtime_log(RLOG_LV_FATAL, MODULE_NAME, "Get the default keypair failed, EXIT!!!"); |