saymrwulf/curve25519-dalek-source
1
0
Fork 0
mirror of https://github.com/saymrwulf/curve25519-dalek-source.git synced 2026-09-04 20:24:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'release/0.2.3'

Browse source
This commit is contained in:
Isis Lovecruft 2017-03-14 20:49:18 +00:00
commit 6b4eb03dfa
Failed to extract signature
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
name = "ed25519-dalek"
version = "0.2.2"
version = "0.2.3"
authors = ["Isis Lovecruft <isis@torproject.org>"]
readme = "README.md"
license = "CC0-1.0"
@ -17,7 +17,7 @@ arrayref = "0.3.3"
sha2 = "^0.4"
[dependencies.curve25519-dalek]
version = "^0.4"
version = "^0.6"
default-features = false
[dependencies.rand]

11
src/ed25519.rs
View file

@ -18,6 +18,7 @@ use sha2::{Digest, Sha512};
use rand::Rng;
use curve25519_dalek::curve;
use curve25519_dalek::curve::BasepointMult;
use curve25519_dalek::curve::CompressedEdwardsY;
use curve25519_dalek::curve::ExtendedPoint;
use curve25519_dalek::curve::ProjectivePoint;
@ -166,7 +167,7 @@ impl SecretKey {
r = ExtendedPoint::basepoint_mult(&mesg_digest);
h = Sha512::new();
h.input(&r.compress().to_bytes()[..]);
h.input(&r.compress_edwards().to_bytes()[..]);
h.input(public_key);
h.input(&message);
hash.copy_from_slice(h.result().as_slice());
@ -174,7 +175,7 @@ impl SecretKey {
hram_digest = Scalar::reduce(&hash);
s = Scalar::multiply_add(&hram_digest, &expanded_key_secret, &mesg_digest);
t = r.compress();
t = r.compress_edwards();
signature_bytes[..32].copy_from_slice(&t.0);
signature_bytes[32..64].copy_from_slice(&s.0);
@ -274,7 +275,7 @@ impl PublicKey {
digest_reduced = Scalar::reduce(&digest);
r = curve::double_scalar_mult_vartime(&digest_reduced, &a, &Scalar(*top_half));
if arrays_equal_ct(bottom_half, &r.compress().to_bytes()) == 1 {
if arrays_equal_ct(bottom_half, &r.compress_edwards().to_bytes()) == 1 {
return true
} else {
return false
@ -319,7 +320,7 @@ impl Keypair {
digest[31] &= 127;
digest[31] |= 64;
pk = ExtendedPoint::basepoint_mult(&Scalar(*digest)).compress().to_bytes();
pk = ExtendedPoint::basepoint_mult(&Scalar(*digest)).compress_edwards().to_bytes();
for i in 0..32 {
sk[i] = t[i];
@ -397,7 +398,7 @@ mod test {
break;
}
}
public = PublicKey(a.compress());
public = PublicKey(a.compress_edwards());
assert!(keypair.public.0 == public.0);
}

1
src/lib.rs
View file

@ -27,6 +27,7 @@
//! use rand::Rng;
//! use rand::OsRng;
//! use ed25519::Keypair;
//! use ed25519::Signature;
//!
//! let mut cspring: OsRng = OsRng::new().unwrap();
//! let keypair: Keypair = Keypair::generate(&mut cspring);