diff --git a/Cargo.lock b/Cargo.lock index 0d95a1a63..9424175c3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1150,7 +1150,8 @@ checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" [[package]] name = "curve25519-dalek" -version = "4.1.1" +version = "4.1.2" +source = "git+https://github.com/betrusted-io/curve25519-dalek.git?branch=main#0fc7183a2a4c82a5ea575f56ca975cef46cd6398" dependencies = [ "cfg-if", "cpufeatures", @@ -1158,7 +1159,6 @@ dependencies = [ "digest 0.10.7", "engine25519-as", "log", - "platforms", "rustc_version 0.4.0", "subtle", "utralib 0.1.24", @@ -1169,6 +1169,7 @@ dependencies = [ [[package]] name = "curve25519-dalek-derive" version = "0.1.1" +source = "git+https://github.com/betrusted-io/curve25519-dalek.git?branch=main#0fc7183a2a4c82a5ea575f56ca975cef46cd6398" dependencies = [ "proc-macro2", "quote", @@ -3649,12 +3650,6 @@ version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb" -[[package]] -name = "platforms" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "626dec3cac7cc0e1577a2ec3fc496277ec2baa084bebad95bb6fdbfae235f84c" - [[package]] name = "plotters" version = "0.3.5" diff --git a/Cargo.toml b/Cargo.toml index 9c8f8ffdd..d1154d5d6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -146,9 +146,9 @@ sha2_legacy = { git = "https://github.com/RustCrypto/hashes.git", tag = "sha2-v0 path = "services/aes" [patch.crates-io.curve25519-dalek] -#git = "https://github.com/betrusted-io/curve25519-dalek.git" -#branch = "main" -path = "../curve25519-dalek/curve25519-dalek" # when doing local dev work +git = "https://github.com/betrusted-io/curve25519-dalek.git" +branch = "main" +# path = "../curve25519-dalek/curve25519-dalek" # when doing local dev work # feature overrides are specified at the crate level [patch."https://github.com/betrusted-io/xous-engine-25519.git"] diff --git a/services/root-keys/Cargo.toml b/services/root-keys/Cargo.toml index 2c96e9812..2e6d47a1d 100644 --- a/services/root-keys/Cargo.toml +++ b/services/root-keys/Cargo.toml @@ -71,7 +71,7 @@ byteorder = "1.4.3" # used by keywrap hex = { version = "0.4.3", default-features = false, features = [] } [dependencies.curve25519-dalek] -version = "=4.1.1" # note this is patched to our fork in ./Cargo.toml +version = "=4.1.2" # note this is patched to our fork in ./Cargo.toml default-features = false [dependencies.ed25519-dalek] diff --git a/services/shellchat/Cargo.toml b/services/shellchat/Cargo.toml index 46100588d..6ca196f29 100644 --- a/services/shellchat/Cargo.toml +++ b/services/shellchat/Cargo.toml @@ -100,7 +100,7 @@ random-pick = { version = "1.2.16", optional = true } hex = { version = "0.4.3", default-features = false, features = [] } #sha2 = {version = "0.9.5", default-features = false, features = []} [dependencies.curve25519-dalek] -version = "=4.1.1" # note this is patched to our fork in ./Cargo.toml +version = "=4.1.2" # note this is patched to our fork in ./Cargo.toml default-features = false [dependencies.x25519-dalek]