Skip to content

Commit

Permalink
ed: ConstantTimeEq and PartialEq for SigningKey (#557)
Browse files Browse the repository at this point in the history
  • Loading branch information
mkj committed Aug 12, 2023
1 parent bf2c4ee commit c66973c
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 0 deletions.
1 change: 1 addition & 0 deletions ed25519-dalek/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ curve25519-dalek = { version = "4", path = "../curve25519-dalek", default-featur
ed25519 = { version = ">=2.2, <2.3", default-features = false }
signature = { version = ">=2.0, <2.1", optional = true, default-features = false }
sha2 = { version = "0.10", default-features = false }
subtle = { version = "2.3.0", default-features = false }

# optional features
merlin = { version = "3", default-features = false, optional = true }
Expand Down
15 changes: 15 additions & 0 deletions ed25519-dalek/src/signing.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ use rand_core::CryptoRngCore;
use serde::{Deserialize, Deserializer, Serialize, Serializer};

use sha2::Sha512;
use subtle::{Choice, ConstantTimeEq};

use curve25519_dalek::{
digest::{generic_array::typenum::U64, Digest},
Expand Down Expand Up @@ -583,6 +584,20 @@ impl TryFrom<&[u8]> for SigningKey {
}
}

impl ConstantTimeEq for SigningKey {
fn ct_eq(&self, other: &Self) -> Choice {
self.secret_key.ct_eq(&other.secret_key)
}
}

impl PartialEq for SigningKey {
fn eq(&self, other: &Self) -> bool {
self.ct_eq(other).into()
}
}

impl Eq for SigningKey {}

#[cfg(feature = "zeroize")]
impl Drop for SigningKey {
fn drop(&mut self) {
Expand Down

0 comments on commit c66973c

Please sign in to comment.