crypto/rustwallet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change sth

Browse Source
This commit is contained in:
zhl 2023-05-10 19:14:02 +08:00
parent 72af5aeaeb
commit 3e412511fc
4 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
examples/test.rs
View File

@ -6,7 +6,7 @@
use rustwallet::{ use rustwallet::{
aes_decrypt, aes_encrypt, generate_sec_key, get_address, get_public_key, hash_pass_svr, 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, wallet_decrypt, wallet_encrypt,
}; };
use std::ffi::{CStr, CString}; use std::ffi::{CStr, CString};
@ -25,13 +25,13 @@ macro_rules! print_cchar {
}; };
} }
macro_rules! cchar_to_str { // macro_rules! cchar_to_str {
($p1:expr) => {{ // ($p1:expr) => {{
let s = CStr::from_ptr($p1); // let s = CStr::from_ptr($p1);
let ps = s.to_str().unwrap(); // let ps = s.to_str().unwrap();
ps // ps
}}; // }};
} // }
macro_rules! str_to_cchar { macro_rules! str_to_cchar {
($p1:expr) => {{ ($p1:expr) => {{
@ -129,8 +129,7 @@ fn main() {
let str_plain = aes_decrypt(str_encrypt, str_to_cchar!(aes_key)); let str_plain = aes_decrypt(str_encrypt, str_to_cchar!(aes_key));
print_cchar!(str_plain); print_cchar!(str_plain);
let salt = "11213xxx"; let local_pass_hass = local_pass_hasher(str_to_cchar!(pass));
let local_pass_hass = local_pass_hasher(str_to_cchar!(pass), str_to_cchar!(salt));
print_cchar!(local_pass_hass); print_cchar!(local_pass_hass);
} }
} }

2
rustwallet.h
View File

@ -40,7 +40,7 @@ char *aes_encrypt(const char *content, const char *key);
char *aes_decrypt(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); bool verify_local_pass(const char *password, const char *pass_hash);

7
src/lib.rs
View File

@ -212,11 +212,8 @@ pub unsafe extern "C" fn aes_decrypt(content: *const c_char, key: *const c_char)
} }
#[no_mangle] #[no_mangle]
pub unsafe extern "C" fn local_pass_hasher( pub unsafe extern "C" fn local_pass_hasher(password: *const c_char) -> *mut c_char {
password: *const c_char, let result = wallet_impl::local_pass_hasher(cchar_to_str!(password));
salt: *const c_char,
) -> *mut c_char {
let result = wallet_impl::local_pass_hasher(cchar_to_str!(password), cchar_to_str!(salt));
str_to_cchar!(result) str_to_cchar!(result)
} }

7
src/wallet/wallet_impl.rs
View File

@ -26,13 +26,10 @@ pub fn generate_client_key(password: &str, openid: &str, salt: &str) -> String {
key 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 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 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 pass_hash
} }