[refactor] hyperledger-iroha#3237: Use blake2 crate without going thr…

…ough ursa

Signed-off-by: Nikita Strygin <[email protected]>

crypto/Cargo.toml

@@ -35,9 +35,11 @@ serde = { workspace = true, features = ["derive"] }
 serde_with = { workspace = true, features = ["macros"] }
 hex = { workspace = true, features = ["alloc", "serde"] }
 openssl-sys = { version = "0.9.93", features = ["vendored"], optional = true }
-ursa = { workspace = true, optional = true }
 getset = { workspace = true }
 
+ursa = { workspace = true, optional = true }
+blake2 = "0.10.6"
+
 [dev-dependencies]
 hex-literal = { workspace = true }
 serde_json = { workspace = true }

crypto/src/hash.rs

@@ -2,18 +2,18 @@
 use alloc::{borrow::ToOwned as _, format, string::String, vec, vec::Vec};
 use core::{hash, marker::PhantomData, num::NonZeroU8, str::FromStr};
 
+#[cfg(all(feature = "std", not(feature = "ffi_import")))]
+use blake2::{
+    digest::{Update, VariableOutput},
+    Blake2bVar,
+};
 use derive_more::{DebugCustom, Deref, DerefMut, Display};
 #[cfg(any(feature = "std", feature = "ffi_import"))]
 use iroha_macro::ffi_impl_opaque;
 use iroha_schema::{IntoSchema, TypeId};
 use parity_scale_codec::{Decode, Encode};
 use serde::{Deserialize, Serialize};
 use serde_with::DeserializeFromStr;
-#[cfg(all(feature = "std", not(feature = "ffi_import")))]
-use ursa::blake2::{
-    digest::{Update, VariableOutput},
-    VarBlake2b,
-};
 
 use crate::{error::Error, hex_decode};
 
@@ -46,7 +46,7 @@ impl Hash {
     /// Length of hash
     pub const LENGTH: usize = 32;
 
-    /// Wrap the given bytes; they must be prehashed with `VarBlake2b`
+    /// Wrap the given bytes; they must be prehashed with `Blake2bVar`
     pub fn prehashed(mut hash: [u8; Self::LENGTH]) -> Self {
         hash[Self::LENGTH - 1] |= 1;
         // SAFETY:
@@ -72,7 +72,7 @@ impl Hash {
     // NOTE: Panic is predicated by implementation not user input
     #[allow(clippy::missing_panics_doc)]
     pub fn new(bytes: impl AsRef<[u8]>) -> Self {
-        let vec_hash = VarBlake2b::new(Self::LENGTH)
+        let vec_hash = Blake2bVar::new(Self::LENGTH)
             .expect("Failed to initialize variable size hash")
             .chain(bytes)
             .finalize_boxed();
@@ -328,7 +328,7 @@ mod tests {
     #[cfg(feature = "std")]
     #[cfg(not(feature = "ffi_import"))]
     fn blake2_32b() {
-        let mut hasher = VarBlake2b::new(32).unwrap();
+        let mut hasher = Blake2bVar::new(32).unwrap();
         hasher.update(hex_literal::hex!("6920616d2064617461"));
         hasher.finalize_variable(|res| {
             assert_eq!(

crypto/src/lib.rs

@@ -22,6 +22,9 @@ use core::{fmt, str::FromStr};
 
 #[cfg(feature = "base64")]
 pub use base64;
+#[cfg(feature = "std")]
+#[cfg(not(feature = "ffi_import"))]
+pub use blake2;
 use derive_more::{DebugCustom, Display};
 use error::{Error, NoSuchAlgorithm};
 use getset::{CopyGetters, Getters};

p2p/src/lib.rs

@@ -3,14 +3,12 @@
 //! Cryptography are chosen in this module, and encapsulated.
 use std::{io, net::AddrParseError};
 
-use iroha_crypto::ursa::{
+use iroha_crypto::{
     blake2::{
         digest::{Update, VariableOutput},
-        VarBlake2b,
+        Blake2bVar,
     },
-    encryption::symm::prelude::ChaCha20Poly1305,
-    kex::x25519::X25519Sha256,
-    CryptoError,
+    ursa::{encryption::symm::prelude::ChaCha20Poly1305, kex::x25519::X25519Sha256, CryptoError},
 };
 pub use network::message::*;
 use parity_scale_codec::{Decode, Encode};
@@ -157,7 +155,7 @@ pub(crate) mod unbounded_with_len {
 /// Create Blake2b hash as u64 value
 pub fn blake2b_hash(slice: impl AsRef<[u8]>) -> u64 {
     const U64_SIZE: usize = core::mem::size_of::<u64>();
-    let hash = VarBlake2b::new(U64_SIZE)
+    let hash = Blake2bVar::new(U64_SIZE)
         .expect("Failed to create hash with given length")
         .chain(&slice)
         .finalize_boxed();