Skip to content

Commit

Permalink
feat: relax zeroize (#4961)
Browse files Browse the repository at this point in the history 
Description
---
Include the updated `tari_crypto` that points to `tari-project/curve25519-dalek` where zeroize is relaxed

Motivation and Context
---
Dalek has relaxed this on their main branch. This stops many dependency clashes.

How Has This Been Tested?
---
CI
  • Loading branch information
@hansieodendaal
hansieodendaal authored Nov 28, 2022
1 parent e364994 commit a6e8991
Show file tree
Hide file tree
Showing 19 changed files with 64 additions and 70 deletions.
89 changes: 42 additions & 47 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions applications/tari_app_grpc/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ edition = "2018"
tari_common_types = { version = "^0.41", path = "../../base_layer/common_types" }
tari_comms = { path = "../../comms/core" }
tari_core = { path = "../../base_layer/core" }
tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.16.4" }
tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.16.5" }
tari_script = { path = "../../infrastructure/tari_script" }
tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", tag="v0.4.10" }

Expand All @@ -27,7 +27,7 @@ prost-types = "0.9"
rand = "0.8.5"
thiserror = "1"
tonic = "0.6.2"
zeroize = "1.3"
zeroize = "1"

[build-dependencies]
tonic-build = "0.6.2"
Expand Down
2 changes: 1 addition & 1 deletion applications/tari_app_utilities/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ license = "BSD-3-Clause"

[dependencies]
tari_comms = { path = "../../comms/core" }
tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.16.4" }
tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.16.5" }
tari_common = { path = "../../common" }
tari_common_types = { path = "../../base_layer/common_types" }
tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", tag="v0.4.10" }
Expand Down
2 changes: 1 addition & 1 deletion applications/tari_base_node/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ tari_comms = { path = "../../comms/core", features = ["rpc"] }
tari_common_types = { path = "../../base_layer/common_types" }
tari_comms_dht = { path = "../../comms/dht" }
tari_core = { path = "../../base_layer/core", default-features = false, features = ["transactions"] }
tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.16.4" }
tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.16.5" }
tari_libtor = { path = "../../infrastructure/libtor", optional = true }
tari_mmr = { path = "../../base_layer/mmr", features = ["native_bitmap"] }
tari_p2p = { path = "../../base_layer/p2p", features = ["auto-update"] }
Expand Down
4 changes: 2 additions & 2 deletions applications/tari_console_wallet/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ license = "BSD-3-Clause"

[dependencies]
tari_wallet = { path = "../../base_layer/wallet", features = ["bundled_sqlite"] }
tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.16.4" }
tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.16.5" }
tari_common = { path = "../../common" }
tari_app_utilities = { path = "../tari_app_utilities" }
tari_comms = { path = "../../comms/core" }
Expand Down Expand Up @@ -50,7 +50,7 @@ tonic = "0.6.2"
tracing = "0.1.26"
unicode-segmentation = "1.6.0"
unicode-width = "0.1"
zeroize = "1.3.0"
zeroize = "1"

[dependencies.tari_core]
path = "../../base_layer/core"
Expand Down
2 changes: 1 addition & 1 deletion applications/tari_miner/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ tari_common_types = { path = "../../base_layer/common_types" }
tari_comms = { path = "../../comms/core" }
tari_app_utilities = { path = "../tari_app_utilities" }
tari_app_grpc = { path = "../tari_app_grpc" }
tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.16.4" }
tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.16.5" }
tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", tag="v0.4.10" }

borsh = "0.9.3"
Expand Down
2 changes: 1 addition & 1 deletion base_layer/common_types/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ version = "0.41.0"
edition = "2018"

[dependencies]
tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.16.4" }
tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.16.5" }
tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", tag="v0.4.10" }
tari_common = { version = "^0.41", path = "../../common" }

Expand Down
2 changes: 1 addition & 1 deletion base_layer/core/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ tari_common_types = { version = "^0.41", path = "../../base_layer/common_types"
tari_comms = { version = "^0.41", path = "../../comms/core" }
tari_comms_dht = { version = "^0.41", path = "../../comms/dht" }
tari_comms_rpc_macros = { version = "^0.41", path = "../../comms/rpc_macros" }
tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.16.4", features = ["borsh"] }
tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.16.5", features = ["borsh"] }
tari_metrics = { path = "../../infrastructure/metrics" }
tari_mmr = { version = "^0.41", path = "../../base_layer/mmr", optional = true, features = ["native_bitmap"] }
tari_p2p = { version = "^0.41", path = "../../base_layer/p2p" }
Expand Down
2 changes: 1 addition & 1 deletion base_layer/key_manager/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ crate-type = ["lib", "cdylib"]
# NB: All dependencies must support or be gated for the WASM target.
[dependencies]
tari_common_types = { version = "^0.41", path = "../../base_layer/common_types", optional = true }
tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.16.4" }
tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.16.5" }
tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", tag="v0.4.10" }

argon2 = { version = "0.4.1", features = ["std", "alloc"] }
Expand Down
2 changes: 1 addition & 1 deletion base_layer/mmr/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ benches = ["criterion"]

[dependencies]
tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", tag="v0.4.10" }
tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.16.4" }
tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.16.5" }
tari_common = {path = "../../common"}
thiserror = "1.0.26"
digest = "0.9.0"
Expand Down
2 changes: 1 addition & 1 deletion base_layer/p2p/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ edition = "2018"
tari_comms = { version = "^0.41", path = "../../comms/core" }
tari_comms_dht = { version = "^0.41", path = "../../comms/dht" }
tari_common = { version = "^0.41", path = "../../common" }
tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.16.4" }
tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.16.5" }
tari_service_framework = { version = "^0.41", path = "../service_framework" }
tari_shutdown = { version = "^0.41", path = "../../infrastructure/shutdown" }
tari_storage = { version = "^0.41", path = "../../infrastructure/storage" }
Expand Down
2 changes: 1 addition & 1 deletion base_layer/tari_mining_helper_ffi/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ edition = "2018"

[dependencies]
tari_comms = { version = "^0.41", path = "../../comms/core" }
tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.16.4"}
tari_crypto = { git = "https://github.com/tari-project/tari-crypto.git", tag = "v0.16.5"}
tari_common = { path = "../../common" }
tari_core = { path = "../core", default-features = false, features = ["transactions"]}
tari_utilities = { git = "https://github.com/tari-project/tari_utilities.git", tag="v0.4.10"}
Expand Down
Loading

0 comments on commit a6e8991

Please sign in to comment.