Skip to content

feat(nkeys): add graviola support #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
paolobarbolini wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

feat(nkeys): add graviola support #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions watermelon-nkeys/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand All @@ -23,6 +24,7 @@ claims = "0.8"
default = ["aws-lc-rs"]
aws-lc-rs = ["dep:aws-lc-rs"]
ring = ["dep:ring"]
graviola = ["dep:graviola"]
fips = ["aws-lc-rs", "aws-lc-rs/fips"]

[lints]
Expand Down
26 changes: 23 additions & 3 deletions watermelon-nkeys/src/seed.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")))]
compile_error!("Please enable the `aws-lc-rs` or the `ring` feature");
#[cfg(not(any(feature = "aws-lc-rs", feature = "ring", feature = "graviola")))]
compile_error!("Please enable the `aws-lc-rs`, the `ring` or the `graviola` feature 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.
Expand Down Expand Up @@ -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 })
}

Expand Down Expand Up @@ -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)
Expand Down