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 pull request #52 from DebugSteven/bump-rand

Browse source 
Bump rand_core Version
This commit is contained in:
Henry de Valence 2019-11-26 13:56:19 -08:00 committed by GitHub
commit d588e2fd18
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Cargo.toml
View file

@ -30,7 +30,7 @@ features = ["nightly"]
[dependencies] [dependencies]
curve25519-dalek = { version = "2", default-features = false } curve25519-dalek = { version = "2", default-features = false }
rand_core = { version = "0.3", default-features = false } rand_core = { version = "0.5", default-features = false }
# `serde` is renamed to `our_serde` in order to avoid a name collision between # `serde` is renamed to `our_serde` in order to avoid a name collision between
# importing the serde dependency and enabling the curve25519-dalek/serde feature # importing the serde dependency and enabling the curve25519-dalek/serde feature
our_serde = { package = "serde", version = "1", default-features = false, optional = true, features = ["derive"] } our_serde = { package = "serde", version = "1", default-features = false, optional = true, features = ["derive"] }
@ -39,7 +39,6 @@ zeroize = { version = "1", default-features = false, features = ["zeroize_derive
[dev-dependencies] [dev-dependencies]
bincode = "1" bincode = "1"
criterion = "0.2" criterion = "0.2"
rand_os = "0.1"
[[bench]] [[bench]]
name = "x25519" name = "x25519"

9
benches/x25519.rs
View file

@ -14,24 +14,23 @@
#[macro_use] #[macro_use]
extern crate criterion; extern crate criterion;
extern crate curve25519_dalek; extern crate curve25519_dalek;
extern crate rand_os; extern crate rand_core;
extern crate x25519_dalek; extern crate x25519_dalek;
use criterion::Criterion; use criterion::Criterion;
use rand_os::OsRng; use rand_core::OsRng;
use x25519_dalek::EphemeralSecret; use x25519_dalek::EphemeralSecret;
use x25519_dalek::PublicKey; use x25519_dalek::PublicKey;
fn bench_diffie_hellman(c: &mut Criterion) { fn bench_diffie_hellman(c: &mut Criterion) {
let mut csprng: OsRng = OsRng::new().unwrap(); let bob_secret = EphemeralSecret::new(&mut OsRng);
let bob_secret = EphemeralSecret::new(&mut csprng);
let bob_public = PublicKey::from(&bob_secret); let bob_public = PublicKey::from(&bob_secret);
c.bench_function("diffie_hellman", move |b| { c.bench_function("diffie_hellman", move |b| {
b.iter_with_setup( b.iter_with_setup(
|| EphemeralSecret::new(&mut csprng), || EphemeralSecret::new(&mut OsRng),
|alice_secret| alice_secret.diffie_hellman(&bob_public), |alice_secret| alice_secret.diffie_hellman(&bob_public),
) )
}); });

3
src/lib.rs
View file

@ -30,9 +30,6 @@ extern crate rand_core;
extern crate zeroize; extern crate zeroize;
#[cfg(test)]
extern crate rand_os;
mod x25519; mod x25519;
pub use crate::x25519::*; pub use crate::x25519::*;

7
src/x25519.rs
View file

@ -203,17 +203,16 @@ impl From<AllowUnreducedScalarBytes> for Scalar {
mod test { mod test {
use super::*; use super::*;
use rand_os::OsRng; use rand_core::OsRng;
// This was previously a doctest but it got moved to the README to // This was previously a doctest but it got moved to the README to
// avoid duplication where it then wasn't being run, so now it // avoid duplication where it then wasn't being run, so now it
// lives here. // lives here.
#[test] #[test]
fn alice_and_bob() { fn alice_and_bob() {
let mut csprng = OsRng::new().unwrap(); let alice_secret = EphemeralSecret::new(&mut OsRng);
let alice_secret = EphemeralSecret::new(&mut csprng);
let alice_public = PublicKey::from(&alice_secret); let alice_public = PublicKey::from(&alice_secret);
let bob_secret = EphemeralSecret::new(&mut csprng); let bob_secret = EphemeralSecret::new(&mut OsRng);
let bob_public = PublicKey::from(&bob_secret); let bob_public = PublicKey::from(&bob_secret);
let alice_shared_secret = alice_secret.diffie_hellman(&bob_public); let alice_shared_secret = alice_secret.diffie_hellman(&bob_public);
let bob_shared_secret = bob_secret.diffie_hellman(&alice_public); let bob_shared_secret = bob_secret.diffie_hellman(&alice_public);