[refactor] hyperledger-iroha#3237: transplant Ed25519 and Secp256k1 c…

…ode from ursa Signed-off-by: Nikita Strygin <dcnick3@users.noreply.github.com>
DCNick3 · Oct 25, 2023 · ced4ddd · ced4ddd
1 parent 3398f3a
commit ced4ddd
Show file tree

Hide file tree

Showing 7 changed files with 905 additions and 37 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crypto/Cargo.toml b/crypto/Cargo.toml
@@ -39,12 +39,30 @@ getset = { workspace = true }
 
 ursa = { workspace = true, optional = true }
 blake2 = "0.10.6"
-# TODO: update after ursa is ditched
 sha2 = "0.10.8"
-# TODO: update after ursa is ditched
 hkdf = "0.12.3"
 amcl_wrapper = "0.4.0"
 
+# TODO: bump these
+ed25519-dalek = "1.0.1"
+curve25519-dalek = "3.2.1"
+x25519-dalek = "1.2.0"
+
+# TODO: bump me
+rand = "0.7"
+# TODO: bump me
+rand_chacha = "0.2"
+
+# TODO: bump me
+secp256k1 = { version = "0.19", features = ["rand", "serde"] }
+
+# TODO: bump me
+zeroize = "1.1"
+arrayref = "0.3.7"
+
+
 [dev-dependencies]
 hex-literal = { workspace = true }
 serde_json = { workspace = true }
+
+libsodium-sys-stable = { version = "1.20.3", features = [] }
diff --git a/crypto/src/hash.rs b/crypto/src/hash.rs
@@ -329,14 +329,11 @@ mod tests {
     #[cfg(not(feature = "ffi_import"))]
     fn blake2_32b() {
         let mut hasher = Blake2bVar::new(32).unwrap();
-        hasher.update(hex_literal::hex!("6920616d2064617461"));
-        hasher.finalize_variable(|res| {
-            assert_eq!(
-                res[..],
-                hex_literal::hex!(
-                    "BA67336EFD6A3DF3A70EEB757860763036785C182FF4CF587541A0068D09F5B2"
-                )[..]
-            );
-        });
+        hasher.update(&hex_literal::hex!("6920616d2064617461"));
+        assert_eq!(
+            hasher.finalize_boxed().as_ref(),
+            &hex_literal::hex!("BA67336EFD6A3DF3A70EEB757860763036785C182FF4CF587541A0068D09F5B2")
+                [..]
+        );
     }
 }