put ssh-* behind a feature flag, for non(wasm32) only

Author: DougAnderson444

Cargo.toml

@@ -10,6 +10,7 @@ license = "Apache-2.0"
 
 [features]
 default = ["serde"]
+ssh = ["ssh-key", "ssh-encoding"]
 
 [dependencies]
 blsful = { version = "2.5", git = "https://github.com/mikelodder7/blsful.git" }
@@ -18,12 +19,17 @@ multibase = { version = "1.0", git = "https://github.com/cryptidtech/rust-multib
 multicodec = { version = "1.0", git = "https://github.com/cryptidtech/rust-multicodec.git" }
 multitrait = { version = "1.0", git = "https://github.com/cryptidtech/multitrait.git" }
 multiutil = { version = "1.0", git = "https://github.com/cryptidtech/multiutil.git" }
-serde = { version = "1.0", default-features = false, features = ["alloc", "derive"], optional = true }
-ssh-key = { version = "0.6", features = ["crypto"] }
-ssh-encoding = "0.2"
+serde = { version = "1.0", default-features = false, features = [
+  "alloc",
+  "derive",
+], optional = true }
 thiserror = "1.0"
 unsigned-varint = { version = "0.8", features = ["std"] }
 
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+ssh-key = { version = "0.6", features = ["crypto"], optional = true }
+ssh-encoding = { version = "0.2", optional = true }
+
 [dev-dependencies]
 hex = "0.4"
 serde_test = "1.0"

src/error.rs

@@ -126,9 +126,11 @@ pub enum SharesError {
 #[non_exhaustive]
 pub enum ConversionsError {
     /// Ssh signature conversion error
+    #[cfg(feature = "ssh")]
     #[error(transparent)]
     SshSig(#[from] ssh_key::Error),
     /// Ssh label error
+    #[cfg(feature = "ssh")]
     #[error(transparent)]
     SshSigLabel(#[from] ssh_encoding::LabelError),
 }

src/ms.rs

@@ -23,15 +23,15 @@ pub const SIG_CODECS: [Codec; 4] = [
     // Codec::Es384Msig,
     // Codec::Es521Msig,
     // Codec::Rs256Msig,
-    Codec::Es256KMsig//,
-    //Codec::LamportMsig,
+    Codec::Es256KMsig, //,
+                       //Codec::LamportMsig,
 ];
 
 /// the list of signature share codecs supported
 pub const SIG_SHARE_CODECS: [Codec; 2] = [
     Codec::Bls12381G1ShareMsig,
-    Codec::Bls12381G2ShareMsig//,
-    //Codec::LamportShareMsig,
+    Codec::Bls12381G2ShareMsig, //,
+                                //Codec::LamportShareMsig,
 ];
 
 /// the multisig sigil
@@ -254,6 +254,7 @@ impl Builder {
     }
 
     /// create new multisig from ssh Signature
+    #[cfg(feature = "ssh")]
     pub fn new_from_ssh_signature(sig: &ssh_key::Signature) -> Result<Self, Error> {
         let mut attributes = BTreeMap::new();
         use ssh_key::Algorithm::*;
@@ -602,6 +603,7 @@ mod tests {
         assert_eq!(ms1, ms3);
     }
 
+    #[cfg(feature = "ssh")]
     #[test]
     fn test_eddsa_ssh_roundtrip() {
         let ms1 = Builder::new(Codec::EddsaMsig)
@@ -617,6 +619,7 @@ mod tests {
         assert_eq!(ms1, ms2);
     }
 
+    #[cfg(feature = "ssh")]
     #[test]
     fn test_es256k_ssh_roundtrip() {
         let ms1 = Builder::new(Codec::Es256KMsig)
@@ -632,6 +635,7 @@ mod tests {
         assert_eq!(ms1, ms2);
     }
 
+    #[cfg(feature = "ssh")]
     #[test]
     fn test_bls_signature_ssh_roundtrip() {
         let sk = blsful::Bls12381G1::new_secret_key();
@@ -658,6 +662,7 @@ mod tests {
         assert_eq!(ms1, ms2);
     }
 
+    #[cfg(feature = "ssh")]
     #[test]
     fn test_bls_signature_combine_ssh_roundtrip() {
         let sk = blsful::Bls12381G2::new_secret_key();

src/views.rs

@@ -31,6 +31,7 @@ pub trait DataView {
 /// trait for converting Multisigs to other formats
 pub trait ConvView {
     /// convert the Multisig to an SSH signature
+    #[cfg(feature = "ssh")]
     fn to_ssh_signature(&self) -> Result<ssh_key::Signature, Error>;
 }
 

src/views/bls12381.rs

@@ -369,6 +369,7 @@ impl<'a> DataView for View<'a> {
 
 impl<'a> ConvView for View<'a> {
     /// convert to SSH signature format
+    #[cfg(feature = "ssh")]
     fn to_ssh_signature(&self) -> Result<ssh_key::Signature, Error> {
         // get the signature data
         let dv = self.ms.data_view()?;

src/views/ed25519.rs

@@ -50,6 +50,7 @@ impl<'a> DataView for View<'a> {
 
 impl<'a> ConvView for View<'a> {
     /// convert to SSH signature format
+    #[cfg(feature = "ssh")]
     fn to_ssh_signature(&self) -> Result<ssh_key::Signature, Error> {
         // get the signature data
         let dv = self.ms.data_view()?;

src/views/secp256k1.rs

@@ -53,6 +53,7 @@ impl<'a> DataView for View<'a> {
 
 impl<'a> ConvView for View<'a> {
     /// convert to SSH signature format
+    #[cfg(feature = "ssh")]
     fn to_ssh_signature(&self) -> Result<ssh_key::Signature, Error> {
         // get the signature data
         let dv = self.ms.data_view()?;