From 3e412511fc18a809604268749a34304b26e34bd0 Mon Sep 17 00:00:00 2001
From: zhl <zhl010101@gmail.com>
Date: Wed, 10 May 2023 19:14:02 +0800
Subject: [PATCH] change sth

---
 examples/test.rs          | 19 +++++++++----------
 rustwallet.h              |  2 +-
 src/lib.rs                |  7 ++-----
 src/wallet/wallet_impl.rs |  7 ++-----
 4 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/examples/test.rs b/examples/test.rs
index 94ad70b..c628ab2 100644
--- a/examples/test.rs
+++ b/examples/test.rs
@@ -6,7 +6,7 @@
 
 use rustwallet::{
     aes_decrypt, aes_encrypt, generate_sec_key, get_address, get_public_key, hash_pass_svr,
-    hex_deflate, hex_inflate, keccak256_hash, local_pass_hasher, rencrypt, sign, sign_for_tran,
+    hex_deflate, hex_inflate, keccak256_hash, local_pass_hasher, sign, sign_for_tran,
     wallet_decrypt, wallet_encrypt,
 };
 use std::ffi::{CStr, CString};
@@ -25,13 +25,13 @@ macro_rules! print_cchar {
     };
 }
 
-macro_rules! cchar_to_str {
-    ($p1:expr) => {{
-        let s = CStr::from_ptr($p1);
-        let ps = s.to_str().unwrap();
-        ps
-    }};
-}
+// macro_rules! cchar_to_str {
+//     ($p1:expr) => {{
+//         let s = CStr::from_ptr($p1);
+//         let ps = s.to_str().unwrap();
+//         ps
+//     }};
+// }
 
 macro_rules! str_to_cchar {
     ($p1:expr) => {{
@@ -129,8 +129,7 @@ fn main() {
         let str_plain = aes_decrypt(str_encrypt, str_to_cchar!(aes_key));
         print_cchar!(str_plain);
 
-        let salt = "11213xxx";
-        let local_pass_hass = local_pass_hasher(str_to_cchar!(pass), str_to_cchar!(salt));
+        let local_pass_hass = local_pass_hasher(str_to_cchar!(pass));
         print_cchar!(local_pass_hass);
     }
 }
diff --git a/rustwallet.h b/rustwallet.h
index 6c68363..596038f 100644
--- a/rustwallet.h
+++ b/rustwallet.h
@@ -40,7 +40,7 @@ char *aes_encrypt(const char *content, const char *key);
 
 char *aes_decrypt(const char *content, const char *key);
 
-char *local_pass_hasher(const char *password, const char *salt);
+char *local_pass_hasher(const char *password);
 
 bool verify_local_pass(const char *password, const char *pass_hash);
 
diff --git a/src/lib.rs b/src/lib.rs
index b7f5247..315e2ef 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -212,11 +212,8 @@ pub unsafe extern "C" fn aes_decrypt(content: *const c_char, key: *const c_char)
 }
 
 #[no_mangle]
-pub unsafe extern "C" fn local_pass_hasher(
-    password: *const c_char,
-    salt: *const c_char,
-) -> *mut c_char {
-    let result = wallet_impl::local_pass_hasher(cchar_to_str!(password), cchar_to_str!(salt));
+pub unsafe extern "C" fn local_pass_hasher(password: *const c_char) -> *mut c_char {
+    let result = wallet_impl::local_pass_hasher(cchar_to_str!(password));
     str_to_cchar!(result)
 }
 
diff --git a/src/wallet/wallet_impl.rs b/src/wallet/wallet_impl.rs
index b303389..ddbf63a 100644
--- a/src/wallet/wallet_impl.rs
+++ b/src/wallet/wallet_impl.rs
@@ -26,13 +26,10 @@ pub fn generate_client_key(password: &str, openid: &str, salt: &str) -> String {
     key
 }
 
-pub fn local_pass_hasher(password: &str, salt: &str) -> String {
+pub fn local_pass_hasher(password: &str) -> String {
     let password = crypro_utils::hash_pass_client(password);
-    let mut s = String::new();
-    s.push_str(&password);
-    s.push_str(salt);
     let salt = crypro_utils::random_argon2_salt();
-    let pass_hash = crypro_utils::hash_password(&s, &salt);
+    let pass_hash = crypro_utils::hash_password(&password, &salt);
     pass_hash
 }