Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies #87

Closed
wants to merge 13 commits into from
6 changes: 3 additions & 3 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:
branches: [ '*' ]
pull_request:
branches: [ main, develop, release ]
branches: [ main, develop, release, mobilecoin ]

env:
CARGO_TERM_COLOR: always
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
12 changes: 7 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 <isis@patternsinthevoid.net>",
"DebugSteven <debugsteven@gmail.com>",
Expand Down Expand Up @@ -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"] }
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This patch would unblock the coexistence of this crate with elliptic-curve. What would it take to get it released?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It needs to be updated to use dalek-cryptography/curve25519-dalek#405 once that's released


[dev-dependencies]
bincode = "1"
Expand All @@ -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" }
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can be removed once dalek-cryptography/curve25519-dalek#383 is merged and published.

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
//!
Expand Down Expand Up @@ -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
//!
Expand Down