Merge pull request #135 from LFDT-Lockness/update-cggmp24

Update cggmp24

Author: maurges

.github/workflows/deps.yml

@@ -19,11 +19,11 @@ jobs:
       contents: read
       pull-requests: write
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         path: base_branch
         ref: ${{ github.base_ref }}
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         path: pr_branch
     - name: Retrieve base branch deps

.github/workflows/docs.yml

@@ -17,7 +17,7 @@ jobs:
       contents: read
       pull-requests: write
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Compile LaTeX document
       uses: xu-cheng/latex-action@v3
       with:
@@ -40,7 +40,7 @@ jobs:
   build_docs:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: dtolnay/rust-toolchain@nightly
     - uses: Swatinem/rust-cache@v2
       with:

.github/workflows/publish.yml

@@ -22,7 +22,7 @@ jobs:
       github.ref_type == 'tag'
       && startsWith(github.ref_name, 'v')
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - run: cargo publish -p cggmp21
       env:
         CARGO_REGISTRY_TOKEN: ${{ secrets.CRATES_TOKEN }}
@@ -35,7 +35,7 @@ jobs:
       github.ref_type == 'tag'
       && startsWith(github.ref_name, 'key-share-v')
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - run: cargo publish -p key-share
       env:
         CARGO_REGISTRY_TOKEN: ${{ secrets.CRATES_TOKEN }}
@@ -48,7 +48,7 @@ jobs:
       github.ref_type == 'tag'
       && startsWith(github.ref_name, 'cggmp21-keygen-v')
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - run: cargo publish -p cggmp21-keygen
       env:
         CARGO_REGISTRY_TOKEN: ${{ secrets.CRATES_TOKEN }}
@@ -61,7 +61,7 @@ jobs:
       github.ref_type == 'tag'
       && startsWith(github.ref_name, 'paillier-zk-v')
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - run: cargo publish -p paillier-zk
       env:
         CARGO_REGISTRY_TOKEN: ${{ secrets.CRATES_TOKEN }}

.github/workflows/readme.yml

@@ -12,7 +12,7 @@ jobs:
   check_readme:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Install cargo-hakari
       uses: baptiste0928/cargo-install@v1
       with:

.github/workflows/rust.yml

@@ -15,13 +15,13 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: Swatinem/rust-cache@v2
       with:
         cache-on-failure: "true"
     - name: Build
       run: cargo build --release --all-features
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
         name: benchmark-tool
         path: target/release/measure_perf
@@ -36,7 +36,7 @@ jobs:
         - cggmp21
         - paillier-zk
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: Swatinem/rust-cache@v2
       with:
         cache-on-failure: "true"
@@ -45,7 +45,7 @@ jobs:
   build-wasm-nostd:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: Swatinem/rust-cache@v2
       with:
         cache-on-failure: "true"
@@ -59,7 +59,7 @@ jobs:
   test-default-features:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: Swatinem/rust-cache@v2
       with:
         cache-on-failure: "true"
@@ -70,7 +70,7 @@ jobs:
   test-all-features:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: Swatinem/rust-cache@v2
       with:
         cache-on-failure: "true"
@@ -80,13 +80,13 @@ jobs:
   fmt:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Check formatting
       run: cargo fmt --all -- --check
   clippy:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: Swatinem/rust-cache@v2
       with:
         cache-on-failure: "true"
@@ -95,7 +95,7 @@ jobs:
   clippy-tests:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: Swatinem/rust-cache@v2
       with:
         cache-on-failure: "true"
@@ -106,7 +106,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: dtolnay/rust-toolchain@nightly
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: Swatinem/rust-cache@v2
       with:
         cache-on-failure: "true"
@@ -120,8 +120,8 @@ jobs:
       pull-requests: write
     needs: build
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/download-artifact@v3
+    - uses: actions/checkout@v4
+    - uses: actions/download-artifact@v4
       with:
         name: benchmark-tool
     - name: Set file permissions
@@ -138,6 +138,6 @@ jobs:
   check-changelog:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Check changelogs
       run: ./.github/changelog.sh

Cargo.lock

