Skip to content
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

Serde no_std compatibility #288

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
+17 −17
Open

Serde no_std compatibility #288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0d72cdc
serde no_std compatibility
semenov-vladyslav Mar 7, 2023
bf7aacd
fixed cfg feature serde
semenov-vladyslav Mar 7, 2023
f709b59
fix cfg serde for other imports
semenov-vladyslav Mar 8, 2023
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
10 changes: 5 additions & 5 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ sha2 = { version = "0.10", default-features = false }
merlin = { version = "3", default-features = false, optional = true }
rand_core = { version = "0.6.4", default-features = false, optional = true }
serde = { version = "1.0", default-features = false, optional = true }
serde_bytes = { version = "0.11", optional = true }
serde_bytes = { version = "0.11", default-features = false, optional = true }
zeroize = { version = "1.5", default-features = false, optional = true }

[dev-dependencies]
Expand All @@ -46,7 +46,7 @@ criterion = { version = "0.4", features = ["html_reports"] }
hex-literal = "0.3"
rand = "0.8"
rand_core = { version = "0.6.4", default-features = false }
serde = { version = "1.0", features = ["derive"] }
serde = { version = "1.0", default-features = false, features = ["derive"] }
toml = { version = "0.5" }

[[bench]]
Expand All @@ -56,8 +56,8 @@ required-features = ["rand_core"]

[features]
default = ["fast", "std", "zeroize"]
alloc = ["curve25519-dalek/alloc", "ed25519/alloc", "serde?/alloc", "zeroize/alloc"]
std = ["alloc", "ed25519/std", "serde?/std", "sha2/std"]
alloc = ["curve25519-dalek/alloc", "ed25519/alloc", "serde?/alloc", "serde_bytes?/alloc", "zeroize/alloc"]
std = ["alloc", "ed25519/std", "serde?/std", "serde_bytes?/std", "sha2/std"]

asm = ["sha2/asm"]
batch = ["alloc", "merlin", "rand_core"]
Expand All @@ -68,5 +68,5 @@ legacy_compatibility = []
pkcs8 = ["ed25519/pkcs8"]
pem = ["alloc", "ed25519/pem", "pkcs8"]
rand_core = ["dep:rand_core"]
serde = ["dep:serde", "serde_bytes", "ed25519/serde"]
serde = ["dep:serde", "ed25519/serde", "serde_bytes"]
zeroize = ["dep:zeroize", "curve25519-dalek/zeroize"]
10 changes: 5 additions & 5 deletions src/signing.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ use ed25519::pkcs8;
#[cfg(any(test, feature = "rand_core"))]
use rand_core::CryptoRngCore;

#[cfg(feature = "serde")]
#[cfg(all(feature = "serde", any(feature = "alloc", feature = "std")))]
use serde::de::Error as SerdeError;
#[cfg(feature = "serde")]
#[cfg(all(feature = "serde", any(feature = "alloc", feature = "std")))]
use serde::{Deserialize, Deserializer, Serialize, Serializer};
#[cfg(feature = "serde")]
#[cfg(all(feature = "serde", any(feature = "alloc", feature = "std")))]
use serde_bytes::{ByteBuf as SerdeByteBuf, Bytes as SerdeBytes};

use sha2::Sha512;
Expand Down Expand Up @@ -628,7 +628,7 @@ impl TryFrom<pkcs8::PrivateKeyInfo<'_>> for SigningKey {
}
}

#[cfg(feature = "serde")]
#[cfg(all(feature = "serde", any(feature = "alloc", feature = "std")))]
impl Serialize for SigningKey {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where
Expand All @@ -638,7 +638,7 @@ impl Serialize for SigningKey {
}
}

#[cfg(feature = "serde")]
#[cfg(all(feature = "serde", any(feature = "alloc", feature = "std")))]
impl<'d> Deserialize<'d> for SigningKey {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
where
Expand Down
10 changes: 5 additions & 5 deletions src/verifying.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ use sha2::Sha512;
#[cfg(feature = "pkcs8")]
use ed25519::pkcs8;

#[cfg(feature = "serde")]
#[cfg(all(feature = "serde", any(feature = "alloc", feature = "std")))]
use serde::de::Error as SerdeError;
#[cfg(feature = "serde")]
#[cfg(all(feature = "serde", any(feature = "alloc", feature = "std")))]
use serde::{Deserialize, Deserializer, Serialize, Serializer};
#[cfg(feature = "serde")]
#[cfg(all(feature = "serde", any(feature = "alloc", feature = "std")))]
use serde_bytes::{ByteBuf as SerdeByteBuf, Bytes as SerdeBytes};

#[cfg(feature = "digest")]
Expand Down Expand Up @@ -536,7 +536,7 @@ impl TryFrom<pkcs8::spki::SubjectPublicKeyInfoRef<'_>> for VerifyingKey {
}
}

#[cfg(feature = "serde")]
#[cfg(all(feature = "serde", any(feature = "alloc", feature = "std")))]
impl Serialize for VerifyingKey {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where
Expand All @@ -546,7 +546,7 @@ impl Serialize for VerifyingKey {
}
}

#[cfg(feature = "serde")]
#[cfg(all(feature = "serde", any(feature = "alloc", feature = "std")))]
impl<'d> Deserialize<'d> for VerifyingKey {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
where
Expand Down
4 changes: 2 additions & 2 deletions tests/ed25519.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,14 +468,14 @@ mod integrations {
}
}

#[cfg(all(test, feature = "serde"))]
#[cfg(all(test, feature = "serde", any(feature = "alloc", feature = "std")))]
#[derive(Debug, serde::Serialize, serde::Deserialize)]
#[serde(crate = "serde")]
struct Demo {
signing_key: SigningKey,
}

#[cfg(all(test, feature = "serde"))]
#[cfg(all(test, feature = "serde", any(feature = "alloc", feature = "std")))]
mod serialisation {
use super::*;

Expand Down