Merge branch 'master' into develop

This commit is contained in:
Isis Lovecruft 2018-07-27 20:26:06 +00:00
commit 909b44a502
Failed to extract signature
2 changed files with 4 additions and 4 deletions

View file

@ -1,6 +1,6 @@
[package]
name = "x25519-dalek"
version = "0.2.1"
version = "0.3.0"
authors = ["Isis Lovecruft <isis@patternsinthevoid.net>"]
readme = "README.md"
license = "BSD-3-Clause"
@ -20,7 +20,7 @@ exclude = [
travis-ci = { repository = "dalek-cryptography/x25519-dalek", branch = "master"}
[dependencies.curve25519-dalek]
version = "^0.18"
version = "^0.19"
default-features = false
[dependencies.rand_core]

View file

@ -1,5 +1,5 @@
# x25519-dalek [![](https://img.shields.io/crates/v/x25519-dalek.svg)](https://crates.io/crates/x25519-dalek) [![](https://docs.rs/x25519-dalek/badge.svg)](https://docs.rs/x25519-dalek) [![](https://travis-ci.org/isislovecruft/x25519-dalek.svg?branch=master)](https://travis-ci.org/dalek-cryptography/x25519-dalek)
# x25519-dalek [![](https://img.shields.io/crates/v/x25519-dalek.svg)](https://crates.io/crates/x25519-dalek) [![](https://docs.rs/x25519-dalek/badge.svg)](https://docs.rs/x25519-dalek) [![](https://travis-ci.org/dalek-cryptography/x25519-dalek.svg?branch=master)](https://travis-ci.org/dalek-cryptography/x25519-dalek)
A pure-Rust implementation of x25519 elliptic curve Diffie-Hellman key exchange,
as specified by Mike Hamburg and Adam Langley in
@ -92,7 +92,7 @@ To install, add the following to your project's `Cargo.toml`:
```toml
[dependencies.x25519-dalek]
version = "^0.2"
version = "^0.3"
```
Then, in your library or executable source, add: