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

key_keeper初始化时传入正确的section。

Browse Source
This commit is contained in:
zhengchao
2018-09-19 14:25:11 +08:00
parent d1363b1d5c
commit 61bc2eaac9
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
platform/src/ssl_stream.cpp
View File

@@ -88,7 +88,7 @@ struct ssl_mgr
char trust_CA_file[TFE_STRING_MAX]; char trust_CA_file[TFE_STRING_MAX];
char trust_CA_dir[TFE_STRING_MAX]; char trust_CA_dir[TFE_STRING_MAX];
X509_STORE * trust_CA_store; X509_STORE * trust_CA_store;
struct key_keeper * keeper_of_keys; struct key_keeper * key_keeper;
struct event_base * ev_base_gc; struct event_base * ev_base_gc;
struct event * gcev; struct event * gcev;
@@ -291,9 +291,9 @@ static int sslver_str2num(const char * version_str)
void ssl_manager_destroy(struct ssl_mgr * mgr) 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) 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->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->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); mgr->key_keeper = key_keeper_init(ini_profile, "key_keeper", logger);
#if 0 if (mgr->key_keeper == NULL)
if (mgr->keeper_of_keys == NULL)
{ {
TFE_LOG_ERROR(logger, "Certificate Manager initiate failed."); TFE_LOG_ERROR(logger, "Certificate Manager initiate failed.");
goto error_out; goto error_out;
} }
#endif
mgr->trust_CA_store = X509_STORE_new(); mgr->trust_CA_store = X509_STORE_new();
if (mgr->trust_CA_store == NULL) 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])); 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); 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); evbase);
return; return;
} }