modify base64 namespace

Author: tigersk

include/tigerapi/client_config.h

@@ -54,6 +54,10 @@ namespace TIGER_API {
             return this->server_url;
         }
 
+        utility::string_t get_server_pub_key() {
+            return this->server_public_key;
+        }
+
     private:
         bool sandbox_debug = false;
         utility::string_t server_url = TIGER_SERVER_URL;

src/common/base64.h

@@ -39,7 +39,7 @@
 #include <string>
 #include <cpprest/details/basic_types.h>
 
-namespace websocketpp {
+namespace TIGER_API {
 
     static utility::string_t base64_chars = U("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/");
 

src/common/sign_util.h

@@ -87,7 +87,7 @@ int sha1_verify(const utility::string_t& context, const utility::string_t& sign,
     utility::char_t sigbuf[8196 * 16] = {};
     unsigned int siglen = 0;
 
-    utility::string_t decoded = websocketpp::base64_decode(sign);
+    utility::string_t decoded = TIGER_API::base64_decode(sign);
     memcpy(sigbuf, decoded.data(), decoded.size());
     siglen = decoded.size();
 

src/tiger_client.cpp

@@ -4,7 +4,7 @@
 #include "../include/tigerapi/contract_util.h"
 #include "../include/common/easylogging++.h"
 
-using namespace websocketpp;
+using namespace TIGER_API;
 
 namespace TIGER_API {
 
@@ -116,7 +116,7 @@ namespace TIGER_API {
                 exit(code);
             }
             utility::string_t res_sign = result[P_SIGN].as_string();
-            bool is_sign_ok = verify_sign(SANDBOX_TIGER_PUBLIC_KEY, params[P_TIMESTAMP].as_string(), res_sign);
+            bool is_sign_ok = verify_sign(client_config.get_server_pub_key(), params[P_TIMESTAMP].as_string(), res_sign);
             if (!is_sign_ok) {
                 LOG(ERROR) << U("Exception: response sign verify failed. ");
                 exit(-1);

src/utils.cpp

@@ -10,7 +10,7 @@
 
 using namespace std;
 using namespace web;
-using namespace websocketpp;
+using namespace TIGER_API;
 
 utility::string_t convert_str(std::string s) {
 #if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__)
@@ -48,7 +48,7 @@ utility::string_t get_sign(utility::string_t &private_key, const utility::string
     utility::string_t filled_private_key = fill_private_key_marker(private_key);
 
     utility::string_t encrypted = sha1_sign(content, filled_private_key);
-    return websocketpp::base64_encode(encrypted);
+    return TIGER_API::base64_encode(encrypted);
 }
 
 bool verify_sign(utility::string_t public_key, const utility::string_t &content,