rename keys::{Secret, Public} to SecretShareValue, PublicVerificationShare

Author: conradoplg

frost-core/src/frost/keys.rs

@@ -13,11 +13,11 @@ use zeroize::{DefaultIsZeroes, Zeroize};
 
 use crate::{frost::Identifier, Ciphersuite, Error, Field, Group, Scalar, VerifyingKey};
 
-/// A secret scalar value representing a signer's secret key.
+/// A secret scalar value representing a signer's secret share.
 #[derive(Clone, Copy, PartialEq)]
-pub struct Secret<C: Ciphersuite>(pub(crate) Scalar<C>);
+pub struct SecretShareValue<C: Ciphersuite>(pub(crate) Scalar<C>);
 
-impl<C> Secret<C>
+impl<C> SecretShareValue<C>
 where
     C: Ciphersuite,
 {
@@ -45,7 +45,7 @@ where
     }
 }
 
-impl<C> Debug for Secret<C>
+impl<C> Debug for SecretShareValue<C>
 where
     C: Ciphersuite,
 {
@@ -56,7 +56,7 @@ where
     }
 }
 
-impl<C> Default for Secret<C>
+impl<C> Default for SecretShareValue<C>
 where
     C: Ciphersuite,
 {
@@ -66,7 +66,7 @@ where
 }
 
 // Implements [`Zeroize`] by overwriting a value with the [`Default::default()`] value
-impl<C> DefaultIsZeroes for Secret<C> where C: Ciphersuite {}
+impl<C> DefaultIsZeroes for SecretShareValue<C> where C: Ciphersuite {}
 
 // impl<C> Drop for Secret<C>
 // where
@@ -77,18 +77,18 @@ impl<C> DefaultIsZeroes for Secret<C> where C: Ciphersuite {}
 //     }
 // }
 
-impl<C> From<&Secret<C>> for VerifyingKey<C>
+impl<C> From<&SecretShareValue<C>> for VerifyingKey<C>
 where
     C: Ciphersuite,
 {
-    fn from(secret: &Secret<C>) -> Self {
+    fn from(secret: &SecretShareValue<C>) -> Self {
         let element = <C::Group as Group>::generator() * secret.0;
 
         VerifyingKey { element }
     }
 }
 
-impl<C> FromHex for Secret<C>
+impl<C> FromHex for SecretShareValue<C>
 where
     C: Ciphersuite,
 {
@@ -103,13 +103,13 @@ where
     }
 }
 
-/// A public group element that represents a single signer's public key.
+/// A public group element that represents a single signer's public verification share.
 #[derive(Copy, Clone, PartialEq)]
-pub struct Public<C>(pub(super) <C::Group as Group>::Element)
+pub struct PublicVerificationShare<C>(pub(super) <C::Group as Group>::Element)
 where
     C: Ciphersuite;
 
-impl<C> Public<C>
+impl<C> PublicVerificationShare<C>
 where
     C: Ciphersuite,
 {
@@ -124,7 +124,7 @@ where
     }
 }
 
-impl<C> Debug for Public<C>
+impl<C> Debug for PublicVerificationShare<C>
 where
     C: Ciphersuite,
 {
@@ -135,12 +135,12 @@ where
     }
 }
 
