From 61bc2eaac90335abae35887db616d1ed2f80f041 Mon Sep 17 00:00:00 2001 From: zhengchao Date: Wed, 19 Sep 2018 14:25:11 +0800 Subject: [PATCH] =?UTF-8?q?key=5Fkeeper=E5=88=9D=E5=A7=8B=E5=8C=96?= =?UTF-8?q?=E6=97=B6=E4=BC=A0=E5=85=A5=E6=AD=A3=E7=A1=AE=E7=9A=84section?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- platform/src/ssl_stream.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/platform/src/ssl_stream.cpp b/platform/src/ssl_stream.cpp index 19b73c5..b93a64e 100644 --- a/platform/src/ssl_stream.cpp +++ b/platform/src/ssl_stream.cpp @@ -88,7 +88,7 @@ struct ssl_mgr char trust_CA_file[TFE_STRING_MAX]; char trust_CA_dir[TFE_STRING_MAX]; X509_STORE * trust_CA_store; - struct key_keeper * keeper_of_keys; + struct key_keeper * key_keeper; struct event_base * ev_base_gc; struct event * gcev; @@ -291,9 +291,9 @@ static int sslver_str2num(const char * version_str) void ssl_manager_destroy(struct ssl_mgr * mgr) { - if (mgr->keeper_of_keys != NULL) + if (mgr->key_keeper != NULL) { - key_keeper_destroy(mgr->keeper_of_keys); + key_keeper_destroy(mgr->key_keeper); } if (mgr->trust_CA_store != NULL) { @@ -374,14 +374,13 @@ struct ssl_mgr * ssl_manager_init(const char * ini_profile, const char * section mgr->up_sess_cache = ssl_sess_cache_create(mgr->cache_slots, mgr->sess_expire_seconds, CONN_DIR_UPSTREAM); mgr->down_sess_cache = ssl_sess_cache_create(mgr->cache_slots, mgr->sess_expire_seconds, CONN_DIR_DOWNSTREAM); - mgr->keeper_of_keys = key_keeper_init(ini_profile, section, logger); -#if 0 - if (mgr->keeper_of_keys == NULL) + mgr->key_keeper = key_keeper_init(ini_profile, "key_keeper", logger); + if (mgr->key_keeper == NULL) { TFE_LOG_ERROR(logger, "Certificate Manager initiate failed."); goto error_out; } -#endif + mgr->trust_CA_store = X509_STORE_new(); if (mgr->trust_CA_store == NULL) { @@ -1188,7 +1187,7 @@ void ssl_async_downstream_create(struct future * f, struct ssl_mgr * mgr, struct ATOMIC_INC(&(mgr->stat_val[SSL_FAKE_CRT])); } ctx->f_query_cert = future_create("ask_kyr",ask_keyring_on_succ, ask_keyring_on_fail, p); - key_keeper_async_ask(ctx->f_query_cert, mgr->keeper_of_keys, sni, keyring_id, ctx->origin_crt, ctx->is_origin_crt_vaild, + key_keeper_async_ask(ctx->f_query_cert, mgr->key_keeper, sni, keyring_id, ctx->origin_crt, ctx->is_origin_crt_vaild, evbase); return; }