remove alloc, feature flag everything except group_key

Author: jowparks

Cargo.toml

@@ -24,7 +24,7 @@ hex-literal = "0.4.1"
 rand = "0.8.5"
 
 [features]
-default = ["signing"]
+default = ["dkg"]
 
 std = []
 signing = ["dep:blake3", "dep:rand_chacha", "std"]

src/dkg/error.rs

@@ -8,11 +8,6 @@ use crate::io;
 use core::fmt;
 use core::fmt::Debug;
 
-#[cfg(not(feature = "std"))]
-extern crate alloc;
-#[cfg(not(feature = "std"))]
-use alloc::string::String;
-
 #[derive(Debug)]
 pub enum Error {
     InvalidInput(String),

src/dkg/group_key.rs

@@ -9,11 +9,6 @@ use crate::participant::Secret;
 use rand_core::CryptoRng;
 use rand_core::RngCore;
 
-#[cfg(not(feature = "std"))]
-extern crate alloc;
-#[cfg(not(feature = "std"))]
-use alloc::vec::Vec;
-
 pub const GROUP_SECRET_KEY_LEN: usize = 32;
 
 pub type GroupSecretKey = [u8; GROUP_SECRET_KEY_LEN];

src/dkg/mod.rs

@@ -1,9 +1,12 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
+ #[cfg(feature = "std")]
 pub mod error;
 pub mod group_key;
+#[cfg(feature = "std")]
 pub mod round1;
+#[cfg(feature = "std")]
 pub mod round2;
+#[cfg(feature = "std")]
 pub mod round3;

src/dkg/round1.rs

@@ -31,13 +31,6 @@ use rand_core::RngCore;
 use core::hash::Hasher;
 use core::mem;
 
-#[cfg(not(feature = "std"))]
-extern crate alloc;
-#[cfg(not(feature = "std"))]
-use alloc::string::ToString;
-#[cfg(not(feature = "std"))]
-use alloc::vec::Vec;
-
 type Scalar = <JubjubScalarField as Field>::Scalar;
 
 /// Copy of the [`frost_core::dkg::round1::SecretPackage`] struct. Necessary to implement

src/dkg/round2.rs

@@ -36,13 +36,6 @@ use rand_core::RngCore;
 #[cfg(feature = "std")]
 use std::collections::BTreeMap;
 
-#[cfg(not(feature = "std"))]
-extern crate alloc;
-#[cfg(not(feature = "std"))]
-use alloc::collections::BTreeMap;
-#[cfg(not(feature = "std"))]
-use alloc::vec::Vec;
-
 type Scalar = <JubjubScalarField as Field>::Scalar;
 
 /// Copy of the [`frost_core::dkg::round2::SecretPackage`] struct. Necessary to implement

src/dkg/round3.rs

@@ -27,15 +27,6 @@ use reddsa::frost::redjubjub::VerifyingKey;
 #[cfg(feature = "std")]
 use std::collections::BTreeMap;
 
-#[cfg(not(feature = "std"))]
-extern crate alloc;
-#[cfg(not(feature = "std"))]
-use alloc::collections::BTreeMap;
-#[cfg(not(feature = "std"))]
-use alloc::string::ToString;
-#[cfg(not(feature = "std"))]
-use alloc::vec::Vec;
-
 #[derive(Clone, Eq, PartialEq, Debug)]
 pub struct PublicKeyPackage {
     frost_public_key_package: FrostPublicKeyPackage,

src/lib.rs

@@ -37,11 +37,6 @@ mod io {
     pub(crate) use std::io::Write;
 }
 
-#[cfg(not(feature = "std"))]
-#[macro_use]
-#[cfg(not(feature = "std"))]
-extern crate alloc;
-
 #[cfg(not(feature = "std"))]
 mod io {
     use core::cmp;
@@ -147,19 +142,3 @@ mod io {
         }
     }
 }
-
-#[cfg(not(feature = "std"))]
-use alloc::vec::Vec;
-
-#[cfg(not(feature = "std"))]
-impl io::Write for Vec<u8> {
-    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
-        self.extend_from_slice(buf);
-        Ok(buf.len())
-    }
-
-    fn write_all(&mut self, buf: &[u8]) -> io::Result<()> {
-        self.extend_from_slice(buf);
-        Ok(())
-    }
-}