-impl<C> From<Secret<C>> for Public<C>
+impl<C> From<SecretShareValue<C>> for PublicVerificationShare<C>
 where
     C: Ciphersuite,
 {
-    fn from(secret: Secret<C>) -> Public<C> {
-        Public(<C::Group as Group>::generator() * secret.0 as Scalar<C>)
+    fn from(secret: SecretShareValue<C>) -> PublicVerificationShare<C> {
+        PublicVerificationShare(<C::Group as Group>::generator() * secret.0 as Scalar<C>)
     }
 }
 
@@ -180,7 +180,7 @@ pub struct SecretShare<C: Ciphersuite> {
     /// The participant identifier of this [`SecretShare`].
     pub identifier: Identifier<C>,
     /// Secret Key.
-    pub value: Secret<C>,
+    pub value: SecretShareValue<C>,
     /// The commitments to be distributed among signers.
     pub commitment: VerifiableSecretSharingCommitment<C>,
 }
@@ -190,7 +190,7 @@ where
     C: Ciphersuite,
 {
     /// Gets the inner [`Secret`] share value.
-    pub fn secret(&self) -> &Secret<C> {
+    pub fn secret(&self) -> &SecretShareValue<C> {
         &self.value
     }
 
@@ -237,7 +237,7 @@ pub struct SharePackage<C: Ciphersuite> {
     /// This participant's secret share.
     pub secret_share: SecretShare<C>,
     /// This participant's public key.
-    pub public: Public<C>,
+    pub public: PublicVerificationShare<C>,
     /// The public signing key that represents the entire group.
     pub group_public: VerifyingKey<C>,
 }
@@ -262,11 +262,11 @@ pub fn keygen_with_dealer<C: Ciphersuite, R: RngCore + CryptoRng>(
     let mut bytes = [0; 64];
     rng.fill_bytes(&mut bytes);
 
-    let secret = Secret::random(&mut rng);
+    let secret = SecretShareValue::random(&mut rng);
     let group_public = VerifyingKey::from(&secret);
     let secret_shares = generate_secret_shares(&secret, num_signers, threshold, rng)?;
     let mut share_packages: Vec<SharePackage<C>> = Vec::with_capacity(num_signers as usize);
-    let mut signer_pubkeys: HashMap<Identifier<C>, Public<C>> =
+    let mut signer_pubkeys: HashMap<Identifier<C>, PublicVerificationShare<C>> =
         HashMap::with_capacity(num_signers as usize);
 
     for secret_share in secret_shares {
@@ -302,9 +302,9 @@ pub struct KeyPackage<C: Ciphersuite> {
     /// Denotes the participant identifier each secret share key package is owned by.
     pub identifier: Identifier<C>,
     /// This participant's secret share.
-    pub secret_share: Secret<C>,
+    pub secret_share: SecretShareValue<C>,
     /// This participant's public key.
-    pub public: Public<C>,
+    pub public: PublicVerificationShare<C>,
     /// The public signing key that represents the entire group.
     pub group_public: VerifyingKey<C>,
 }
@@ -319,12 +319,12 @@ where
     }
 
     /// Gets the participant's [`Secret`] share associated with this [`KeyPackage`].
-    pub fn secret_share(&self) -> &Secret<C> {
+    pub fn secret_share(&self) -> &SecretShareValue<C> {
         &self.secret_share
     }
 
     /// Gets the participant's [`Public`] key  associated with this [`Secret`] share in this [`KeyPackage`].
-    pub fn public(&self) -> &Public<C> {
+    pub fn public(&self) -> &PublicVerificationShare<C> {
         &self.public
     }
 
@@ -369,7 +369,7 @@ pub struct PublicKeyPackage<C: Ciphersuite> {
     /// correct view of participants' public keys to perform verification before
     /// publishing a signature. `signer_pubkeys` represents all signers for a
     /// signing operation.
-    pub signer_pubkeys: HashMap<Identifier<C>, Public<C>>,
+    pub signer_pubkeys: HashMap<Identifier<C>, PublicVerificationShare<C>>,
     /// The joint public key for the entire group.
     pub group_public: VerifyingKey<C>,
 }
@@ -394,7 +394,7 @@ pub struct PublicKeyPackage<C: Ciphersuite> {
 ///
 /// [`secret_key_shard`]: https://www.ietf.org/archive/id/draft-irtf-cfrg-frost-03.html#appendix-B.1
 pub fn generate_secret_shares<C: Ciphersuite, R: RngCore + CryptoRng>(
-    secret: &Secret<C>,
+    secret: &SecretShareValue<C>,
     numshares: u8,
     threshold: u8,
     mut rng: R,
@@ -456,7 +456,7 @@ pub fn generate_secret_shares<C: Ciphersuite, R: RngCore + CryptoRng>(
 
         secret_shares.push(SecretShare {
             identifier: id,
-            value: Secret(value),
+            value: SecretShareValue(value),
             commitment: commitment.clone(),
         });
     }
@@ -467,7 +467,7 @@ pub fn generate_secret_shares<C: Ciphersuite, R: RngCore + CryptoRng>(
 /// Recompute the secret from t-of-n secret shares using Lagrange interpolation.
 pub fn reconstruct_secret<C: Ciphersuite>(
     secret_shares: Vec<SecretShare<C>>,
-) -> Result<Secret<C>, &'static str> {
+) -> Result<SecretShareValue<C>, &'static str> {
     if secret_shares.is_empty() {
         return Err("No secret_shares provided");
     }
@@ -512,5 +512,8 @@ pub fn reconstruct_secret<C: Ciphersuite>(
         secret = secret + (lagrange_coefficient * secret_share.value.0);
     }
 
-    Ok(Secret::from_bytes(<<C::Group as Group>::Field as Field>::serialize(&secret)).unwrap())
+    Ok(
+        SecretShareValue::from_bytes(<<C::Group as Group>::Field as Field>::serialize(&secret))
+            .unwrap(),
+    )
 }

frost-core/src/frost/round1.rs

@@ -8,7 +8,7 @@ use zeroize::Zeroize;
 
 use crate::{frost, Ciphersuite, Error, Field, Group};
 
-use super::{keys::Secret, Identifier};
+use super::{keys::SecretShareValue, Identifier};
 
 /// A scalar that is a signing nonce.
 #[derive(Clone, PartialEq, Zeroize)]
@@ -28,7 +28,7 @@ where
     /// An implementation of `nonce_generate(secret)` from the [spec].
     ///
     /// [spec]: https://www.ietf.org/archive/id/draft-irtf-cfrg-frost-05.html#name-nonce-generation
-    pub fn new<R>(secret: &Secret<C>, rng: &mut R) -> Self
+    pub fn new<R>(secret: &SecretShareValue<C>, rng: &mut R) -> Self
     where
         R: CryptoRng + RngCore,
     {
@@ -167,7 +167,7 @@ where
     ///
     /// Each participant generates signing nonces before performing a signing
     /// operation.
-    pub fn new<R>(secret: &Secret<C>, rng: &mut R) -> Self
+    pub fn new<R>(secret: &SecretShareValue<C>, rng: &mut R) -> Self
     where
         R: CryptoRng + RngCore,
     {
@@ -301,7 +301,7 @@ pub(super) fn encode_group_commitments<C: Ciphersuite>(
 pub fn preprocess<C, R>(
     num_nonces: u8,
     participant_identifier: Identifier<C>,
-    secret: &Secret<C>,
+    secret: &SecretShareValue<C>,
     rng: &mut R,
 ) -> (Vec<SigningNonces<C>>, Vec<SigningCommitments<C>>)
 where
@@ -331,7 +331,7 @@ where
 /// [`commit`]: https://www.ietf.org/archive/id/draft-irtf-cfrg-frost-05.html#section-5.1
 pub fn commit<C, R>(
     participant_identifier: Identifier<C>,
-    secret: &Secret<C>,
+    secret: &SecretShareValue<C>,
     rng: &mut R,
 ) -> (SigningNonces<C>, SigningCommitments<C>)
 where

frost-core/src/frost/round2.rs

@@ -84,7 +84,7 @@ where
     pub fn verify(
         &self,
         group_commitment_share: &round1::GroupCommitmentShare<C>,
-        public_key: &frost::keys::Public<C>,
+        public_key: &frost::keys::PublicVerificationShare<C>,
         lambda_i: <<C::Group as Group>::Field as Field>::Scalar,
         challenge: &Challenge<C>,
     ) -> Result<(), &'static str> {

frost-core/src/tests.rs

@@ -11,7 +11,7 @@ pub mod vectors;
 
 /// Test share generation with a Ciphersuite
 pub fn check_share_generation<C: Ciphersuite + PartialEq, R: RngCore + CryptoRng>(mut rng: R) {
-    let secret = frost::keys::Secret::<C>::random(&mut rng);
+    let secret = frost::keys::SecretShareValue::<C>::random(&mut rng);
 
     let secret_shares = frost::keys::generate_secret_shares(&secret, 5, 3, rng).unwrap();
 

frost-core/src/tests/vectors.rs

@@ -41,7 +41,9 @@ pub fn parse_test_vectors<C: Ciphersuite>(
         VerifyingKey::<C>::from_hex(inputs["group_public_key"].as_str().unwrap()).unwrap();
 
     for (i, secret_share) in possible_signers {
-        let secret = Secret::<C>::from_hex(secret_share["signer_share"].as_str().unwrap()).unwrap();
+        let secret =
+            SecretShareValue::<C>::from_hex(secret_share["signer_share"].as_str().unwrap())
+                .unwrap();
         let signer_public = secret.into();
 
         let key_package = KeyPackage::<C> {
@@ -162,7 +164,7 @@ where
     for key_package in key_packages.values() {
         assert_eq!(
             *key_package.public(),
-            frost::keys::Public::from(*key_package.secret_share())
+            frost::keys::PublicVerificationShare::from(*key_package.secret_share())
         );
     }
 

frost-p256/src/lib.rs

@@ -229,7 +229,7 @@ pub mod keys {
 
 ///
 pub mod round1 {
-    use frost_core::frost::keys::Secret;
+    use frost_core::frost::keys::SecretShareValue;
 
     use super::*;
     ///
@@ -241,7 +241,7 @@ pub mod round1 {
     ///
     pub fn commit<RNG>(
         participant_identifier: frost::Identifier<P>,
-        secret: &Secret<P>,
+        secret: &SecretShareValue<P>,
         rng: &mut RNG,
     ) -> (SigningNonces, SigningCommitments)
     where

frost-ristretto255/src/lib.rs

@@ -210,7 +210,7 @@ pub mod keys {
 
 ///
 pub mod round1 {
-    use frost_core::frost::keys::Secret;
+    use frost_core::frost::keys::SecretShareValue;
 
     use super::*;
     ///
@@ -222,7 +222,7 @@ pub mod round1 {
     ///
     pub fn commit<RNG>(
         participant_identifier: frost::Identifier<R>,
-        secret: &Secret<R>,
+        secret: &SecretShareValue<R>,
         rng: &mut RNG,
     ) -> (SigningNonces, SigningCommitments)
     where