Skip to content

Commit f9d3297

Browse files
Bump the minor-changes group across 1 directory with 9 updates (#182)
Bumps the minor-changes group with 9 updates in the / directory: | Package | From | To | | --- | --- | --- | | [elliptic-curve](https://github.com/RustCrypto/traits) | `0.14.0-rc.16` | `0.14.0-rc.17` | | [base64ct](https://github.com/RustCrypto/formats) | `1.8.0` | `1.8.1` | | [hashbrown](https://github.com/rust-lang/hashbrown) | `0.16.0` | `0.16.1` | | [sha2](https://github.com/RustCrypto/hashes) | `0.11.0-rc.2` | `0.11.0-rc.3` | | [curve25519-dalek](https://github.com/dalek-cryptography/curve25519-dalek) | `5.0.0-pre.1` | `5.0.0-pre.3` | | [insta](https://github.com/mitsuhiko/insta) | `1.43.2` | `1.45.0` | | [k256](https://github.com/RustCrypto/elliptic-curves) | `0.14.0-rc.0` | `0.14.0-rc.1` | | [serde_json](https://github.com/serde-rs/json) | `1.0.145` | `1.0.146` | | [clap](https://github.com/clap-rs/clap) | `4.5.51` | `4.5.53` | Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Alex Ostrovski <ostrovski.alex@gmail.com>
1 parent 2c11964 commit f9d3297

29 files changed

Lines changed: 707 additions & 599 deletions

Cargo.lock

Lines changed: 614 additions & 482 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,23 +26,23 @@ rustdoc-args = ["--cfg", "docsrs"]
2626

2727
[dependencies]
2828
# Public dependencies (present in public API of the crate).
29-
elliptic-curve = { version = "=0.14.0-rc.16", features = ["alloc", "sec1"] }
29+
elliptic-curve = { version = "=0.14.0-rc.29", features = ["alloc", "sec1"] }
3030

3131
# Enables `Serialize` / `Deserialize` implementation for most types in the crate.
3232
serde = { version = "1.0", default-features = false, features = ["derive", "alloc"], optional = true }
3333

3434
# Private dependencies (not exposed via public APIs).
3535
base64ct = { version = "1.8", default-features = false, features = ["alloc"] }
36-
hashbrown = { version = "0.16.0", optional = true }
36+
hashbrown = { version = "0.16.1", optional = true }
3737
merlin = { version = "3.0.0", default-features = false }
38-
rand_chacha = { version = "0.9.0", default-features = false }
39-
sha2 = { version = "=0.11.0-rc.2", default-features = false }
38+
rand_chacha = { version = "0.10.0", default-features = false }
39+
sha2 = { version = "0.11.0", default-features = false }
4040
subtle = { version = "2.6.1", default-features = false }
4141

4242
# Crypto backend to support Curve25519 prime subgroup and Ristretto255 group;
4343
# a public dependency.
4444
[dependencies.curve25519-dalek]
45-
version = "=5.0.0-pre.1"
45+
version = "=5.0.0-pre.6"
4646
optional = true
4747

4848
# Crypto backend to support Curve25519 prime subgroup and Ristretto255 group;
@@ -59,14 +59,14 @@ bulletproofs = "5.0.0"
5959
bulletproofs-curve = { package = "curve25519-dalek", version = "4.1.1" }
6060
bulletproofs-rand-core = { package = "rand_core", version = "0.6" }
6161

62-
criterion = "0.7.0"
62+
criterion = "0.8.2"
6363
doc-comment = "0.3.4"
64-
insta = { version = "1.43.2", features = ["yaml"] }
65-
k256 = { version = "=0.14.0-rc.0", default-features = false, features = ["arithmetic"] }
66-
rand = "0.9.2"
64+
insta = { version = "1.47.1", features = ["yaml"] }
65+
k256 = { version = "=0.14.0-rc.8", default-features = false, features = ["arithmetic"] }
66+
rand = "0.10.0"
6767
serde_json = "1.0"
68-
clap = { version = "4.5.51", features = ["derive"] }
69-
test-casing = "0.1.3"
68+
clap = { version = "4.5.60", features = ["derive"] }
69+
test-casing = "=0.2.0-beta.1"
7070
version-sync = "0.9.2"
7171
yab = { version = "0.1.0", git = "https://github.com/slowli/yab.git", rev = "efaa2fd6088a6ad52911806e56609dd29106c225" }
7272

benches/basics.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use elastic_elgamal::{
88
group::{Curve25519Subgroup, Generic, Group, Ristretto},
99
};
1010
use merlin::Transcript;
11-
use rand::{Rng, SeedableRng, seq::SliceRandom};
11+
use rand::{RngExt, SeedableRng, seq::SliceRandom};
1212
use rand_chacha::ChaChaRng;
1313

1414
type K256 = Generic<k256::Secp256k1>;

deny.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ wildcards = "deny"
2424
skip-tree = [
2525
# `curve25519-dalek-ng` is not actively maintained
2626
{ name = "curve25519-dalek-ng", version = "^4" },
27+
# `bulletproofs` are not actively maintained
28+
{ name = "bulletproofs", version = "^5" },
2729
]
2830

2931
[sources]

examples/equivalence.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ fn upgrade_point(x: bulletproofs_curve::RistrettoPoint) -> curve25519_dalek::Ris
3131
#[derive(Debug)]
3232
struct CompatRng<R>(R);
3333

34-
impl<R: elliptic_curve::rand_core::RngCore> bulletproofs_rand_core::RngCore for CompatRng<R> {
34+
impl<R: elliptic_curve::rand_core::Rng> bulletproofs_rand_core::RngCore for CompatRng<R> {
3535
fn next_u32(&mut self) -> u32 {
3636
self.0.next_u32()
3737
}

examples/range.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//! Example for using `RangeProof`s.
22
33
use elastic_elgamal::{DiscreteLogTable, Keypair, RangeDecomposition, group::Ristretto};
4-
use rand::Rng;
4+
use rand::RngExt;
55

66
/// Exclusive upper bound of the plaintext value range.
77
const UPPER_BOUND: u64 = 100;

examples/voting.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ use elastic_elgamal::{
1515
group::{Generic, Group, Ristretto},
1616
sharing::{ActiveParticipant, Dealer, Params, PublicKeySet},
1717
};
18-
use elliptic_curve::rand_core::{CryptoRng, RngCore};
18+
use elliptic_curve::rand_core::CryptoRng;
1919
use rand::{
20-
Rng,
20+
RngExt,
2121
seq::{IndexedMutRandom, IteratorRandom},
2222
};
2323

@@ -102,7 +102,7 @@ impl Args {
102102
}
103103
}
104104

105-
fn initialize_talliers<G: Group, R: CryptoRng + RngCore>(
105+
fn initialize_talliers<G: Group, R: CryptoRng>(
106106
&self,
107107
rng: &mut R,
108108
) -> (PublicKeySet<G>, Vec<ActiveParticipant<G>>) {
@@ -142,7 +142,7 @@ impl Args {
142142
let decryption_shares: Vec<_> = talliers
143143
.iter()
144144
.enumerate()
145-
.choose_multiple(&mut rng, key_set.params().threshold)
145+
.sample(&mut rng, key_set.params().threshold)
146146
.into_iter()
147147
.map(|(j, tallier)| (j, tallier.decrypt_share(option_totals, &mut rng)))
148148
.map(|(j, (share, proof))| {

src/app/choice.rs

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@
22
33
use core::{fmt, iter, ops};
44

5-
use elliptic_curve::{
6-
rand_core::{CryptoRng, RngCore},
7-
zeroize::Zeroizing,
8-
};
5+
use elliptic_curve::{rand_core::CryptoRng, zeroize::Zeroizing};
96
use merlin::Transcript;
107
#[cfg(feature = "serde")]
118
use serde::{Deserialize, Serialize, de::DeserializeOwned};
@@ -30,7 +27,7 @@ pub trait ProveSum<G: Group>: Clone + crate::sealed::Sealed {
3027
type Proof: Sized + Serialize + DeserializeOwned;
3128

3229
#[doc(hidden)]
33-
fn prove<R: CryptoRng + RngCore>(
30+
fn prove<R: CryptoRng>(
3431
&self,
3532
ciphertext: &CiphertextWithValue<G, u64>,
3633
receiver: &PublicKey<G>,
@@ -59,7 +56,7 @@ impl crate::sealed::Sealed for SingleChoice {}
5956
impl<G: Group> ProveSum<G> for SingleChoice {
6057
type Proof = LogEqualityProof<G>;
6158

62-
fn prove<R: CryptoRng + RngCore>(
59+
fn prove<R: CryptoRng>(
6360
&self,
6461
ciphertext: &CiphertextWithValue<G, u64>,
6562
receiver: &PublicKey<G>,
@@ -111,7 +108,7 @@ impl crate::sealed::Sealed for MultiChoice {}
111108
impl<G: Group> ProveSum<G> for MultiChoice {
112109
type Proof = ();
113110

114-
fn prove<R: CryptoRng + RngCore>(
111+
fn prove<R: CryptoRng>(
115112
&self,
116113
_ciphertext: &CiphertextWithValue<G, u64>,
117114
_receiver: &PublicKey<G>,
@@ -288,7 +285,7 @@ impl<G: Group> EncryptedChoice<G, SingleChoice> {
288285
/// # Panics
289286
///
290287
/// Panics if `choice` exceeds the maximum index allowed by `params`.
291-
pub fn single<R: CryptoRng + RngCore>(
288+
pub fn single<R: CryptoRng>(
292289
params: &ChoiceParams<G, SingleChoice>,
293290
choice: usize,
294291
rng: &mut R,
@@ -313,11 +310,7 @@ impl<G: Group, S: ProveSum<G>> EncryptedChoice<G, S> {
313310
/// # Panics
314311
///
315312
/// Panics if the length of `choices` differs from the number of options specified in `params`.
316-
pub fn new<R: CryptoRng + RngCore>(
317-
params: &ChoiceParams<G, S>,
318-
choices: &[bool],
319-
rng: &mut R,
320-
) -> Self {
313+
pub fn new<R: CryptoRng>(params: &ChoiceParams<G, S>, choices: &[bool], rng: &mut R) -> Self {
321314
assert!(!choices.is_empty(), "No choices provided");
322315
assert_eq!(
323316
choices.len(),

src/app/quadratic_voting.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
33
use core::fmt;
44

5-
use elliptic_curve::rand_core::{CryptoRng, RngCore};
5+
use elliptic_curve::rand_core::CryptoRng;
66
use merlin::Transcript;
77
#[cfg(feature = "serde")]
88
use serde::{Deserialize, Serialize};
@@ -231,7 +231,7 @@ impl<G: Group> QuadraticVotingBallot<G> {
231231
/// # Panics
232232
///
233233
/// Panics if the length of `votes` differs from the number of options in `params`.
234-
pub fn new<R: CryptoRng + RngCore>(
234+
pub fn new<R: CryptoRng>(
235235
params: &QuadraticVotingParams<G>,
236236
votes: &[u64],
237237
rng: &mut R,

src/decryption.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//! Verifiable decryption.
22
3-
use elliptic_curve::rand_core::{CryptoRng, RngCore};
3+
use elliptic_curve::rand_core::CryptoRng;
44
use merlin::Transcript;
55
#[cfg(feature = "serde")]
66
use serde::{Deserialize, Serialize};
@@ -86,7 +86,7 @@ impl<G: Group> VerifiableDecryption<G> {
8686
/// a zero-knowledge proof of validity.
8787
///
8888
/// See [`CandidateDecryption::verify()`] for the verification counterpart.
89-
pub fn new<R: CryptoRng + RngCore>(
89+
pub fn new<R: CryptoRng>(
9090
ciphertext: Ciphertext<G>,
9191
keys: &Keypair<G>,
9292
transcript: &mut Transcript,

0 commit comments

Comments
 (0)