Make domain no-std

penumbra-zone · Feb 8, 2024 · 9a13e15 · 9a13e15
1 parent e3fa549
commit 9a13e15
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/src/domain.rs b/src/domain.rs
@@ -30,17 +30,19 @@ pub(crate) mod private {
         ))
     }
 
-    pub trait Sealed: Copy + Clone + Eq + PartialEq + std::fmt::Debug {
+    pub trait Sealed: Copy + Clone + Eq + PartialEq + core::fmt::Debug {
         fn basepoint() -> decaf377::Element;
     }
+
     impl Sealed for Binding {
         fn basepoint() -> decaf377::Element {
             hash_to_group(b"decaf377-rdsa-binding")
         }
     }
+
     impl Sealed for SpendAuth {
         fn basepoint() -> decaf377::Element {
-            decaf377::basepoint()
+            decaf377::Element::GENERATOR
         }
     }
 }

diff --git a/src/lib.rs b/src/lib.rs
@@ -2,20 +2,21 @@
 #![doc = include_str!("../README.md")]
 use cfg_if::cfg_if;
 
+mod domain;
+mod hash;
+use hash::HStar;
+
+pub use domain::{Binding, Domain, SpendAuth};
+
 cfg_if! {
     if #[cfg(feature = "std")] {
         pub mod batch;
 
-        mod domain;
         mod error;
-        mod hash;
         mod signature;
         mod signing_key;
         mod verification_key;
 
-        use hash::HStar;
-
-        pub use domain::{Binding, Domain, SpendAuth};
         pub use error::Error;
         pub use signature::Signature;
         pub use signing_key::SigningKey;

diff --git a/src/verification_key.rs b/src/verification_key.rs
@@ -222,7 +222,8 @@ impl<D: Domain> VerificationKey<D> {
             .vartime_decompress()
             .map_err(|_| Error::InvalidSignature)?;
 
-        let s = Fr::from_bytes_checked(&signature.s_bytes()).map_err(|_| Error::InvalidSignature)?;
+        let s =
+            Fr::from_bytes_checked(&signature.s_bytes()).map_err(|_| Error::InvalidSignature)?;
 
         // XXX rewrite as normal double scalar mul
         // Verify check is h * ( - s * B + R  + c * A) == 0