Merge branch 'master' into develop

This commit is contained in:
Isis Lovecruft
2018-03-26 02:31:05 +00:00
2 changed files with 7 additions and 7 deletions

View File

@@ -1,6 +1,6 @@
[package]
name = "ed25519-dalek"
version = "0.6.0"
version = "0.6.1"
authors = ["Isis Lovecruft <isis@patternsinthevoid.net>"]
readme = "README.md"
license = "BSD-3-Clause"

View File

@@ -1145,8 +1145,8 @@ mod bench {
#[bench]
fn sign(b: &mut Bencher) {
let mut cspring: OsRng = OsRng::new().unwrap();
let keypair: Keypair = Keypair::generate::<Sha512>(&mut cspring);
let mut csprng: OsRng = OsRng::new().unwrap();
let keypair: Keypair = Keypair::generate::<Sha512>(&mut csprng);
let msg: &[u8] = b"";
b.iter(| | keypair.sign::<Sha512>(msg));
@@ -1154,8 +1154,8 @@ mod bench {
#[bench]
fn sign_expanded_key(b: &mut Bencher) {
let mut cspring: OsRng = OsRng::new().unwrap();
let keypair: Keypair = Keypair::generate::<Sha512>(&mut cspring);
let mut csprng: OsRng = OsRng::new().unwrap();
let keypair: Keypair = Keypair::generate::<Sha512>(&mut csprng);
let expanded: ExpandedSecretKey = keypair.secret.expand::<Sha512>();
let msg: &[u8] = b"";
@@ -1164,8 +1164,8 @@ mod bench {
#[bench]
fn verify(b: &mut Bencher) {
let mut cspring: OsRng = OsRng::new().unwrap();
let keypair: Keypair = Keypair::generate::<Sha512>(&mut cspring);
let mut csprng: OsRng = OsRng::new().unwrap();
let keypair: Keypair = Keypair::generate::<Sha512>(&mut csprng);
let msg: &[u8] = b"";
let sig: Signature = keypair.sign::<Sha512>(msg);