@@ -19,7 +19,7 @@ paillier-zk = { version = "0.4.1", path = "paillier-zk", default-features = fals
 
 generic-ec = { version = "0.4.1", default-features = false } 
 generic-ec-zkp = { version = "0.4.1", default-features = false } 
-round-based = { version = "0.4", default-features = false }
+round-based = { version = "0.4.1", default-features = false }
 
 udigest = { version = "0.2.1", default-features = false }
 
@@ -31,7 +31,8 @@ rand_core = { version = "0.6", default-features = false }
 rand_hash = { version = "0.1" }
 rand_dev = "0.1"
 
-futures = "0.3"
+futures = { version = "0.3", default-features = false }
+futures-util = { version = "0.3", default-features = false }
 
 anyhow = "1"
 thiserror = "1"

Cargo.toml

@@ -53,7 +53,7 @@ Our implementation has been audited by Kudelski. Report can be found [here][repo
 
 > About notion of threshold and non-threshold keys: originally, CGGMP21 paper does not have support of
 arbitrary `t` and only works with non-threshold n-out-of-n keys. We have added support of arbitrary
-threshold $2 \le t \le n$, however, we made it possible to opt out therhsoldness so original CGGMP21
+threshold $2 \le t \le n$, however, we made it possible to opt out thresholdness so original CGGMP21
 protocol can be carried out if needed.
 
 ## Running the protocol
@@ -70,7 +70,7 @@ let outgoing: impl Sink<Outgoing<Msg>>;
 
 where:
 * `Msg` is a protocol message (e.g., `signing::msg::Msg`)
-* `round_based::Incoming` and `round_based::Outgoing` wrap `Msg` and provide additional data (e.g., sender/recepient)
+* `round_based::Incoming` and `round_based::Outgoing` wrap `Msg` and provide additional data (e.g., sender/recipient)
 * `futures::Stream` and `futures::Sink` are well-known async primitives.
 
 Once you have that, you can construct an `MpcParty`:
@@ -256,7 +256,7 @@ they are all documented in [the spec].
 ## Timing attacks
 Timing attacks are type of side-channel attacks that leak sensitive information through duration of
 execution. We consider timing attacks out of scope as they are nearly impossible to perform for such
-complicated protcol as CGGMP21 and impossible to do in our specific deployment. Thus, we intentionally
+complicated protocol as CGGMP21 and impossible to do in our specific deployment. Thus, we intentionally
 don't do constant-time operations which gives us a significant performance boost.
 
 ## Join us in Discord!

README.md

@@ -28,6 +28,8 @@ serde = { workspace = true, features = ["derive"] }
 serde_with = { workspace = true }
 hex = { workspace = true, features = ["serde"] }
 
+futures-util = { workspace = true }
+
 displaydoc = { workspace = true }
 thiserror = { workspace = true, optional = true }
 

cggmp21-keygen/Cargo.toml

@@ -271,21 +271,22 @@ where
 
     tracer.send_msg();
     outgoings
-        .send(Outgoing::broadcast(Msg::Round2Broad(
+        .feed(Outgoing::broadcast(Msg::Round2Broad(
             my_decommitment.clone(),
         )))
         .await
         .map_err(IoError::send_message)?;
 
-    for j in utils::iter_peers(i, n) {
+    let messages = utils::iter_peers(i, n).map(|j| {
         let message = MsgRound2Uni {
             sigma: sigmas[usize::from(j)],
         };
-        outgoings
-            .send(Outgoing::p2p(j, Msg::Round2Uni(message)))
-            .await
-            .map_err(IoError::send_message)?;
-    }
+        Outgoing::p2p(j, Msg::Round2Uni(message))
+    });
+    outgoings
+        .send_all(&mut futures_util::stream::iter(messages.map(Ok)))
+        .await
+        .map_err(IoError::send_message)?;
     tracer.msg_sent();
 
     // Round 3

cggmp21-keygen/src/threshold.rs

@@ -418,12 +418,16 @@ where
             fac_proof: phi.clone(),
         };
         outgoings
-            .send(Outgoing::p2p(j, Msg::Round3(msg)))
+            .feed(Outgoing::p2p(j, Msg::Round3(msg)))
             .await
             .map_err(IoError::send_message)?;
         tracer.msg_sent();
     }
 
+    tracer.send_msg();
+    outgoings.flush().await.map_err(IoError::send_message)?;
+    tracer.msg_sent();
+
     // Output
     tracer.round_begins();
 

cggmp21/src/key_refresh/aux_only.rs

@@ -523,12 +523,16 @@ where
             C,
         };
         outgoings
-            .send(Outgoing::p2p(j, Msg::Round3(msg)))
+            .feed(Outgoing::p2p(j, Msg::Round3(msg)))
             .await
             .map_err(IoError::send_message)?;
         tracer.msg_sent();
     }
 
+    tracer.send_msg();
+    outgoings.flush().await.map_err(IoError::send_message)?;
+    tracer.msg_sent();
+
     // Output
     tracer.round_begins();
 

cggmp21/src/key_refresh/non_threshold.rs

@@ -35,7 +35,7 @@
 //!
 //! > About notion of threshold and non-threshold keys: originally, CGGMP21 paper does not have support of
 //! arbitrary `t` and only works with non-threshold n-out-of-n keys. We have added support of arbitrary
-//! threshold $2 \le t \le n$, however, we made it possible to opt out therhsoldness so original CGGMP21
+//! threshold $2 \le t \le n$, however, we made it possible to opt out thresholdness so original CGGMP21
 //! protocol can be carried out if needed.
 //!
 //! ## Running the protocol
@@ -52,7 +52,7 @@
 //!
 //! where:
 //! * `Msg` is a protocol message (e.g., [`signing::msg::Msg`])
-//! * [`round_based::Incoming`] and [`round_based::Outgoing`] wrap `Msg` and provide additional data (e.g., sender/recepient)
+//! * [`round_based::Incoming`] and [`round_based::Outgoing`] wrap `Msg` and provide additional data (e.g., sender/recipient)
 //! * [`futures::Stream`] and [`futures::Sink`] are well-known async primitives.
 //!
 //! Once you have that, you can construct an [`MpcParty`](round_based::MpcParty):
@@ -281,7 +281,7 @@
 //! ## Timing attacks
 //! Timing attacks are type of side-channel attacks that leak sensitive information through duration of
 //! execution. We consider timing attacks out of scope as they are nearly impossible to perform for such
-//! complicated protcol as CGGMP21 and impossible to do in our specific deployment. Thus, we intentionally
+//! complicated protocol as CGGMP21 and impossible to do in our specific deployment. Thus, we intentionally
 //! don't do constant-time operations which gives us a significant performance boost.
 //!
 //! ## Join us in Discord!