Add type for passwords. (#8920)

* Add type for passwords.

* Fix test.

* Simplify `Drop` impls of `Password` and `Memzero`.

* Spaces to tabs.

* Custom `Drop` impl for `Password`.

ethstore/cli/src/crack.rs

@@ -19,10 +19,10 @@ use std::sync::Arc;
 use std::collections::VecDeque;
 use parking_lot::Mutex;
 
-use ethstore::{PresaleWallet, Error};
+use ethstore::{ethkey::Password, PresaleWallet, Error};
 use num_cpus;
 
-pub fn run(passwords: VecDeque<String>, wallet_path: &str) -> Result<(), Error> {
+pub fn run(passwords: VecDeque<Password>, wallet_path: &str) -> Result<(), Error> {
 	let passwords = Arc::new(Mutex::new(passwords));
 
 	let mut handles = Vec::new();
@@ -42,7 +42,7 @@ pub fn run(passwords: VecDeque<String>, wallet_path: &str) -> Result<(), Error>
 	Ok(())
 }
 
-fn look_for_password(passwords: Arc<Mutex<VecDeque<String>>>, wallet: PresaleWallet) {
+fn look_for_password(passwords: Arc<Mutex<VecDeque<Password>>>, wallet: PresaleWallet) {
 	let mut counter = 0;
 	while !passwords.lock().is_empty() {
 		let package = {
@@ -54,7 +54,7 @@ fn look_for_password(passwords: Arc<Mutex<VecDeque<String>>>, wallet: PresaleWal
 			counter += 1;
 			match wallet.decrypt(&pass) {
 				Ok(_) => {
-					println!("Found password: {}", &pass);
+					println!("Found password: {}", pass.as_str());
 					passwords.lock().clear();
 					return;
 				},

ethstore/cli/src/main.rs

@@ -32,7 +32,7 @@ use std::{env, process, fs, fmt};
 
 use docopt::Docopt;
 use ethstore::accounts_dir::{KeyDirectory, RootDiskDirectory};
-use ethstore::ethkey::Address;
+use ethstore::ethkey::{Address, Password};
 use ethstore::{EthStore, SimpleSecretStore, SecretStore, import_accounts, PresaleWallet, SecretVaultRef, StoreAccountRef};
 
 mod crack;
@@ -201,13 +201,13 @@ fn format_vaults(vaults: &[String]) -> String {
 	vaults.join("\n")
 }
 
-fn load_password(path: &str) -> Result<String, Error> {
+fn load_password(path: &str) -> Result<Password, Error> {
 	let mut file = fs::File::open(path).map_err(|e| ethstore::Error::Custom(format!("Error opening password file {}: {}", path, e)))?;
 	let mut password = String::new();
 	file.read_to_string(&mut password).map_err(|e| ethstore::Error::Custom(format!("Error reading password file {}: {}", path, e)))?;
 	// drop EOF
 	let _ = password.pop();
-	Ok(password)
+	Ok(password.into())
 }
 
 fn execute<S, I>(command: I) -> Result<String, Error> where I: IntoIterator<Item=S>, S: AsRef<str> {
@@ -252,7 +252,7 @@ fn execute<S, I>(command: I) -> Result<String, Error> where I: IntoIterator<Item
 		Ok(format!("0x{:x}", account_ref.address))
 	} else if args.cmd_find_wallet_pass {
 		let passwords = load_password(&args.arg_password)?;
-		let passwords = passwords.lines().map(str::to_owned).collect::<VecDeque<_>>();
+		let passwords = passwords.as_str().lines().map(|line| str::to_owned(line).into()).collect::<VecDeque<_>>();
 		crack::run(passwords, &args.arg_path)?;
 		Ok(format!("Password not found."))
 	} else if args.cmd_remove {