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.

Sign up for GitHub

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
Closed

Update dependencies #87

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
0b34a2e
Fix nightly, update rand_core, curve25519-dalek
Aug 3, 2021
f32a1e1
Set version to 2.0.0-pre.0
Aug 3, 2021
c012698
Actually bump rand.
Aug 3, 2021
cb40302
Remove curve25519-dalek patch.
Aug 24, 2021
371875f
newline added by editor, not going to fight it.
Sep 2, 2021
672f29e
Merge pull request #1 from jcape/features/new-rand-and-curve25519
Sep 2, 2021
0dcf640
Merge dalek/develop into mobilecoin
remoun Jan 19, 2022
5d7c338
Bump curve25519-dalek version.
remoun Jan 19, 2022
660d9b5
Update patched curve25519-dalek to point at MCF fork
Feb 1, 2022
d95fc91
Update a couple of stale version references.
Feb 16, 2022
39abb48
Bump MSRV to 1.51
Feb 24, 2022
f966b20
Add mobilecoin to list of branches to run CI on
Feb 24, 2022
a205cd5
Actually bump MSRV in workflow
Feb 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions Cargo.toml
View file
Open in desktop
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 <[email protected]>",
"DebugSteven <[email protected]>",
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.

2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ To install, add the following to your project's `Cargo.toml`:

```toml
[dependencies]
x25519-dalek = "1"
x25519-dalek = "2.0.0-pre.2"
```

# MSRV
Expand Down
4 changes: 2 additions & 2 deletions src/lib.rs
View file
Open in desktop
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,7 +124,7 @@
//!
//! ```toml
//! [dependencies]
//! x25519-dalek = "1"
//! x25519-dalek = "2.0.0-pre.2"
//! ```
//!
//! # MSRV
Expand Down