diff --git a/Cargo.lock b/Cargo.lock index 20f5c7e..b6b17f1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -52,15 +52,6 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55248b47b0caf0546f7988906588779981c43bb1bc9d0c44087278f80cdb44ba" -[[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde", -] - [[package]] name = "bit-set" version = "0.8.0" @@ -389,7 +380,6 @@ dependencies = [ name = "ed25519" version = "3.0.0-rc.2" dependencies = [ - "bincode", "hex-literal", "pkcs8", "rand_core 0.9.3", @@ -403,7 +393,6 @@ dependencies = [ name = "ed448" version = "0.5.0-rc.2" dependencies = [ - "bincode", "hex-literal", "pkcs8", "serde", diff --git a/ed25519/Cargo.toml b/ed25519/Cargo.toml index 34e5c4a..84d8d8e 100644 --- a/ed25519/Cargo.toml +++ b/ed25519/Cargo.toml @@ -27,7 +27,6 @@ serde_bytes = { version = "0.11", optional = true, default-features = false } zeroize = { version = "1", optional = true, default-features = false } [dev-dependencies] -bincode = "1" #ed25519-dalek = { version = "2", features = ["rand_core"] } hex-literal = "1" #ring-compat = { version = "0.8", default-features = false, features = ["signature"] } diff --git a/ed25519/src/serde.rs b/ed25519/src/serde.rs index 1ada686..51f7b8c 100644 --- a/ed25519/src/serde.rs +++ b/ed25519/src/serde.rs @@ -96,26 +96,3 @@ impl<'de> serde_bytes::Deserialize<'de> for Signature { .map(Into::into) } } - -#[cfg(test)] -mod tests { - use crate::{Signature, SignatureBytes}; - use hex_literal::hex; - - const SIGNATURE_BYTES: SignatureBytes = hex!( - " - e5564300c360ac729086e2cc806e828a - 84877f1eb8e5d974d873e06522490155 - 5fb8821590a33bacc61e39701cf9b46b - d25bf5f0595bbe24655141438e7a100b - " - ); - - #[test] - fn round_trip() { - let signature = Signature::from_bytes(&SIGNATURE_BYTES); - let serialized = bincode::serialize(&signature).expect("serialized"); - let deserialized = bincode::deserialize(&serialized).expect("deserialized"); - assert_eq!(signature, deserialized); - } -} diff --git a/ed25519/tests/serde.rs b/ed25519/tests/serde.rs deleted file mode 100644 index 5e8ff6f..0000000 --- a/ed25519/tests/serde.rs +++ /dev/null @@ -1,61 +0,0 @@ -//! Tests for serde serializers/deserializers - -#![cfg(feature = "serde")] - -use ed25519::{Signature, SignatureBytes}; -use hex_literal::hex; - -const EXAMPLE_SIGNATURE: SignatureBytes = hex!( - "3f3e3d3c3b3a393837363534333231302f2e2d2c2b2a29282726252423222120" - "1f1e1d1c1b1a191817161514131211100f0e0d0c0b0a09080706050403020100" -); - -#[test] -fn test_serialize() { - let signature = Signature::try_from(&EXAMPLE_SIGNATURE[..]).unwrap(); - let encoded_signature: Vec = bincode::serialize(&signature).unwrap(); - assert_eq!(&EXAMPLE_SIGNATURE[..], &encoded_signature[..]); -} - -#[test] -fn test_deserialize() { - let signature = bincode::deserialize::(&EXAMPLE_SIGNATURE).unwrap(); - assert_eq!(EXAMPLE_SIGNATURE, signature.to_bytes()); -} - -#[cfg(feature = "serde_bytes")] -#[test] -fn test_serialize_bytes() { - use bincode::Options; - - let signature = Signature::try_from(&EXAMPLE_SIGNATURE[..]).unwrap(); - - let mut encoded_signature = Vec::new(); - let options = bincode::DefaultOptions::new() - .with_fixint_encoding() - .allow_trailing_bytes(); - let mut serializer = bincode::Serializer::new(&mut encoded_signature, options); - serde_bytes::serialize(&signature, &mut serializer).unwrap(); - - let mut expected = Vec::from((Signature::BYTE_SIZE as u64).to_le_bytes()); - expected.extend(&EXAMPLE_SIGNATURE[..]); - assert_eq!(&expected[..], &encoded_signature[..]); -} - -#[cfg(feature = "serde_bytes")] -#[test] -fn test_deserialize_bytes() { - use bincode::Options; - - let mut encoded_signature = Vec::from((Signature::BYTE_SIZE as u64).to_le_bytes()); - encoded_signature.extend(&EXAMPLE_SIGNATURE[..]); - - let options = bincode::DefaultOptions::new() - .with_fixint_encoding() - .allow_trailing_bytes(); - let mut deserializer = bincode::de::Deserializer::from_slice(&encoded_signature[..], options); - - let signature: Signature = serde_bytes::deserialize(&mut deserializer).unwrap(); - - assert_eq!(EXAMPLE_SIGNATURE, signature.to_bytes()); -} diff --git a/ed448/Cargo.toml b/ed448/Cargo.toml index b792d4b..2861820 100644 --- a/ed448/Cargo.toml +++ b/ed448/Cargo.toml @@ -28,7 +28,6 @@ zeroize = { version = "1", optional = true, default-features = false } [dev-dependencies] hex-literal = "1" -bincode = "1" [features] default = ["alloc"] diff --git a/ed448/src/serde.rs b/ed448/src/serde.rs index eb9bd2d..3f13fc7 100644 --- a/ed448/src/serde.rs +++ b/ed448/src/serde.rs @@ -94,28 +94,3 @@ impl<'de> serde_bytes::Deserialize<'de> for Signature { .map(Into::into) } } - -#[cfg(test)] -mod tests { - use crate::{Signature, SignatureBytes}; - use hex_literal::hex; - - const SIGNATURE_BYTES: SignatureBytes = hex!( - "533a37f6bbe457251f023c0d88f976ae - 2dfb504a843e34d2074fd823d41a591f - 2b233f034f628281f2fd7a22ddd47d78 - 28c59bd0a21bfd3980ff0d2028d4b18a - 9df63e006c5d1c2d345b925d8dc00b41 - 04852db99ac5c7cdda8530a113a0f4db - b61149f05a7363268c71d95808ff2e65 - 2600" - ); - - #[test] - fn round_trip() { - let signature = Signature::from_bytes(&SIGNATURE_BYTES); - let serialized = bincode::serialize(&signature).expect("serialized"); - let deserialized = bincode::deserialize(&serialized).expect("deserialized"); - assert_eq!(signature, deserialized); - } -} diff --git a/ed448/tests/serde.rs b/ed448/tests/serde.rs deleted file mode 100644 index 254a7a6..0000000 --- a/ed448/tests/serde.rs +++ /dev/null @@ -1,24 +0,0 @@ -//! Tests for serde serializers/deserializers - -#![cfg(feature = "serde")] - -use ed448::{Signature, SignatureBytes}; -use hex_literal::hex; - -const EXAMPLE_SIGNATURE: SignatureBytes = hex!( - "3f3e3d3c3b3a393837363534333231302f2e2d2c2b2a292827262524232221201f1e1d1c1b1a191817161514131211100f0e0d0c0b0a090807" - "1f1e1d1c1b1a191817161514131211100f0e0d0c0b0a09080706050403020100fffefdfcfbfaf9f8f7f6f5f4f3f2f1f0efeeedecebeae9e8e7" -); - -#[test] -fn test_serialize() { - let signature = Signature::try_from(&EXAMPLE_SIGNATURE[..]).unwrap(); - let encoded_signature: Vec = bincode::serialize(&signature).unwrap(); - assert_eq!(&EXAMPLE_SIGNATURE[..], &encoded_signature[..]); -} - -#[test] -fn test_deserialize() { - let signature = bincode::deserialize::(&EXAMPLE_SIGNATURE).unwrap(); - assert_eq!(EXAMPLE_SIGNATURE, signature.to_bytes()); -}