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

Jump to bottom

Fix ED25519 signature validation #1127

Merged
merged 2 commits into from
May 15, 2019
Merged

Fix ED25519 signature validation #1127

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a3b8cf0
Fix ED25519 signature validation
appaquet May 15, 2019
daf4f91
Merge branch 'master' into ed25519-signature
tomaka May 15, 2019
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
20 changes: 18 additions & 2 deletions core/src/identity/ed25519.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ pub struct PublicKey(ed25519::PublicKey);
impl PublicKey {
/// Verify the Ed25519 signature on a message using the public key.
pub fn verify(&self, msg: &[u8], sig: &[u8]) -> bool {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You might want to consider changing this method to return a Result<(), ()> so as to strategically avoid this bugclass in the future

ed25519::Signature::from_bytes(sig).map(|s| self.0.verify(msg, &s)).is_ok()
ed25519::Signature::from_bytes(sig).and_then(|s| self.0.verify(msg, &s)).is_ok()
}

/// Encode the public key into a byte array in compressed form, i.e.
Expand Down Expand Up @@ -189,5 +189,21 @@ mod tests {
}
QuickCheck::new().tests(10).quickcheck(prop as fn() -> _);
}
}

#[test]
fn ed25519_signature() {
let kp = Keypair::generate();
let pk = kp.public();

let msg = "hello world".as_bytes();
let sig = kp.sign(msg);
assert!(pk.verify(msg, &sig));

let mut invalid_sig = sig.clone();
invalid_sig[3..6].copy_from_slice(&[10, 23, 42]);
assert!(!pk.verify(msg, &invalid_sig));

let invalid_msg = "h3ll0 w0rld".as_bytes();
assert!(!pk.verify(invalid_msg, &sig));
}
}