完成tfe中相关功能的开发，回归测试通过。

1 files changed, 10 insertions, 17 deletions

diff --git a/platform/src/key_keeper.cpp b/platform/src/key_keeper.cpp
index f30bcdf..dcac4ed 100644
--- a/platform/src/key_keeper.cpp
+++ b/platform/src/key_keeper.cpp
@@ -1,10 +1,18 @@
 #include "key_keeper.h"
+#include "MESA_htable_aux.h"
+
+#include <pthread.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
-#include "MESA/MESA_prof_load.h"
-#include "tfe_rpc.h"
+
+#include <MESA/MESA_prof_load.h>
+#include <MESA/MESA_htable.h>
+
+#include <ssl_utils.h>
+#include <tfe_rpc.h>
+#include <tfe_utils.h>
 #include <event2/http.h>
 #include <cjson/cJSON.h>
 #include <curl/curl.h>
@@ -440,22 +448,7 @@ static void certstore_rpc_on_fail(enum e_future_error err, const char * what, vo
 	//ctx_destroy_cb((void*)ctx);
 }
 
-/*
- * Certificate, including private key and keyring chain.
- */
-static int __wrapper_MESA_htable_set_opt_int(MESA_htable_handle table, enum MESA_htable_opt opt_type, unsigned int value)
-{
-    int ret = MESA_htable_set_opt(table, opt_type, &value, (int)(sizeof(value)));
-    assert(ret == 0);
-    return ret;
-}
 
-static int __wrapper_MESA_htable_set_opt_func(MESA_htable_handle table, enum MESA_htable_opt opt_type, void * val, size_t len)
-{
-	int ret = MESA_htable_set_opt(table, opt_type, val, (int)len);
-	assert(ret == 0);
-	return ret;
-}
 
 static void key_keeper_free_serialized(void* data)
 {