removing extra crate

util/res/geth_keystore/UTC--2016-02-17T09-20-45.721400158Z--3f49624084b67849c7b4e805c5988c21a430f9d9

@@ -0,0 +1,21 @@
+{
+	"address": "3f49624084b67849c7b4e805c5988c21a430f9d9",
+	"Crypto": {
+		"cipher": "aes-128-ctr",
+		"ciphertext": "9f27e3dd4fc73e7103ed61e5493662189a3eb52223ae49e3d1deacc04c889eae",
+		"cipherparams": {
+			"iv": "457494bf05f2618c397dc74dbb5181c0"
+		},
+		"kdf": "scrypt",
+		"kdfparams": {
+			"dklen": 32,
+			"n": 262144,
+			"p": 1,
+			"r": 8,
+			"salt": "db14edb18c41ee7f5ec4397df89c3a2ae4d0af60884c52bb54ce490574f8df33"
+		},
+		"mac": "572d24532438d31fdf513c744a3ff26c933ffda5744ee42bc71661cbe3f2112e"
+	},
+	"id": "62a0ad73-556d-496a-8e1c-0783d30d3ace",
+	"version": 3
+}

util/res/geth_keystore/UTC--2016-02-20T09-33-03.984382741Z--5ba4dcf897e97c2bdf8315b9ef26c13c085988cf

@@ -0,0 +1,21 @@
+{
+	"address": "5ba4dcf897e97c2bdf8315b9ef26c13c085988cf",
+	"Crypto": {
+		"cipher": "aes-128-ctr",
+		"ciphertext": "d4a08ec930163778273920f6ad1d49b71836337be6fd9863993ac700a612fddd",
+		"cipherparams": {
+			"iv": "89ce5ec129fc27cd5bcbeb8c92bdad50"
+		},
+		"kdf": "scrypt",
+		"kdfparams": {
+			"dklen": 32,
+			"n": 262144,
+			"p": 1,
+			"r": 8,
+			"salt": "612ab108dc37e69ee8af37a7b24bf7f2234086d7bbf945bacdeccce331f7f84a"
+		},
+		"mac": "4152caa7444e06784223d735cea80cd2690b4c587ad8db3d5529442227b25695"
+	},
+	"id": "35086353-fb12-4029-b56b-033cd61ce35b",
+	"version": 3
+}

util/src/keys/directory.rs

@@ -618,6 +618,8 @@ impl KeyDirectory {
 			Err(_) => Err(KeyFileLoadError::ParseError(KeyFileParseError::InvalidJson))
 		}
 	}
+
+
 }
 
 

util/src/keys/geth_import.rs

