mirror of
https://github.com/serai-dex/serai.git
synced 2025-12-09 12:49:23 +00:00
Smash the singular Ciphersuite trait into multiple
This helps identify where the various functionalities are used, or rather, not used. The `Ciphersuite` trait present in `patches/ciphersuite`, facilitating the entire FCMP++ tree, only requires the markers _and_ canonical point decoding. I've opened a PR to upstream such a trait into `group` (https://github.com/zkcrypto/group/pull/68). `WrappedGroup` is still justified for as long as `Group::generator` exists. Moving `::generator()` to its own trait, on an independent structure (upstream) would be massively appreciated. @tarcieri also wanted to update from `fn generator()` to `const GENERATOR`, which would encourage further discussion on https://github.com/zkcrypto/group/issues/32 and https://github.com/zkcrypto/group/issues/45, which have been stagnant. The `Id` trait is occasionally used yet really should be first off the chopping block. Finally, `WithPreferredHash` is only actually used around a third of the time, which more than justifies it being a separate trait. --- Updates `dalek_ff_group::Scalar` to directly re-export `curve25519_dalek::Scalar`, as without issue. `dalek_ff_group::RistrettoPoint` also could be replaced with an export of `curve25519_dalek::RistrettoPoint`, yet the coordinator relies on how we implemented `Hash` on it for the hell of it so it isn't worth it at this time. `dalek_ff_group::EdwardsPoint` can't be replaced for an re-export of `curve25519_dalek::SubgroupPoint` as it doesn't implement `zeroize`, `subtle` traits within a released, non-yanked version. Relevance to https://github.com/serai-dex/serai/issues/201 and https://github.com/dalek-cryptography/curve25519-dalek/issues/811#issuecomment-3247732746. Also updates the `Ristretto` ciphersuite to prefer `Blake2b-512` over `SHA2-512`. In order to maintain compliance with FROST's IETF standard, `modular-frost` defines its own ciphersuite for Ristretto which still uses `SHA2-512`.
This commit is contained in:
@@ -17,7 +17,7 @@ use ciphersuite::{
|
||||
ff::{Field, PrimeField},
|
||||
GroupEncoding,
|
||||
},
|
||||
Ciphersuite,
|
||||
GroupIo, Id,
|
||||
};
|
||||
|
||||
/// The ID of a participant, defined as a non-zero u16.
|
||||
@@ -268,7 +268,7 @@ impl<F: Zeroize + PrimeField> Interpolation<F> {
|
||||
/// heap-allocated pointer to minimize copies on the stack (`ThresholdKeys`, the publicly exposed
|
||||
/// type).
|
||||
#[derive(Clone, PartialEq, Eq)]
|
||||
struct ThresholdCore<C: Ciphersuite> {
|
||||
struct ThresholdCore<C: GroupIo + Id> {
|
||||
params: ThresholdParams,
|
||||
group_key: C::G,
|
||||
verification_shares: HashMap<Participant, C::G>,
|
||||
@@ -276,7 +276,7 @@ struct ThresholdCore<C: Ciphersuite> {
|
||||
secret_share: Zeroizing<C::F>,
|
||||
}
|
||||
|
||||
impl<C: Ciphersuite> fmt::Debug for ThresholdCore<C> {
|
||||
impl<C: GroupIo + Id> fmt::Debug for ThresholdCore<C> {
|
||||
fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||
fmt
|
||||
.debug_struct("ThresholdCore")
|
||||
@@ -288,7 +288,7 @@ impl<C: Ciphersuite> fmt::Debug for ThresholdCore<C> {
|
||||
}
|
||||
}
|
||||
|
||||
impl<C: Ciphersuite> Zeroize for ThresholdCore<C> {
|
||||
impl<C: GroupIo + Id> Zeroize for ThresholdCore<C> {
|
||||
fn zeroize(&mut self) {
|
||||
self.params.zeroize();
|
||||
self.group_key.zeroize();
|
||||
@@ -302,7 +302,7 @@ impl<C: Ciphersuite> Zeroize for ThresholdCore<C> {
|
||||
|
||||
/// Threshold keys usable for signing.
|
||||
#[derive(Clone, Debug, Zeroize)]
|
||||
pub struct ThresholdKeys<C: Ciphersuite> {
|
||||
pub struct ThresholdKeys<C: GroupIo + Id> {
|
||||
// Core keys.
|
||||
#[zeroize(skip)]
|
||||
core: Arc<Zeroizing<ThresholdCore<C>>>,
|
||||
@@ -315,7 +315,7 @@ pub struct ThresholdKeys<C: Ciphersuite> {
|
||||
|
||||
/// View of keys, interpolated and with the expected linear combination taken for usage.
|
||||
#[derive(Clone)]
|
||||
pub struct ThresholdView<C: Ciphersuite> {
|
||||
pub struct ThresholdView<C: GroupIo + Id> {
|
||||
interpolation: Interpolation<C::F>,
|
||||
scalar: C::F,
|
||||
offset: C::F,
|
||||
@@ -326,7 +326,7 @@ pub struct ThresholdView<C: Ciphersuite> {
|
||||
verification_shares: HashMap<Participant, C::G>,
|
||||
}
|
||||
|
||||
impl<C: Ciphersuite> fmt::Debug for ThresholdView<C> {
|
||||
impl<C: GroupIo + Id> fmt::Debug for ThresholdView<C> {
|
||||
fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||
fmt
|
||||
.debug_struct("ThresholdView")
|
||||
@@ -341,7 +341,7 @@ impl<C: Ciphersuite> fmt::Debug for ThresholdView<C> {
|
||||
}
|
||||
}
|
||||
|
||||
impl<C: Ciphersuite> Zeroize for ThresholdView<C> {
|
||||
impl<C: GroupIo + Id> Zeroize for ThresholdView<C> {
|
||||
fn zeroize(&mut self) {
|
||||
self.scalar.zeroize();
|
||||
self.offset.zeroize();
|
||||
@@ -357,7 +357,7 @@ impl<C: Ciphersuite> Zeroize for ThresholdView<C> {
|
||||
}
|
||||
}
|
||||
|
||||
impl<C: Ciphersuite> ThresholdKeys<C> {
|
||||
impl<C: GroupIo + Id> ThresholdKeys<C> {
|
||||
/// Create a new set of ThresholdKeys.
|
||||
pub fn new(
|
||||
params: ThresholdParams,
|
||||
@@ -632,7 +632,7 @@ impl<C: Ciphersuite> ThresholdKeys<C> {
|
||||
|
||||
let mut verification_shares = HashMap::new();
|
||||
for l in (1 ..= n).map(Participant) {
|
||||
verification_shares.insert(l, <C as Ciphersuite>::read_G(reader)?);
|
||||
verification_shares.insert(l, C::read_G(reader)?);
|
||||
}
|
||||
|
||||
ThresholdKeys::new(
|
||||
@@ -645,7 +645,7 @@ impl<C: Ciphersuite> ThresholdKeys<C> {
|
||||
}
|
||||
}
|
||||
|
||||
impl<C: Ciphersuite> ThresholdView<C> {
|
||||
impl<C: GroupIo + Id> ThresholdView<C> {
|
||||
/// Return the scalar applied to this view.
|
||||
pub fn scalar(&self) -> C::F {
|
||||
self.scalar
|
||||
|
||||
Reference in New Issue
Block a user