ed448-goldilocks,hash2curve: replace sha3 with shake (#1764)

Shake has recently been split off from sha3 into a dedicated `shake` crate: RustCrypto/hashes#869

This makes the adjustments in the downstream crates to reflect that change.

Author: baloo

Cargo.lock

@@ -19,7 +19,7 @@ This crate also includes signing and verifying of Ed448 signatures.
 elliptic-curve = { version = "0.14.0-rc.32", features = ["arithmetic", "pkcs8"] }
 hash2curve = "0.14.0-rc.12"
 rand_core = { version = "0.10", default-features = false }
-sha3 = { version = "0.11", default-features = false }
+shake = { version = "0.1", default-features = false }
 subtle = { version = "2.6", default-features = false }
 
 # optional dependencies

ed448-goldilocks/Cargo.toml

@@ -20,7 +20,7 @@ It is intended to be portable, fast, and safe.
 use ed448_goldilocks::{
     Ed448, EdwardsPoint, CompressedEdwardsY, EdwardsScalar,
     elliptic_curve::Generate,
-    sha3::Shake256
+    shake::Shake256
 };
 use elliptic_curve::{consts::U84, Field, group::GroupEncoding};
 use hash2curve::{ExpandMsgXof, GroupDigest};

ed448-goldilocks/README.md

@@ -618,7 +618,7 @@ mod test {
     use super::*;
     use crate::TWISTED_EDWARDS_BASE_POINT;
     use hash2curve::ExpandMsgXof;
-    use sha3::Shake256;
+    use shake::Shake256;
 
     #[test]
     fn test_edwards_decaf_operations() {

ed448-goldilocks/src/decaf/points.rs

@@ -83,7 +83,7 @@ mod test {
     use hash2curve::ExpandMsgXof;
     use hex_literal::hex;
     use proptest::property_test;
-    use sha3::Shake256;
+    use shake::Shake256;
 
     #[test]
     fn test_basic_add() {

ed448-goldilocks/src/decaf/scalar.rs

@@ -1006,7 +1006,7 @@ mod tests {
 
         for (msg, x, y) in MSGS {
             let p =
-                hash2curve::hash_from_bytes::<Ed448, ExpandMsgXof<sha3::Shake256>>(&[msg], &[DST])
+                hash2curve::hash_from_bytes::<Ed448, ExpandMsgXof<shake::Shake256>>(&[msg], &[DST])
                     .unwrap();
             assert_eq!(p.is_on_curve().unwrap_u8(), 1u8);
             let p = p.to_affine();
@@ -1045,7 +1045,7 @@ mod tests {
         ];
 
         for (msg, x, y) in MSGS {
-            let p = hash2curve::encode_from_bytes::<Ed448, ExpandMsgXof<sha3::Shake256>>(
+            let p = hash2curve::encode_from_bytes::<Ed448, ExpandMsgXof<shake::Shake256>>(
                 &[msg],
                 &[DST],
             )

ed448-goldilocks/src/edwards/extended.rs

@@ -102,7 +102,7 @@ mod test {
     use hash2curve::ExpandMsgXof;
     use hex_literal::hex;
     use proptest::property_test;
-    use sha3::Shake256;
+    use shake::Shake256;
 
     #[test]
     fn test_basic_add() {

ed448-goldilocks/src/edwards/scalar.rs

@@ -511,7 +511,7 @@ mod tests {
     use elliptic_curve::consts::U32;
     use hash2curve::{ExpandMsg, ExpandMsgXof, Expander};
     use hex_literal::hex;
-    use sha3::Shake256;
+    use shake::Shake256;
 
     fn assert_from_okm(dst: &[u8], msgs: &[(&[u8], [u8; 56], [u8; 56])]) {
         for (msg, expected_u0, expected_u1) in msgs {

ed448-goldilocks/src/field/element.rs

@@ -54,7 +54,7 @@ pub(crate) mod macros;
 pub use elliptic_curve;
 pub use hash2curve;
 pub use rand_core;
-pub use sha3;
+pub use shake;
 pub use subtle;
 
 pub(crate) mod curve;
@@ -87,7 +87,7 @@ use elliptic_curve::{
     point::PointCompression,
 };
 use hash2curve::{ExpandMsgXof, GroupDigest};
-use sha3::Shake256;
+use shake::Shake256;
 
 /// Edwards448 curve.
 #[derive(Copy, Clone, Debug, Default, Eq, PartialEq, Ord, PartialOrd, Hash)]

ed448-goldilocks/src/lib.rs

@@ -57,7 +57,7 @@
 #![cfg_attr(feature = "getrandom", doc = "```")]
 #![cfg_attr(not(feature = "getrandom"), doc = "```ignore")]
 //! use ed448_goldilocks::{SigningKey, PreHasherXof, elliptic_curve::Generate};
-//! use sha3::{Shake256, digest::Update};
+//! use shake::{Shake256, digest::Update};
 //!
 //! let msg = b"Hello World";
 //!