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

fix bugs

Browse Source
This commit is contained in:
崔一鸣
2018-09-14 16:58:19 +08:00
committed by zhengchao
parent aa4d83e464
commit eb756779b3
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
platform/src/key_keeper.cpp
View File

@@ -234,7 +234,7 @@ static void err_out(X509* cert, EVP_PKEY* key, STACK_OF(X509)* chain)
return; return;
} }
static struct keyring* get_keyring_from_response(const char* data) static struct keyring_private* get_keyring_from_response(const char* data)
{ {
X509* cert = NULL; X509* cert = NULL;
EVP_PKEY* key = NULL; EVP_PKEY* key = NULL;
@@ -300,7 +300,7 @@ static struct keyring* get_keyring_from_response(const char* data)
X509_free(cert); X509_free(cert);
EVP_PKEY_free(key); EVP_PKEY_free(key);
sk_X509_pop_free(chain, X509_free); sk_X509_pop_free(chain, X509_free);
return &(_kyr->head); return _kyr;
} }
static long keyring_local_cache_query_cb(void * data, const uchar * key, uint size, void * user_arg) static long keyring_local_cache_query_cb(void * data, const uchar * key, uint size, void * user_arg)
@@ -356,13 +356,15 @@ static void certstore_rpc_on_succ(void* result, void* user)
if(status_code == HTTP_OK) if(status_code == HTTP_OK)
{ {
*(data+len) = '\0'; *(data+len) = '\0';
struct keyring* kyr= get_keyring_from_response(data); struct keyring_private* kyr= get_keyring_from_response(data);
promise_success(p, (void*)kyr); keyring_ref_inc(kyr);
int ret = MESA_htable_add(htable, key, key_len, (void*)kyr); int ret = MESA_htable_add(htable, key, key_len, (void*)kyr);
if(ret<0) if(ret<0)
{ {
key_keeper_free_keyring((struct keyring*)kyr); key_keeper_free_keyring((struct keyring*)kyr);
} }
promise_success(p, (void*)kyr);
key_keeper_free_keyring((struct keyring*)kyr);
} }
else else
{ {
@@ -516,15 +518,17 @@ void key_keeper_async_ask(struct future * f, struct key_keeper * keeper, const c
{ {
filename = keeper->untrusted_ca_path; filename = keeper->untrusted_ca_path;
} }
struct keyring_private* ring = generate_x509_keyring(origin_cert, keyring_id, filename); struct keyring_private* kyr = generate_x509_keyring(origin_cert, keyring_id, filename);
if(ring) if(kyr)
{ {
promise_success(p, (void*)ring); keyring_ref_inc(kyr);
int ret = MESA_htable_add(ctx->htable, ctx->key, ctx->key_len, (void*)ring); int ret = MESA_htable_add(ctx->htable, ctx->key, ctx->key_len, (void*)kyr);
if(ret<0) if(ret < 0)
{ {
key_keeper_free_keyring((struct keyring*)ring); key_keeper_free_keyring((struct keyring*)kyr);
} }
promise_success(p, (void*)kyr);
key_keeper_free_keyring((struct keyring*)kyr);
} }
else else
{ {