fluencelabs/rust-libp2p
1
0
Fork 0
mirror of https://github.com/fluencelabs/rust-libp2p synced 2025-06-14 10:31:21 +00:00
Code Issues Projects Releases Wiki Activity

Replace sha1 and tiny-keccak with RustCrypto crates (#1014)

Browse Source 
* replace sha1 and tiny-keccak with RustCrypto crates

* Update misc/multihash/src/lib.rs

Co-Authored-By: newpavlov <newpavlov@gmail.com>
This commit is contained in:
Artyom Pavlov
2019-03-20 18:19:50 +00:00
committed by Pierre Krieger
parent 761c46ef19
commit 3f05de6d7c
2 changed files with 17 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
misc/multihash/Cargo.toml
View File

@ -12,7 +12,7 @@ documentation = "https://docs.rs/parity-multihash/"
[dependencies] [dependencies]
blake2 = { version = "0.8", default-features = false } blake2 = { version = "0.8", default-features = false }
rand = { version = "0.6", default-features = false, features = ["std"] } rand = { version = "0.6", default-features = false, features = ["std"] }
sha1 = "0.6" sha-1 = { version = "0.8", default-features = false }
sha2 = { version = "0.8", default-features = false } sha2 = { version = "0.8", default-features = false }
tiny-keccak = "1.4" sha3 = { version = "0.8", default-features = false }
unsigned-varint = "0.2" unsigned-varint = "0.2"

50
misc/multihash/src/lib.rs
View File

@ -10,44 +10,24 @@ mod hashes;
use sha2::Digest; use sha2::Digest;
use std::fmt::Write; use std::fmt::Write;
use tiny_keccak::Keccak;
use unsigned_varint::{decode, encode}; use unsigned_varint::{decode, encode};
pub use self::errors::{DecodeError, DecodeOwnedError, EncodeError}; pub use self::errors::{DecodeError, DecodeOwnedError, EncodeError};
pub use self::hashes::Hash; pub use self::hashes::Hash;
// Helper macro for encoding input into output using sha1, sha2, tiny_keccak, or blake2 /// Helper function for encoding input into output using given `Digest`
macro_rules! encode { fn digest_encode<D: Digest>(input: &[u8], output: &mut [u8]) {
(sha1, Sha1, $input:expr, $output:expr) => {{ output.copy_from_slice(&D::digest(input))
let mut hasher = sha1::Sha1::new();
hasher.update($input);
$output.copy_from_slice(&hasher.digest().bytes());
}};
(sha2, $algorithm:ident, $input:expr, $output:expr) => {{
let mut hasher = sha2::$algorithm::default();
hasher.input($input);
$output.copy_from_slice(hasher.result().as_ref());
}};
(tiny, $constructor:ident, $input:expr, $output:expr) => {{
let mut kec = Keccak::$constructor();
kec.update($input);
kec.finalize($output);
}};
(blake2, $algorithm:ident, $input:expr, $output:expr) => {{
let mut hasher = blake2::$algorithm::default();
hasher.input($input);
$output.copy_from_slice(hasher.result().as_ref());
}};
} }
// And another one to keep the matching DRY // And another one to keep the matching DRY
macro_rules! match_encoder { macro_rules! match_encoder {
($hash:ident for ($input:expr, $output:expr) { ($hash_id:ident for ($input:expr, $output:expr) {
$( $hashtype:ident => $lib:ident :: $method:ident, )* $( $hashtype:ident => $hash_ty:path, )*
}) => ({ }) => ({
match $hash { match $hash_id {
$( $(
Hash::$hashtype => encode!($lib, $method, $input, $output), Hash::$hashtype => digest_encode::<$hash_ty>($input, $output),
)* )*
_ => return Err(EncodeError::UnsupportedType) _ => return Err(EncodeError::UnsupportedType)
@ -90,14 +70,14 @@ pub fn encode(hash: Hash, input: &[u8]) -> Result<Multihash, EncodeError> {
SHA1 => sha1::Sha1, SHA1 => sha1::Sha1,
SHA2256 => sha2::Sha256, SHA2256 => sha2::Sha256,
SHA2512 => sha2::Sha512, SHA2512 => sha2::Sha512,
SHA3224 => tiny::new_sha3_224, SHA3224 => sha3::Sha3_224,
SHA3256 => tiny::new_sha3_256, SHA3256 => sha3::Sha3_256,
SHA3384 => tiny::new_sha3_384, SHA3384 => sha3::Sha3_384,
SHA3512 => tiny::new_sha3_512, SHA3512 => sha3::Sha3_512,
Keccak224 => tiny::new_keccak224, Keccak224 => sha3::Keccak224,
Keccak256 => tiny::new_keccak256, Keccak256 => sha3::Keccak256,
Keccak384 => tiny::new_keccak384, Keccak384 => sha3::Keccak384,
Keccak512 => tiny::new_keccak512, Keccak512 => sha3::Keccak512,
Blake2b512 => blake2::Blake2b, Blake2b512 => blake2::Blake2b,
Blake2s256 => blake2::Blake2s, Blake2s256 => blake2::Blake2s,
}); });