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

消除tfe_utils.之外的编译警告

Browse Source
This commit is contained in:
zhengchao
2018-09-05 10:38:27 +08:00
parent 115c6d4c62
commit 7e94b3cb89
8 changed files with 36 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
platform/src/key_keeper.cpp
View File

@@ -231,20 +231,19 @@ static X509* get_cert_from_response(const char* data, int len, void* logger)
static EVP_PKEY* get_key_from_response(const char* data, int len, void* logger)
{
return NULL;
}
static STACK_OF(X509)* get_chain_from_response(const char* data, int len, void* logger)
{
return NULL;
}
static void certstore_rpc_on_succ(void* result, void* user)
{
struct promise * p = (struct promise *) user;
struct key_keeper_promise_ctx* ctx = (struct key_keeper_promise_ctx*)promise_get_ctx(p);
void* logger = ctx->logger;
MESA_htable_handle htable= ctx->htable;
const uchar* key = ctx->key;
unsigned int key_len = ctx->key_len;
@@ -265,7 +264,6 @@ static void certstore_rpc_on_succ(void* result, void* user)
keyring_set_chain(ring, chain);
promise_success(p, (void*)ring);
keyring_ref_inc(ring);
int ret = MESA_htable_add(htable, key, key_len, (void*)ring);
if(ret<0)
{
@@ -289,20 +287,7 @@ static STACK_OF(X509)* get_chain_from_response(const char* data, int len, void*
*/
static void key_keeper_free_serialized()
{
return;
}
static void key_keeper_verify_cb()
{
return;
}
struct key_keeper *
key_keeper_init(const char * profile, const char* section, void* logger)
struct key_keeper* key_keeper_init(const char * profile, const char* section, void* logger)
{
//load conf
//TODO free
@@ -330,10 +315,6 @@ struct keyring* key_keeper_release_keyring(future_result_t* result)
return &(kyr->head);
}
static void ctx_destory_cb(struct promise* p)
{
@@ -347,6 +328,7 @@ void key_keeper_async_ask(struct future * f, struct key_keeper * keeper, const c
//current promise, belong to key_keeper
struct promise* p = future_to_promise(f);
struct key_keeper_promise_ctx* ctx = ALLOC(struct key_keeper_promise_ctx, 1);
//TODO free ctx!!
unsigned int len = 0;
const uchar* key = get_key_by_cert(origin_cert, keyring_id, &len);
ctx->logger = keeper->logger;
@@ -382,7 +364,7 @@ void key_keeper_async_ask(struct future * f, struct key_keeper * keeper, const c
struct keyring_private* ring = generate_x509_keyring(origin_cert, keyring_id, filename);
if(ring)
{
keyring_ref_inc(ring);
promise_success(p, (void*)ring);
int ret = MESA_htable_add(ctx->htable, ctx->key, ctx->key_len, (void*)ring);
if(ret<0)
{
@@ -392,8 +374,6 @@ void key_keeper_async_ask(struct future * f, struct key_keeper * keeper, const c
{
printf("key %s is added to hash table\n", ctx->key);
}
promise_success(p, (void*)ring);
key_keeper_free_keyring((struct keyring*)ring);
}
else
{