Merge branch 'main' of https://github.com/ZcashFoundation/frost into update-deps

Author: conradoplg

.github/dependabot.yml

@@ -8,6 +8,9 @@ updates:
   open-pull-requests-limit: 10
 - package-ecosystem: cargo
   directory: "/"
+  # Update only the lockfile. We shouldn't update Cargo.toml unless it's for
+  # a security issue, or if we need a new feature of the dependency.
+  versioning-strategy: lockfile-only
   schedule:
     interval: monthly
     timezone: America/New_York

.github/workflows/main.yml

@@ -18,6 +18,15 @@ jobs:
       - uses: dtolnay/rust-toolchain@beta
       - run: cargo build
 
+  build_latest:
+    name: build with latest versions of dependencies
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v6.0.0
+      - uses: dtolnay/rust-toolchain@stable
+      - run: cargo update && cargo build --all-features
+
   build_msrv:
     name: build with MSRV (1.81)
     runs-on: ubuntu-latest

frost-core/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 Entries are listed in reverse chronological order.
 
+## Unreleases
+
+### Breaking Changes
+
+* The `cheater-detection` feature was removed. If you relied on it (either by
+  using the default features, or by explicitly enabling it), then you don't have
+  to do anything (other than not enabling it explicitly if you were doing so);
+  the default behaviour is now as if `cheater-detection` was enabled. If you
+  explicitly *did not enable* it, you can avoid cheater detection by calling
+  `aggregate_custom()` with `CheaterDetection::Disabled`.
+
 ## 2.2.0
 
 ### Security Fixes

frost-core/Cargo.toml

@@ -46,7 +46,7 @@ rand_chacha.workspace = true
 serde_json.workspace = true
 
 [features]
-default = ["serialization", "cheater-detection", "std"]
+default = ["serialization", "std"]
 # No longer needed. Kept for retrocompatibility until 3.0.0
 std = []
 #! ## Features
@@ -61,8 +61,6 @@ serde = ["dep:serde", "dep:serdect"]
 serialization = ["serde", "dep:postcard"]
 # Exposes ciphersuite-generic tests for other crates to use
 test-impl = ["dep:proptest", "dep:serde_json", "dep:criterion", "dep:debugless-unwrap"]
-# Enable cheater detection
-cheater-detection = []
 
 [lib]
 bench = false

frost-core/src/lib.rs

@@ -570,24 +570,12 @@ pub fn aggregate<C>(
 where
     C: Ciphersuite,
 {
-    #[cfg(feature = "cheater-detection")]
-    {
-        aggregate_custom(
-            signing_package,
-            signature_shares,
-            pubkeys,
-            CheaterDetection::FirstCheater,
-        )
-    }
-    #[cfg(not(feature = "cheater-detection"))]
-    {
-        aggregate_custom(
-            signing_package,
-            signature_shares,
-            pubkeys,
-            CheaterDetection::Disabled,
-        )
-    }
+    aggregate_custom(
+        signing_package,
+        signature_shares,
+        pubkeys,
+        CheaterDetection::FirstCheater,
+    )
 }
 
 /// The type of cheater detection to use.

frost-core/src/tests/ciphersuite_generic.rs

@@ -315,14 +315,6 @@ fn check_aggregate_errors<C: Ciphersuite + PartialEq>(
     signature_shares: BTreeMap<frost::Identifier<C>, frost::round2::SignatureShare<C>>,
     pubkey_package: frost::keys::PublicKeyPackage<C>,
 ) {
-    #[cfg(not(feature = "cheater-detection"))]
-    let pubkey_package = PublicKeyPackage {
-        header: pubkey_package.header,
-        verifying_shares: BTreeMap::new(),
-        verifying_key: pubkey_package.verifying_key,
-    };
-
-    #[cfg(feature = "cheater-detection")]
     check_aggregate_corrupted_share(
         signing_package.clone(),
         signature_shares.clone(),
@@ -336,7 +328,6 @@ fn check_aggregate_errors<C: Ciphersuite + PartialEq>(
     );
 }
 
-#[cfg(feature = "cheater-detection")]
 fn check_aggregate_corrupted_share<C: Ciphersuite + PartialEq>(
     signing_package: frost::SigningPackage<C>,
     mut signature_shares: BTreeMap<frost::Identifier<C>, frost::round2::SignatureShare<C>>,

frost-ed25519/Cargo.toml

@@ -37,7 +37,7 @@ rand_chacha.workspace = true
 serde_json.workspace = true
 
 [features]
-default = ["serialization", "cheater-detection", "std"]
+default = ["serialization", "std"]
 # No longer needed. Kept for retrocompatibility until 3.0.0
 std = []
 #! ## Features
@@ -47,8 +47,6 @@ std = []
 serde = ["frost-core/serde"]
 ## Enable a default serialization format. Enables `serde`.
 serialization = ["serde", "frost-core/serialization", "frost-rerandomized/serialization"]
-## Enable cheater detection
-cheater-detection = ["frost-core/cheater-detection", "frost-rerandomized/cheater-detection"]
 
 [lib]
 # Disables non-criterion benchmark which is not used; prevents errors

frost-ed448/Cargo.toml

@@ -36,7 +36,7 @@ rand_chacha.workspace = true
 serde_json.workspace = true
 
 [features]
-default = ["serialization", "cheater-detection", "std"]
+default = ["serialization", "std"]
 # No longer needed. Kept for retrocompatibility until 3.0.0
 std = []
 #! ## Features
@@ -46,8 +46,6 @@ std = []
 serde = ["frost-core/serde"]
 ## Enable a default serialization format. Enables `serde`.
 serialization = ["serde", "frost-core/serialization", "frost-rerandomized/serialization"]
-## Enable cheater detection
-cheater-detection = ["frost-core/cheater-detection", "frost-rerandomized/cheater-detection"]
 
 [lib]
 # Disables non-criterion benchmark which is not used; prevents errors

frost-p256/Cargo.toml

@@ -36,7 +36,7 @@ rand_chacha.workspace = true
 serde_json.workspace = true
 
 [features]
-default = ["serialization", "cheater-detection", "std"]
+default = ["serialization", "std"]
 # No longer needed. Kept for retrocompatibility until 3.0.0
 std = []
 #! ## Features
@@ -46,8 +46,6 @@ std = []
 serde = ["frost-core/serde"]
 ## Enable a default serialization format. Enables `serde`.
 serialization = ["serde", "frost-core/serialization", "frost-rerandomized/serialization"]
-## Enable cheater detection
-cheater-detection = ["frost-core/cheater-detection", "frost-rerandomized/cheater-detection"]
 
 [lib]
 # Disables non-criterion benchmark which is not used; prevents errors

frost-rerandomized/Cargo.toml

@@ -25,7 +25,7 @@ rand_core.workspace = true
 [dev-dependencies]
 
 [features]
-default = ["serialization", "cheater-detection", "std"]
+default = ["serialization", "std"]
 # No longer needed. Kept for retrocompatibility until 3.0.0
 std = []
 #! ## Features
@@ -35,7 +35,5 @@ std = []
 serde = ["frost-core/serde"]
 # Exposes ciphersuite-generic tests for other crates to use
 test-impl = ["frost-core/test-impl", "serialization"]
-## Enable cheater detection
-cheater-detection = ["frost-core/cheater-detection"]
 ## Enable a default serialization format. Enables `serde`.
 serialization = ["serde", "frost-core/serialization"]