diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 48f3b04..c4a93f1 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -4,7 +4,7 @@ on: push: branches: [ '*' ] pull_request: - branches: [ main, develop, release ] + branches: [ main, develop, release, mobilecoin ] env: CARGO_TERM_COLOR: always @@ -71,14 +71,14 @@ jobs: args: --features "serde" msrv: - name: Current MSRV is 1.41 + name: Current MSRV is 1.51 runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: 1.41 + toolchain: 1.51 override: true - uses: actions-rs/cargo@v1 with: diff --git a/CHANGELOG.md b/CHANGELOG.md index ef8f8d3..694364f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,7 +15,7 @@ Entries are listed in reverse chronological order. * Pin `zeroize` to version 1.3 to support a wider range of MSRVs. * Add CI via Github actions. * Fix breakage in the serde unittests. -* MSRV is now 1.41 for production and 1.48 for development. +* MSRV is now 1.51 for production and 1.51 for development. * Add an optional check to `SharedSecret` for contibutory behaviour. * Add implementation of `ReusableSecret` keys which are non-ephemeral, but which cannot be serialised to discourage long-term use. diff --git a/Cargo.toml b/Cargo.toml index 47c47d6..5668213 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,8 +5,7 @@ edition = "2018" # - update version in README.md # - update html_root_url # - update CHANGELOG -# - if any changes were made to README.md, mirror them in src/lib.rs docs -version = "1.2.0" +version = "2.0.0-pre.2" authors = [ "Isis Lovecruft ", "DebugSteven ", @@ -34,12 +33,12 @@ travis-ci = { repository = "dalek-cryptography/x25519-dalek", branch = "master"} features = ["nightly", "reusable_secrets", "serde"] [dependencies] -curve25519-dalek = { version = "3", default-features = false } -rand_core = { version = "0.5", default-features = false } +curve25519-dalek = { version = "4.0.0-pre.2", default-features = false } +rand_core = { version = "0.6", default-features = false } # `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 our_serde = { package = "serde", version = "1", default-features = false, optional = true, features = ["derive"] } -zeroize = { version = "=1.3", default-features = false, features = ["zeroize_derive"] } +zeroize = { version = "1", default-features = false, features = ["zeroize_derive"] } [dev-dependencies] bincode = "1" @@ -59,3 +58,6 @@ u64_backend = ["curve25519-dalek/u64_backend"] u32_backend = ["curve25519-dalek/u32_backend"] fiat_u64_backend = ["curve25519-dalek/fiat_u64_backend"] fiat_u32_backend = ["curve25519-dalek/fiat_u32_backend"] + +[patch.crates-io] +curve25519-dalek = { git = "https://github.com/mobilecoinfoundation/curve25519-dalek.git", rev = "8791722e0273762552c9a056eaccb7df6baf44d7" } diff --git a/README.md b/README.md index c7bb1be..c451141 100644 --- a/README.md +++ b/README.md @@ -102,12 +102,12 @@ To install, add the following to your project's `Cargo.toml`: ```toml [dependencies] -x25519-dalek = "1" +x25519-dalek = "2.0.0-pre.2" ``` # MSRV -Current MSRV is 1.41 for production builds, and 1.48 for running tests. +Current MSRV is 1.51 for production builds, and 1.51 for running tests. # Documentation diff --git a/src/lib.rs b/src/lib.rs index ef35c62..c63d287 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -18,7 +18,7 @@ #![cfg_attr(feature = "bench", feature(test))] #![cfg_attr(feature = "nightly", deny(missing_docs))] #![doc(html_logo_url = "https://doc.dalek.rs/assets/dalek-logo-clear.png")] -#![doc(html_root_url = "https://docs.rs/x25519-dalek/1.2.0")] +#![doc(html_root_url = "https://docs.rs/x25519-dalek/2.0.0-pre.2")] //! # 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) //! @@ -124,12 +124,12 @@ //! //! ```toml //! [dependencies] -//! x25519-dalek = "1" +//! x25519-dalek = "2.0.0-pre.2" //! ``` //! //! # MSRV //! -//! Current MSRV is 1.41 for production builds, and 1.48 for running tests. +//! Current MSRV is 1.51 for production builds, and 1.51 for running tests. //! //! # Documentation //!