@@ -0,0 +1,164 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Geth keys import/export tool
+
+use common::*;
+use keys::store::SecretStore;
+use keys::directory::KeyFileContent;
+
+/// Enumerates all geth keys in the directory and returns collection of tuples `(accountId, filename)`
+pub fn enumerate_geth_keys(path: &Path) -> Result<Vec<(Address, String)>, io::Error> {
+	let mut entries = Vec::new();
+	for entry in try!(fs::read_dir(path)) {
+		let entry = try!(entry);
+		if !try!(fs::metadata(entry.path())).is_dir() {
+			match entry.file_name().to_str() {
+				Some(name) => {
+					let parts: Vec<&str> = name.split("--").collect();
+					if parts.len() != 3 { continue; }
+					match Address::from_str(parts[2]) {
+						Ok(account_id) => { entries.push((account_id, name.to_owned())); }
+						Err(e) => { panic!("error: {:?}", e); }
+					}
+				},
+				None => { continue; }
+			};
+		}
+	}
+	Ok(entries)
+}
+
+/// Geth import error
+#[derive(Debug)]
+pub enum ImportError {
+	/// Io error reading geth file
+	IoError(io::Error),
+	/// format error
+	FormatError,
+}
+
+impl From<io::Error> for ImportError {
+	fn from (err: io::Error) -> ImportError {
+		ImportError::IoError(err)
+	}
+}
+
+/// Imports one geth key to the store
+pub fn import_geth_key(secret_store: &mut SecretStore, geth_keyfile_path: &Path) -> Result<(), ImportError> {
+	let mut file = try!(fs::File::open(geth_keyfile_path));
+	let mut buf = String::new();
+	try!(file.read_to_string(&mut buf));
+
+	let mut json = match Json::from_str(&buf) {
+		Ok(parsed_json) => try!(parsed_json.as_object().ok_or(ImportError::FormatError)).clone(),
+		Err(_) => { return Err(ImportError::FormatError); }
+	};
+	let crypto_object = try!(json.get("Crypto").and_then(|crypto| crypto.as_object()).ok_or(ImportError::FormatError)).clone();
+	json.insert("crypto".to_owned(), Json::Object(crypto_object.clone()));
+	json.remove("Crypto");
+	match KeyFileContent::load(&Json::Object(json.clone())) {
+		Ok(key_file) => try!(secret_store.import_key(key_file)),
+		Err(_) => { return Err(ImportError::FormatError); }
+	};
+	Ok(())
+}
+
+/// Imports all geth keys in the directory
+pub fn import_geth_keys(secret_store: &mut SecretStore, geth_keyfiles_directory: &Path) -> Result<(), ImportError> {
+	use std::path::PathBuf;
+	let geth_files = try!(enumerate_geth_keys(geth_keyfiles_directory));
+	for &(ref address, ref file_path) in geth_files.iter() {
+		let mut path = PathBuf::new();
+		path.push(geth_keyfiles_directory);
+		path.push(file_path);
+		if let Err(e) = import_geth_key(secret_store, Path::new(&path)) {
+			warn!("Skipped geth address {}, error importing: {:?}", address, e)
+		}
+	}
+	Ok(())
+}
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+	use common::*;
+	use keys::store::SecretStore;
+
+
+	#[test]
+	fn can_enumerate() {
+		let keys = enumerate_geth_keys(Path::new("res/geth_keystore")).unwrap();
+		assert_eq!(2, keys.len());
+	}
+
+	#[test]
+	fn can_import() {
+		let temp = ::devtools::RandomTempPath::create_dir();
+		let mut secret_store = SecretStore::new_in(temp.as_path());
+		import_geth_key(&mut secret_store, Path::new("res/geth_keystore/UTC--2016-02-17T09-20-45.721400158Z--3f49624084b67849c7b4e805c5988c21a430f9d9")).unwrap();
+		let key = secret_store.account(&Address::from_str("3f49624084b67849c7b4e805c5988c21a430f9d9").unwrap());
+		assert!(key.is_some());
+	}
+
+	#[test]
+	fn can_import_directory() {
+		let temp = ::devtools::RandomTempPath::create_dir();
+		let mut secret_store = SecretStore::new_in(temp.as_path());
+		import_geth_keys(&mut secret_store, Path::new("res/geth_keystore")).unwrap();
+
+		let key = secret_store.account(&Address::from_str("3f49624084b67849c7b4e805c5988c21a430f9d9").unwrap());
+		assert!(key.is_some());
+
+		let key = secret_store.account(&Address::from_str("5ba4dcf897e97c2bdf8315b9ef26c13c085988cf").unwrap());
+		assert!(key.is_some());
+	}
+
+	#[test]
+	fn imports_as_scrypt_keys() {
+		use keys::directory::{KeyDirectory, KeyFileKdf};
+		let temp = ::devtools::RandomTempPath::create_dir();
+		{
+			let mut secret_store = SecretStore::new_in(temp.as_path());
+			import_geth_keys(&mut secret_store, Path::new("res/geth_keystore")).unwrap();
+		}
+
+		let key_directory = KeyDirectory::new(&temp.as_path());
+		let key_file = key_directory.get(&H128::from_str("62a0ad73556d496a8e1c0783d30d3ace").unwrap()).unwrap();
+
+		match key_file.crypto.kdf {
+			KeyFileKdf::Scrypt(scrypt_params) => {
+				assert_eq!(262144, scrypt_params.n);
+				assert_eq!(8, scrypt_params.r);
+				assert_eq!(1, scrypt_params.p);
+			},
+			_ => { panic!("expected kdf params of crypto to be of scrypt type" ); }
+		}
+	}
+
+	#[test]
+	fn can_decrypt_with_imported() {
+		use keys::store::EncryptedHashMap;
+
+		let temp = ::devtools::RandomTempPath::create_dir();
+		let mut secret_store = SecretStore::new_in(temp.as_path());
+		import_geth_keys(&mut secret_store, Path::new("res/geth_keystore")).unwrap();
+
+		let val = secret_store.get::<Bytes>(&H128::from_str("62a0ad73556d496a8e1c0783d30d3ace").unwrap(), "123");
+		assert!(val.is_ok());
+		assert_eq!(32, val.unwrap().len());
+	}
+}

util/src/keys/mod.rs

@@ -18,3 +18,4 @@
 
 pub mod directory;
 pub mod store;
+mod geth_import;

util/src/keys/store.rs

@@ -75,6 +75,20 @@ impl SecretStore {
 		}
 	}
 
+	/// trys to import keys in the known locations
+	pub fn try_import_existing(&mut self) {
+		use std::path::PathBuf;
+		use keys::geth_import;
+
+		let mut import_path = PathBuf::new();
+		import_path.push(::std::env::home_dir().expect("Failed to get home dir"));
+		import_path.push(".ethereum");
+		import_path.push("keystore");
+		if let Err(e) = geth_import::import_geth_keys(self, &import_path) {
+			warn!(target: "sstore", "Error retrieving geth keys: {:?}", e)
+		}
+	}
+
 	/// Lists all accounts and corresponding key ids
 	pub fn accounts(&self) -> Result<Vec<(Address, H128)>, ::std::io::Error> {
 		let accounts = try!(self.directory.list()).iter().map(|key_id| self.directory.get(key_id))