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

Changes for bumping curve25519-dalek dependency to 0.12.0.

Browse source
This commit is contained in:
Isis Lovecruft 2017-10-05 07:03:35 +00:00
parent b78487132c
commit e9cd9a2264
Failed to extract signature
2 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Cargo.toml
View file

@ -19,7 +19,7 @@ travis-ci = { repository = "isislovecruft/ed25519-dalek", branch = "master"}
arrayref = "0.3.4" arrayref = "0.3.4"
[dependencies.curve25519-dalek] [dependencies.curve25519-dalek]
version = "^0.11" version = "^0.12"
default-features = false default-features = false
[dependencies.subtle] [dependencies.subtle]

14
src/ed25519.rs
View file

@ -297,7 +297,7 @@ impl PublicKey {
digest[31] &= 127; digest[31] &= 127;
digest[31] |= 64; digest[31] |= 64;
pk = (&Scalar(*digest) * &constants::ED25519_BASEPOINT_TABLE).compress_edwards().to_bytes(); pk = (&Scalar(*digest) * &constants::ED25519_BASEPOINT_TABLE).compress().to_bytes();
PublicKey(CompressedEdwardsY(pk)) PublicKey(CompressedEdwardsY(pk))
} }
@ -344,11 +344,7 @@ impl PublicKey {
digest_reduced = Scalar::reduce(&digest); digest_reduced = Scalar::reduce(&digest);
r = vartime::double_scalar_mult_basepoint(&digest_reduced, &a, &Scalar(*top_half)); r = vartime::double_scalar_mult_basepoint(&digest_reduced, &a, &Scalar(*top_half));
if slices_equal(bottom_half, &r.compress_edwards().to_bytes()) == 1 { slices_equal(bottom_half, &r.compress().to_bytes()) == 1
return true
} else {
return false
}
} }
} }
@ -463,7 +459,7 @@ impl Keypair {
r = &mesg_digest * &constants::ED25519_BASEPOINT_TABLE; r = &mesg_digest * &constants::ED25519_BASEPOINT_TABLE;
h = D::default(); h = D::default();
h.input(&r.compress_edwards().to_bytes()[..]); h.input(&r.compress().to_bytes()[..]);
h.input(public_key); h.input(public_key);
h.input(&message); h.input(&message);
hash.copy_from_slice(h.fixed_result().as_slice()); hash.copy_from_slice(h.fixed_result().as_slice());
@ -471,7 +467,7 @@ impl Keypair {
hram_digest = Scalar::reduce(&hash); hram_digest = Scalar::reduce(&hash);
s = Scalar::multiply_add(&hram_digest, &expanded_key_secret, &mesg_digest); s = Scalar::multiply_add(&hram_digest, &expanded_key_secret, &mesg_digest);
t = r.compress_edwards(); t = r.compress();
signature_bytes[..32].copy_from_slice(&t.0); signature_bytes[..32].copy_from_slice(&t.0);
signature_bytes[32..64].copy_from_slice(&s.0); signature_bytes[32..64].copy_from_slice(&s.0);
@ -518,7 +514,7 @@ mod test {
break; break;
} }
} }
public = PublicKey(a.compress_edwards()); public = PublicKey(a.compress());
assert!(keypair.public.0 == public.0); assert!(keypair.public.0 == public.0);
} }