Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions Cargo.lock

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

5 changes: 2 additions & 3 deletions ed25519/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ signature = { version = "3", default-features = false }

# optional dependencies
pkcs8 = { version = "0.11", optional = true }
serde = { version = "1", optional = true, default-features = false }
serde_bytes = { version = "0.11", optional = true, default-features = false }
serdect = { version = "0.4", optional = true, default-features = false }
zeroize = { version = "1", optional = true, default-features = false }
zerocopy = { version = "0.8", optional = true, features = ["derive"] }

Expand All @@ -37,7 +36,7 @@ rand_core = { version = "0.9", features = ["std"] }
default = ["alloc"]
alloc = ["pkcs8?/alloc"]
pem = ["alloc", "pkcs8/pem"]
serde_bytes = ["serde", "dep:serde_bytes"]
serde = ["dep:serdect"]

[lints]
workspace = true
Expand Down
27 changes: 24 additions & 3 deletions ed25519/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -260,9 +260,6 @@ mod hex;
#[cfg(feature = "pkcs8")]
pub mod pkcs8;

#[cfg(feature = "serde")]
mod serde;

pub use signature::{self, Error, SignatureEncoding};

#[cfg(feature = "pkcs8")]
Expand All @@ -278,6 +275,8 @@ use core::fmt;

#[cfg(feature = "alloc")]
use alloc::vec::Vec;
#[cfg(feature = "serde")]
use serdect::serde::{Deserialize, Serialize, de, ser};

#[cfg(all(feature = "alloc", feature = "pkcs8"))]
use pkcs8::spki::{
Expand Down Expand Up @@ -451,6 +450,28 @@ impl fmt::Display for Signature {
}
}

#[cfg(feature = "serde")]
impl Serialize for Signature {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where
S: ser::Serializer,
{
serdect::array::serialize_hex_upper_or_bin(&self.to_bytes(), serializer)
}
}

#[cfg(feature = "serde")]
impl<'de> Deserialize<'de> for Signature {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
where
D: de::Deserializer<'de>,
{
let mut bytes = [0u8; Signature::BYTE_SIZE];
serdect::array::deserialize_hex_or_bin(&mut bytes, deserializer)?;
Ok(bytes.into())
}
}

#[cfg(feature = "zeroize")]
impl Zeroize for Signature {
fn zeroize(&mut self) {
Expand Down
98 changes: 0 additions & 98 deletions ed25519/src/serde.rs

This file was deleted.

Loading