From 0c6807f59315e040244b3400c3eae691540eef6b Mon Sep 17 00:00:00 2001 From: occheung Date: Mon, 7 Dec 2020 11:27:04 +0800 Subject: [PATCH] fix: subtle version Both "RSA" and "curve25519_dalek" depend on "subtle". "curve25519_dalek" depends on any "subtle" version after "2.2.1" Before commit "f6b445b" on the "RSA" crate, any version of "subtle" that is at least 2.0.0 can support the "RSA" crate. Commit "f6b445b" of "RSA" broke "subtle" by mandating the use of version "2.1.1" of "subtle". This commit fixes the dependency conflict by changing the source of "RSA" code to commit "c879eb2", which reverts the "subtle" dependency change. --- Cargo.toml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 7656bd2..daaea85 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -58,6 +58,7 @@ features = [ "u64_backend" ] # Fetch from master, for "no_std" + "alloc" combination [dependencies.rsa] git = "https://github.com/RustCrypto/RSA.git" +rev = "c879eb2" default-features = false features = [ "alloc" ] @@ -93,13 +94,14 @@ optional = true version = "0.3.1" optional = true -# Support old version of embedded_nal interface only +# Support `TcpStack` from old version of embedded_nal interface # It is to operate with crates such as MiniMQ, which still depends on version 0.1.0 -[dependencies.embedded-nal] +[dependencies.embedded-nal-tcp-stack] +package = "embedded-nal" version = "0.1.0" optional = true [features] default = [] std = [ "rand", "hex-literal", "simple_logger", "rsa/default" ] -nal_stack = [ "embedded-nal" ] +nal_tcp_stack = [ "embedded-nal-tcp-stack" ]