modify sign verify

Author: tigersk

include/tigerapi/utils.h

@@ -11,7 +11,9 @@
 #include <cpprest/details/basic_types.h>
 #include "win32.h"
 
-OPENAPI_EXPORT utility::string_t convert_str(std::string s);
+OPENAPI_EXPORT utility::string_t str8to16(std::string s);
+
+OPENAPI_EXPORT std::string str16to8(utility::string_t s);
 
 OPENAPI_EXPORT utility::string_t get_timestamp();
 

src/common/sign_util.h

@@ -64,11 +64,7 @@ utility::string_t sha1_sign(const utility::string_t& context, const utility::str
     unsigned int encrypted_length;
     unsigned char hash[SHA_DIGEST_LENGTH] = { 0 };
 
-#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__)
-    auto str_transfer_content = utility::conversions::utf16_to_utf8(context);
-#else
-    auto str_transfer_content = context;
-#endif
+    auto str_transfer_content = str16to8(context);
     int context_size = str_transfer_content.size();
     SHA1((const unsigned char*)str_transfer_content.c_str(), context_size, hash);
     RSA *rsa = create_rsa((utility::char_t *)key.c_str(), true);
@@ -83,21 +79,22 @@ utility::string_t sha1_sign(const utility::string_t& context, const utility::str
 
 int sha1_verify(const utility::string_t& context, const utility::string_t& sign, const utility::string_t& key) {
 
-    utility::char_t sigbuf[8196 * 16] = {};
+    auto context_s = str16to8(context);
+    unsigned char sigbuf[8196 * 16] = {};
     unsigned int siglen = 0;
 
-    utility::string_t decoded = TIGER_API::base64_decode(sign);
+    std::string decoded = str16to8(TIGER_API::base64_decode(sign));
     memcpy(sigbuf, decoded.data(), decoded.size());
     siglen = decoded.size();
 
     unsigned char hash[SHA_DIGEST_LENGTH] = { 0 };
 
-    SHA1((const unsigned char*)context.c_str(), context.size(), hash);
+    SHA1((const unsigned char*)context_s.c_str(), context_s.size(), hash);
 
     RSA *rsa = create_rsa((utility::char_t *)key.c_str(), false);
 
     int ret = RSA_verify(NID_sha1, hash, SHA_DIGEST_LENGTH,
-                         reinterpret_cast<unsigned char*>(sigbuf), siglen, rsa);
+                         sigbuf, siglen, rsa);
     return ret;
 
 }

src/utils.cpp

@@ -12,14 +12,22 @@ using namespace std;
 using namespace web;
 using namespace TIGER_API;
 
-utility::string_t convert_str(std::string s) {
+utility::string_t str8to16(std::string s) {
 #if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__)
     return utility::conversions::utf8_to_utf16(s);
 #else
     return s;
 #endif
 }
 
+std::string str16to8(utility::string_t s) {
+#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__)
+    return utility::conversions::utf16_to_utf8(s);
+#else
+    return s;
+#endif
+}
+
 utility::string_t get_timestamp() {
 //    time_t t = time(NULL);
 //    utility::char_t tmp[32];
@@ -30,7 +38,7 @@ utility::string_t get_timestamp() {
     std::stringstream ss;
     ss << std::put_time(std::localtime(&in_time_t), "%Y-%m-%d %H:%M:%S");
     std::string result = ss.str();
-    return convert_str(result);
+    return str8to16(result);
 }
 
 time_t date_string_to_timestamp(const utility::string_t &date_string) {
@@ -53,12 +61,11 @@ utility::string_t get_sign(utility::string_t &private_key, const utility::string
 
 bool verify_sign(utility::string_t public_key, const utility::string_t &content,
                  const utility::string_t &encoded_signature) {
-    return true;
+    //return true;
     utility::string_t filled_public_key = fill_public_key_marker(public_key);
     int ret = sha1_verify(content, encoded_signature, filled_public_key);
 
     if (ret != 1) {
-                //LOGGER(info) << U("Public Decrypt failed");
         return false;
     }
     return true;