src/multienc.rs

@@ -20,13 +20,6 @@ use rand_core::RngCore;
 use x25519_dalek::PublicKey;
 use x25519_dalek::ReusableSecret;
 
-#[cfg(not(feature = "std"))]
-extern crate alloc;
-#[cfg(not(feature = "std"))]
-use crate::alloc::borrow::ToOwned;
-#[cfg(not(feature = "std"))]
-use alloc::vec::Vec;
-
 pub const HEADER_SIZE: usize = 56;
 pub const KEY_SIZE: usize = 32;
 
@@ -36,6 +29,7 @@ pub const fn metadata_size(num_recipients: usize) -> usize {
     HEADER_SIZE + KEY_SIZE * num_recipients
 }
 
+#[cfg(feature = "std")]
 pub fn read_encrypted_blob<R>(reader: &mut R) -> Result<Vec<u8>, io::Error>
 where
     R: crate::io::Read,
@@ -59,7 +53,8 @@ where
     Ok(result)
 }
 
-#[must_use]
+// #[must_use]
+#[cfg(feature = "std")]
 pub fn encrypt<'a, I, R>(data: &[u8], recipients: I, csrng: R) -> Vec<u8>
 where
     I: IntoIterator<Item = &'a Identity>,
@@ -142,6 +137,7 @@ where
     Ok(())
 }
 
+#[cfg(feature = "std")]
 /// Decrypts data produced by [`encrypt`] or [`encrypt_in_place`] using one participant secret.
 ///
 /// This method expects the ciphertext and the metadata to be concatenated in one slice. Use
@@ -275,6 +271,7 @@ impl Header {
 }
 
 #[cfg(test)]
+#[cfg(feature = "std")]
 mod tests {
     mod detached {
         use crate::multienc::decrypt;

src/serde.rs

@@ -6,11 +6,6 @@
 
 use crate::io;
 
-#[cfg(not(feature = "std"))]
-extern crate alloc;
-#[cfg(not(feature = "std"))]
-use alloc::vec::Vec;
-
 #[inline]
 #[cfg(feature = "dkg")]
 pub(crate) fn write_u16<W: io::Write>(mut writer: W, value: u16) -> io::Result<()> {
@@ -77,8 +72,8 @@ pub(crate) fn read_usize<R: io::Read>(reader: R) -> io::Result<usize> {
     read_u32(reader).map(|value| value as usize)
 }
 
-#[inline]
-#[cfg(feature = "dkg")]
+// #[inline]
+#[cfg(feature = "std")]
 pub(crate) fn read_variable_length<R, F, T>(mut reader: R, f: F) -> io::Result<Vec<T>>
 where
     R: io::Read,
@@ -92,8 +87,8 @@ where
     Ok(items)
 }
 
-#[inline]
-#[cfg(feature = "dkg")]
+// #[inline]
+#[cfg(feature = "std")]
 pub(crate) fn read_variable_length_bytes<R: io::Read>(mut reader: R) -> io::Result<Vec<u8>> {
     let len = read_usize(&mut reader)?;
     let mut bytes = vec![0u8; len];
@@ -172,7 +167,7 @@ mod test {
     }
 
     #[test]
-    #[cfg(feature = "dkg")]
+    #[cfg(feature = "std")]
     fn write_read_variable_length() {
         test_serde!(
             Vec::<u16>::new(),
@@ -194,7 +189,7 @@ mod test {
     }
 
     #[test]
-    #[cfg(feature = "dkg")]
+    #[cfg(feature = "std")]
     fn write_read_variable_length_bytes() {
         test_serde!(
             &b""[..],