renet
/
SaiTLS
10
1
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

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.
master
occheung 2020-12-07 11:27:04 +08:00
parent 370766aa1b
commit 0c6807f593
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Cargo.toml
View File

@ -58,6 +58,7 @@ features = [ "u64_backend" ]
# Fetch from master, for "no_std" + "alloc" combination # Fetch from master, for "no_std" + "alloc" combination
[dependencies.rsa] [dependencies.rsa]
git = "https://github.com/RustCrypto/RSA.git" git = "https://github.com/RustCrypto/RSA.git"
rev = "c879eb2"
default-features = false default-features = false
features = [ "alloc" ] features = [ "alloc" ]
@ -93,13 +94,14 @@ optional = true
version = "0.3.1" version = "0.3.1"
optional = true 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 # 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" version = "0.1.0"
optional = true optional = true
[features] [features]
default = [] default = []
std = [ "rand", "hex-literal", "simple_logger", "rsa/default" ] std = [ "rand", "hex-literal", "simple_logger", "rsa/default" ]
nal_stack = [ "embedded-nal" ] nal_tcp_stack = [ "embedded-nal-tcp-stack" ]