Merge branch 'master' into develop

This commit is contained in:
Isis Lovecruft 2019-01-16 02:07:12 +00:00
commit 46d0051cda
No known key found for this signature in database
GPG key ID: AB41313533E8E812
7 changed files with 24 additions and 20 deletions

View file

@ -4,11 +4,11 @@ If you have questions or comments, please feel free to email the
authors.
For feature requests, suggestions, and bug reports, please open an issue on
[our Github](https://github.com/isislovecruft/x25519-dalek). (Or, send us
[our Github](https://github.com/dalek-cryptography/x25519-dalek). (Or, send us
an email if you're opposed to using Github for whatever reason.)
Patches are welcomed as pull requests on
[our Github](https://github.com/isislovecruft/x25519-dalek), as well as by
[our Github](https://github.com/dalek-cryptography/x25519-dalek), as well as by
email (preferably sent to all of the authors listed in `Cargo.toml`).
All issues on curve25519-dalek are mentored, if you want help with a bug just

View file

@ -1,7 +1,7 @@
[package]
name = "x25519-dalek"
version = "0.3.0"
authors = ["Isis Lovecruft <isis@patternsinthevoid.net>"]
version = "0.4.0"
authors = ["Isis Lovecruft <isis@patternsinthevoid.net>", "DebugSteven <debugsteven@gmail.com>"]
readme = "README.md"
license = "BSD-3-Clause"
repository = "https://github.com/dalek-cryptography/x25519-dalek"
@ -30,7 +30,7 @@ clear_on_drop = { version = "0.2" }
[dev-dependencies]
criterion = "0.2"
rand = "0.6"
rand_os = "0.1"
[[bench]]
name = "x25519"

View file

@ -1,4 +1,5 @@
Copyright (c) 2017 Isis Agora Lovecruft. All rights reserved.
Copyright (c) 2017-2019 isis agora lovecruft. All rights reserved.
Copyright (c) 2019 DebugSteven. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are

View file

@ -33,11 +33,11 @@ First, Alice uses `EphemeralSecret::new()` and then
```rust
extern crate x25519_dalek;
extern crate rand;
extern crate rand_os;
use x25519_dalek::EphemeralPublic;
use x25519_dalek::EphemeralSecret;
use rand::OsRng;
use rand_os::OsRng;
let mut alice_csprng = OsRng::new().unwrap();
let alice_secret = EphemeralSecret::new(&mut alice_csprng);
@ -79,7 +79,7 @@ To install, add the following to your project's `Cargo.toml`:
```toml
[dependencies.x25519-dalek]
version = "^0.3"
version = "^0.4"
```
# Documentation

View file

@ -1,25 +1,27 @@
// -*- mode: rust; -*-
//
// This file is part of x25519-dalek.
// Copyright (c) 2017 Isis Lovecruft
// Copyright (c) 2017-2019 isis agora lovecruft
// Copyright (c) 2019 DebugSteven
// See LICENSE for licensing information.
//
// Authors:
// - Isis Agora Lovecruft <isis@patternsinthevoid.net>
// - isis agora lovecruft <isis@patternsinthevoid.net>
// - DebugSteven <debugsteven@gmail.com>
//! Benchmark the Diffie-Hellman operation.
#[macro_use]
extern crate criterion;
extern crate curve25519_dalek;
extern crate rand;
extern crate rand_os;
extern crate x25519_dalek;
use criterion::Criterion;
use curve25519_dalek::montgomery::MontgomeryPoint;
use rand::OsRng;
use rand_os::OsRng;
use x25519_dalek::EphemeralPublic;
use x25519_dalek::EphemeralSecret;

View file

@ -1,11 +1,13 @@
// -*- mode: rust; -*-
//
// This file is part of x25519-dalek.
// Copyright (c) 2017 Isis Lovecruft
// Copyright (c) 2017-2019 isis lovecruft
// Copyright (c) 2019 DebugSteven
// See LICENSE for licensing information.
//
// Authors:
// - Isis Agora Lovecruft <isis@patternsinthevoid.net>
// - isis agora lovecruft <isis@patternsinthevoid.net>
// - DebugSteven <debugsteven@gmail.com>
// Refuse to compile if documentation is missing, but only on nightly.
//
@ -28,9 +30,6 @@ extern crate curve25519_dalek;
extern crate rand_core;
#[cfg(test)]
extern crate rand;
mod x25519;
pub use x25519::*;

View file

@ -1,11 +1,13 @@
// -*- mode: rust; -*-
//
// This file is part of x25519-dalek.
// Copyright (c) 2017 Isis Lovecruft
// Copyright (c) 2017-2019 isis lovecruft
// Copyright (c) 2019 DebugSteven
// See LICENSE for licensing information.
//
// Authors:
// - Isis Agora Lovecruft <isis@patternsinthevoid.net>
// - isis agora lovecruft <isis@patternsinthevoid.net>
// - DebugSteven <debugsteven@gmail.com>
//! x25519 Diffie-Hellman key exchange
//!