feat: add graviola support

Author: paolobarbolini

Cargo.lock

@@ -12,6 +12,7 @@ rust-version.workspace = true
 [dependencies]
 aws-lc-rs = { version = "1.12.2", default-features = false, features = ["aws-lc-sys", "prebuilt-nasm"], optional = true }
 ring = { version = "0.17", optional = true }
+graviola = { git = "https://github.com/ctz/graviola.git", optional = true }
 crc = "3.2.1"
 thiserror = "2"
 data-encoding = { version = "2.7.0", default-features = false }
@@ -20,9 +21,10 @@ data-encoding = { version = "2.7.0", default-features = false }
 claims = "0.8"
 
 [features]
-default = ["aws-lc-rs"]
+default = ["graviola"]
 aws-lc-rs = ["dep:aws-lc-rs"]
 ring = ["dep:ring"]
+graviola = ["dep:graviola"]
 fips = ["aws-lc-rs", "aws-lc-rs/fips"]
 
 [lints]

watermelon-nkeys/Cargo.toml

@@ -3,14 +3,27 @@ use std::fmt::{self, Debug, Display};
 #[cfg(feature = "aws-lc-rs")]
 use aws_lc_rs::signature::{Ed25519KeyPair, KeyPair as _, Signature as LlSignature};
 use data_encoding::{BASE32_NOPAD, BASE64URL_NOPAD};
+#[cfg(all(
+    not(feature = "aws-lc-rs"),
+    not(feature = "ring"),
+    feature = "graviola"
+))]
+use graviola::signing::eddsa::Ed25519SigningKey as Ed25519KeyPair;
 #[cfg(all(not(feature = "aws-lc-rs"), feature = "ring"))]
 use ring::signature::{Ed25519KeyPair, KeyPair as _, Signature as LlSignature};
 
-#[cfg(not(any(feature = "aws-lc-rs", feature = "ring")))]
+#[cfg(not(any(feature = "aws-lc-rs", feature = "ring", feature = "graviola")))]
 compile_error!("Please enable the `aws-lc-rs` or the `ring` feature");
 
 use crate::crc::Crc16;
 
+#[cfg(all(
+    not(feature = "aws-lc-rs"),
+    not(feature = "ring"),
+    feature = "graviola"
+))]
+type LlSignature = [u8; 64];
+
 const SEED_PREFIX_BYTE: u8 = 18 << 3;
 
 /// A `NKey` private/public key pair.
@@ -91,8 +104,11 @@ impl KeyPair {
 
         let kind = raw_seed[1];
 
+        #[cfg(any(feature = "aws-lc-rs", feature = "ring"))]
         let key = Ed25519KeyPair::from_seed_unchecked(&raw_seed[2..])
             .map_err(|_| KeyPairFromSeedError::DecodeError)?;
+        #[cfg(not(any(feature = "aws-lc-rs", feature = "ring")))]
+        let key = Ed25519KeyPair::from_bytes(raw_seed[2..].try_into().unwrap()).unwrap();
         Ok(Self { kind, key })
     }
 
@@ -126,7 +142,11 @@ impl Display for PublicKey<'_> {
         let mut full_raw_seed = [0; 36];
         full_raw_seed[0] = SEED_PREFIX_BYTE;
         full_raw_seed[1] = self.0.kind;
-        full_raw_seed[2..34].copy_from_slice(self.0.key.public_key().as_ref());
+        #[cfg(any(feature = "aws-lc-rs", feature = "ring"))]
+        let public_key_bytes = self.0.key.public_key().as_ref();
+        #[cfg(not(any(feature = "aws-lc-rs", feature = "ring")))]
+        let public_key_bytes = &self.0.key.public_key().as_bytes();
+        full_raw_seed[2..34].copy_from_slice(public_key_bytes);
         let crc = Crc16::compute(&full_raw_seed[..34]);
         full_raw_seed[34..36].copy_from_slice(&crc.to_raw_encoded());
         Display::fmt(&BASE32_NOPAD.encode_display(&full_raw_seed), f)

watermelon-nkeys/src/seed.rs

@@ -1,6 +1,6 @@
 [package]
 name = "watermelon"
-version = "0.4.2"
+version = "0.4.3"
 description = "High level actor based implementation NATS Core and NATS Jetstream client implementation"
 categories = ["api-bindings", "network-programming"]
 keywords = ["nats", "client", "jetstream"]