修复：多线程下不能使用ABE加解密的bug

Author: IteratorGIT

devapi/abe/abe_crypto.cc

@@ -4,6 +4,7 @@
 #include <unistd.h>
 #include <openabe/openabe.h>
 #include <openabe/zsymcrypto.h>
+#include <mutex>
 #include <openssl/sha.h>
 #include <openssl/rsa.h>
 #include <openssl/err.h>
@@ -17,12 +18,12 @@ MYSQLX_ABI_BEGIN(2,0)
 namespace abe{
 
 void abe_crypto::encrypt(std::string pt, std::string policy, std::string &ct){
-  
-  oabe::InitializeOpenABE();
+  oabe::OpenABEStateContext thread_context;
+  thread_context.initializeThread();
   oabe::OpenABECryptoContext cpabe("CP-ABE");
   cpabe.importPublicParams(mpk);
   cpabe.encrypt(policy.c_str(), pt, ct);
-  oabe::ShutdownOpenABE();
+  thread_context.shutdownThread();
 }
 
 void abe_crypto::decrypt(const std::string ct, std::string &pt){
@@ -31,15 +32,16 @@ void abe_crypto::decrypt(const std::string ct, std::string &pt){
     ABE_ERROR("no abe key!");
   }
 
-  oabe::InitializeOpenABE();
+  oabe::OpenABEStateContext thread_context;
+  thread_context.initializeThread();
   oabe::OpenABECryptoContext cpabe("CP-ABE");
   cpabe.importPublicParams(mpk);
   cpabe.importUserKey(user.user_id.c_str(), user.user_key);
   if(!cpabe.decrypt(user.user_id.c_str(), ct, pt)){
-    oabe::ShutdownOpenABE();
+    thread_context.shutdownThread();
     ABE_ERROR("abe: can't decrypt.");
   }
-  oabe::ShutdownOpenABE();
+  thread_context.shutdownThread();
 }
 
 bool abe_crypto::check_abe_key(){
@@ -297,6 +299,15 @@ bool abe_crypto::rsa_decrypt(const std::string ct, std::string &pt){
     return flag;
 }
 
+void _initialize_abe(){
+    oabe::InitializeOpenABE();
+}
+
+void _shutdown_abe(){
+    oabe::ShutdownOpenABE();
+}
+
+
 }//namespace mysqlx::abe
 
 MYSQLX_ABI_END(2,0)

include/mysqlx/abe/abe_crypto.h

@@ -90,6 +90,9 @@ class PUBLIC_API abe_crypto{
     RSA * import_pk(const std::string cert_path, std::string &err_msg);
 };
 
+void PUBLIC_API _initialize_abe();
+void PUBLIC_API _shutdown_abe();
+
 }//namespace mysqlx::abe
 MYSQLX_ABI_END(2,0)
 }//namespace mysqlx

include/mysqlx/abe_extern.h

@@ -81,8 +81,15 @@ class PUBLIC_API abe_env{
 };
 
 
-void abe_encrypt(abe::abe_crypto &abe, std::string pt, std::string policy, std::string &ct );
-void abe_decrypt(abe::abe_crypto &abe, std::string ct, std::string &pt);
+void PUBLIC_API abe_encrypt(abe::abe_crypto &abe, std::string pt, std::string policy, std::string &ct );
+void PUBLIC_API abe_decrypt(abe::abe_crypto &abe, std::string ct, std::string &pt);
+
+void PUBLIC_API initialize_abe(){
+    abe::_initialize_abe();
+}
+void PUBLIC_API shutdown_abe(){
+    abe::_shutdown_abe();
+}
 
 MYSQLX_ABI_END(2,0)
 }