Add twox hash (#20)

Author: guoxbin

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "dtool"
-version = "0.9.0"
+version = "0.10.0"
 authors = ["GB <[email protected]>"]
 description = "A command-line tool collection to assist development"
 categories = ["command-line-utilities"]
@@ -41,3 +41,5 @@ signatory-secp256k1 = "0.17.0"
 secp256k1 = "0.15"
 untrusted = "0.7.0"
 schnorrkel = "0.8.5"
+twox-hash = "1.5.0"
+byteorder = "1.3.1"

Cargo.toml

@@ -23,7 +23,7 @@ Now `dtool` supports:
 - [Hex / base64 conversion](./docs/Usage.md#hex--base64-conversion)
 - [URL encode / decode](./docs/Usage.md#url-encode--decode)
 - [Number codec](./docs/Usage.md#number-codec)
-- [Hash (MD5, SHA-1, SHA-2, SHA-3, RIPEMD, CRC, Blake2b, SM3)](./docs/Usage.md#hash-md5-sha-1-sha-2-sha-3-ripemd-crc-blake2b-sm3)
+- [Hash (MD5, SHA-1, SHA-2, SHA-3, RIPEMD, CRC, Blake2b, SM3, Twox)](./docs/Usage.md#hash-md5-sha-1-sha-2-sha-3-ripemd-crc-blake2b-sm3-twox)
 - [UTF-8 string / unicode conversion](./docs/Usage.md#utf-8-string--unicode-conversion)
 - [HTML entity encode / decode](./docs/Usage.md#html-entity-encode--decode)
 - [Regex match](./docs/Usage.md#regex-match)

README.md

@@ -8,7 +8,7 @@
 - [Hex / base64 conversion](#hex--base64-conversion)
 - [URL encode / decode](#url-encode--decode)
 - [Number codec](#number-codec)
-- [Hash (MD5, SHA-1, SHA-2, SHA-3, RIPEMD, CRC, Blake2b, SM3)](#hash-md5-sha-1-sha-2-sha-3-ripemd-crc-blake2b-sm3)
+- [Hash (MD5, SHA-1, SHA-2, SHA-3, RIPEMD, CRC, Blake2b, SM3, Twox)](#hash-md5-sha-1-sha-2-sha-3-ripemd-crc-blake2b-sm3-twox)
 - [UTF-8 string / unicode conversion](#utf-8-string--unicode-conversion)
 - [HTML entity encode / decode](#html-entity-encode--decode)
 - [Regex match](#regex-match)
@@ -100,7 +100,7 @@
 |    nd     |Number decode<br>Compact<br>v0.1.0|              $ dtool nd -tc 0xed03<br>251               |
 
 
-## Hash (MD5, SHA-1, SHA-2, SHA-3, RIPEMD, CRC, Blake2b, SM3)
+## Hash (MD5, SHA-1, SHA-2, SHA-3, RIPEMD, CRC, Blake2b, SM3, Twox)
 
 |Sub command|                     Desc                      |                                                                                       Example                                                                                        |
 |-----------|-----------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
@@ -127,6 +127,7 @@
 |   hash    |     Hex to hash<br>Blake2b 384<br>v0.5.0      |                   $ dtool hash -a blake2b_384 0x616263<br>0x6f56a82c8e7ef526dfe182eb5212f7db9df1317e57815dbda46083fc30\\<br>f54ee6c66ba83be64b302d7cba6ce15bb556f4                   |
 |   hash    |     Hex to hash<br>Blake2b 512<br>v0.5.0      |$ dtool hash -a blake2b_512 0x616263<br>0xba80a53f981c4d0d6a2797b69f12f6e94c212f14685ac4b74b12bb6fdb\\<br>ffa2d17d87c5392aab792dc252d5de4533cc9518d38aa8dbf1925ab92386\\<br>edd4009923|
 |   hash    |         Hex to hash<br>SM3<br>v0.7.0          |                                       $ dtool hash -a sm3 0x616263<br>0x66c7f0f462eeedd9d1f2d46bdc10e4e24167c4875cf2f7a2297da02b8f\\<br>4ba8e0                                       |
+|   hash    |        Hex to hash<br>TwoX<br>v0.10.0         |                                                               $ dtool hash -a twox -s 1 0x616263<br>0x0889329981caa9be                                                               |
 
 
 ## UTF-8 string / unicode conversion

docs/Usage.md

@@ -180,7 +180,7 @@ fn vec_to_signature(vec: Vec<u8>) -> Result<Signature, String> {
 fn slice_to_u64x4(slice: &[u8]) -> U64x4 {
 	U64x4 {
 		value: [
-			u64::from_be_bytes({ slice_to_arr(&slice[24..32]) }),
+			u64::from_be_bytes(slice_to_arr(&slice[24..32])),
 			u64::from_be_bytes(slice_to_arr(&slice[16..24])),
 			u64::from_be_bytes(slice_to_arr(&slice[8..16])),
 			u64::from_be_bytes(slice_to_arr(&slice[0..8])),
@@ -223,8 +223,8 @@ pub fn cases() -> LinkedHashMap<&'static str, Vec<Case>> {
 			 Case {
 				 desc: "SM2".to_string(),
 				 input: vec!["-c", "sm2", "-p", "0x044b2dd8bf6dbbfb14db3e4d17bd7a3e8758eb4232049bec931d1038f4afaae46ac3c771f929bbf35a28b0363789fb19127cea3318f4c8902a0034ca5f1b7667d1", "-S",
-				             "0x0a4d089d3177234ed34aa7f30c6a7a7954539f68825bedbe82be65aefdb733c921207be31b8071bbfd5c99044ebde49d3c38e9972063b844f65f4acfc7d6dff2",
-				             "0x616263"].into_iter().map(Into::into).collect(),
+							 "0x0a4d089d3177234ed34aa7f30c6a7a7954539f68825bedbe82be65aefdb733c921207be31b8071bbfd5c99044ebde49d3c38e9972063b844f65f4acfc7d6dff2",
+							 "0x616263"].into_iter().map(Into::into).collect(),
 				 output: vec!["true"].into_iter().map(Into::into).collect(),
 				 is_example: true,
 				 is_test: true,

src/modules/ecdsa/sm2.rs

@@ -11,7 +11,7 @@ use yogcrypt::sm3::sm3_enc;
 
 pub fn module<'a, 'b>() -> Module<'a, 'b> {
 	Module {
-		desc: "Hash (MD5, SHA-1, SHA-2, SHA-3, RIPEMD, CRC, Blake2b, SM3)".to_string(),
+		desc: "Hash (MD5, SHA-1, SHA-2, SHA-3, RIPEMD, CRC, Blake2b, SM3, Twox)".to_string(),
 		commands: commands(),
 		get_cases: cases::cases,
 	}
@@ -26,6 +26,7 @@ struct Algorithm {
 enum AlgorithmF {
 	Normal(fn(data: Vec<u8>) -> Result<Vec<u8>, String>),
 	WithKey(fn(data: Vec<u8>, key: Vec<u8>) -> Result<Vec<u8>, String>),
+	WithSeed(fn(data: Vec<u8>, seed: u64) -> Result<Vec<u8>, String>),
 }
 
 lazy_static! {
@@ -145,6 +146,11 @@ lazy_static! {
 			help: "Chinese National Standard SM3",
 			f: AlgorithmF::Normal(sm3),
 		},
+		Algorithm {
+			name: "twox",
+			help: "TwoX",
+			f: AlgorithmF::WithSeed(twox),
+		},
 	];
 	static ref ALGORITHMS: HashMap<&'static str, &'static Algorithm> =
 		RAW_ALGORITHMS.iter().map(|x| (x.name, x)).collect();
@@ -176,6 +182,14 @@ pub fn commands<'a, 'b>() -> Vec<Command<'a, 'b>> {
 					.takes_value(true)
 					.required(false),
 			)
+			.arg(
+				Arg::with_name("SEED")
+					.long("seed")
+					.short("s")
+					.help("Seed for twox")
+					.takes_value(true)
+					.required(false),
+			)
 			.arg(Arg::with_name("INPUT").required(false).index(1)),
 		f: hash,
 	}]
@@ -197,6 +211,13 @@ fn hash(matches: &ArgMatches) -> Result<Vec<String>, String> {
 					None => vec![],
 				};
 				(f)(input, key)?
+			},
+			AlgorithmF::WithSeed(f) => {
+				let seed = match matches.value_of("SEED") {
+					Some(seed) => seed.parse::<u64>().map_err(|_| "Invalid seed")?.into(),
+					None => 0,
+				};
+				(f)(input, seed)?
 			}
 		},
 		None => return Err("Invalid algorithm".to_string()),
@@ -366,6 +387,17 @@ fn sm3(data: Vec<u8>) -> Result<Vec<u8>, String> {
 	Ok(result)
 }
 
+fn twox(data: Vec<u8>, seed: u64) -> Result<Vec<u8>, String> {
+	use ::core::hash::Hasher;
+	let mut h = twox_hash::XxHash::with_seed(seed);
+	h.write(&data);
+	let r = h.finish();
+	use byteorder::{ByteOrder, LittleEndian};
+	let mut dest = vec![0u8; 8];
+	LittleEndian::write_u64(&mut dest[0..8], r);
+	Ok(dest)
+}
+
 mod cases {
 	use crate::modules::Case;
 	use linked_hash_map::LinkedHashMap;
@@ -590,6 +622,14 @@ mod cases {
 					 is_test: true,
 					 since: "0.7.0".to_string(),
 				 },
+				 Case {
+					 desc: "TwoX".to_string(),
+					 input: vec!["-a", "twox", "-s", "1", "0x616263"].into_iter().map(Into::into).collect(),
+					 output: vec!["0x0889329981caa9be"].into_iter().map(Into::into).collect(),
+					 is_example: true,
+					 is_test: true,
+					 since: "0.10.0".to_string(),
+				 },
 			 ]),
 		].into_iter().collect()
 	}