diff options
| author | fengweihao <[email protected]> | 2019-11-28 15:08:37 +0800 |
|---|---|---|
| committer | fengweihao <[email protected]> | 2019-11-28 15:08:37 +0800 |
| commit | d278e776717693641f1a0ac4ca1de60fd14e8a75 (patch) | |
| tree | 5aa1c1ba921637dda5bf3fa9a3aee854c8955eb6 /program | |
| parent | 3662ddd8846ef0ea47a4d93e0c18e9c316066067 (diff) | |
certstore支持rpm打包
certstore修改缓存时间戳
Diffstat (limited to 'program')
| -rw-r--r-- | program/include/cert_conf.h | 2 | ||||
| -rw-r--r-- | program/src/cert_session.cpp | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/program/include/cert_conf.h b/program/include/cert_conf.h index e419414..777ba11 100644 --- a/program/include/cert_conf.h +++ b/program/include/cert_conf.h @@ -44,7 +44,7 @@ struct pxy_obj_keyring{ char v3_ctl[CT_STRING_MAX]; int is_send; int is_valid; - uint64_t op_time; + time_t op_time; atomic64_t ref_cnt; STACK_OF(X509) *stack_ca; }; diff --git a/program/src/cert_session.cpp b/program/src/cert_session.cpp index 1b2809d..2e22bd6 100644 --- a/program/src/cert_session.cpp +++ b/program/src/cert_session.cpp @@ -1994,15 +1994,16 @@ const char* table_line, MAAT_PLUGIN_EX_DATA* ad, long __attribute__((__unused__) memset(pxy_obj, 0, sizeof(struct pxy_obj_keyring)); atomic64_set(&pxy_obj->ref_cnt, 1); - ret=sscanf(table_line, "%d\t%s\t%s\t%s\t%s\t%lu\t%s\t%s\t%d\t%d\t%lu", &pxy_obj->keyring_id, profile_name, + ret=sscanf(table_line, "%d\t%s\t%s\t%s\t%s\t%lu\t%s\t%s\t%d\t%d", &pxy_obj->keyring_id, profile_name, pxy_obj->keyring_type, private_file, public_file, &pxy_obj->expire_time, pxy_obj->public_algo, - pxy_obj->v3_ctl, &pxy_obj->is_send, &pxy_obj->is_valid, &pxy_obj->op_time); - if(ret!=11) + pxy_obj->v3_ctl, &pxy_obj->is_send, &pxy_obj->is_valid); + if(ret!=10) { kfree(pxy_obj); mesa_runtime_log(RLOG_LV_FATAL, MODULE_NAME, "certstore parse config failed: %s", table_line); goto finish; } + pxy_obj->op_time = time(NULL); /*Load PUBLICKEY***/ if ((pxy_obj->issuer = x509_get_root_ca(public_file, pxy_obj->is_send, pxy_obj->keyring_type, &pxy_obj->stack_ca)) == NULL ){ |