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

Merge branch 'release/0.6.1'

Browse source
This commit is contained in:
Isis Lovecruft 2018-03-26 02:30:57 +00:00
commit 45d5ccd197
Failed to extract signature
2 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "ed25519-dalek" name = "ed25519-dalek"
version = "0.6.0" version = "0.6.1"
authors = ["Isis Lovecruft <isis@patternsinthevoid.net>"] authors = ["Isis Lovecruft <isis@patternsinthevoid.net>"]
readme = "README.md" readme = "README.md"
license = "BSD-3-Clause" license = "BSD-3-Clause"
@ -28,7 +28,7 @@ optional = true
version = "0.4" version = "0.4"
[dependencies.digest] [dependencies.digest]
version = "0.6" version = "^0.7"
[dependencies.generic-array] [dependencies.generic-array]
# same version that digest depends on # same version that digest depends on
@ -39,7 +39,7 @@ version = "^1.0"
optional = true optional = true
[dependencies.sha2] [dependencies.sha2]
version = "0.6" version = "^0.7"
optional = true optional = true
[dependencies.failure] [dependencies.failure]
@ -47,8 +47,8 @@ version = "^0.1.1"
default-features = false default-features = false
[dev-dependencies] [dev-dependencies]
hex = "0.3" hex = "^0.3"
sha2 = "0.6" sha2 = "^0.7"
bincode = "^0.9" bincode = "^0.9"
[features] [features]

16
src/ed25519.rs
View file

@ -910,7 +910,9 @@ impl<'d> Deserialize<'d> for Keypair {
type Value = Keypair; type Value = Keypair;
fn expecting(&self, formatter: &mut ::core::fmt::Formatter) -> ::core::fmt::Result { fn expecting(&self, formatter: &mut ::core::fmt::Formatter) -> ::core::fmt::Result {
formatter.write_str("An ed25519 signature as specified in RFC8032") formatter.write_str("An ed25519 keypair, 64 bytes in total where the secret key is \
the first 32 bytes and is in unexpanded form, and the second \
32 bytes is a compressed point for a public key.")
} }
fn visit_bytes<E>(self, bytes: &[u8]) -> Result<Keypair, E> where E: SerdeError { fn visit_bytes<E>(self, bytes: &[u8]) -> Result<Keypair, E> where E: SerdeError {
@ -1143,8 +1145,8 @@ mod bench {
#[bench] #[bench]
fn sign(b: &mut Bencher) { fn sign(b: &mut Bencher) {
let mut cspring: OsRng = OsRng::new().unwrap(); let mut csprng: OsRng = OsRng::new().unwrap();
let keypair: Keypair = Keypair::generate::<Sha512>(&mut cspring); let keypair: Keypair = Keypair::generate::<Sha512>(&mut csprng);
let msg: &[u8] = b""; let msg: &[u8] = b"";
b.iter(| | keypair.sign::<Sha512>(msg)); b.iter(| | keypair.sign::<Sha512>(msg));
@ -1152,8 +1154,8 @@ mod bench {
#[bench] #[bench]
fn sign_expanded_key(b: &mut Bencher) { fn sign_expanded_key(b: &mut Bencher) {
let mut cspring: OsRng = OsRng::new().unwrap(); let mut csprng: OsRng = OsRng::new().unwrap();
let keypair: Keypair = Keypair::generate::<Sha512>(&mut cspring); let keypair: Keypair = Keypair::generate::<Sha512>(&mut csprng);
let expanded: ExpandedSecretKey = keypair.secret.expand::<Sha512>(); let expanded: ExpandedSecretKey = keypair.secret.expand::<Sha512>();
let msg: &[u8] = b""; let msg: &[u8] = b"";
@ -1162,8 +1164,8 @@ mod bench {
#[bench] #[bench]
fn verify(b: &mut Bencher) { fn verify(b: &mut Bencher) {
let mut cspring: OsRng = OsRng::new().unwrap(); let mut csprng: OsRng = OsRng::new().unwrap();
let keypair: Keypair = Keypair::generate::<Sha512>(&mut cspring); let keypair: Keypair = Keypair::generate::<Sha512>(&mut csprng);
let msg: &[u8] = b""; let msg: &[u8] = b"";
let sig: Signature = keypair.sign::<Sha512>(msg); let sig: Signature = keypair.sign::<Sha512>(msg);