Skip to content

Commit 059ba53

Browse files
committed
workspace: avoid duplicate crypto-common definition when using git dependency
When consuming an master release with `[patch.crates-io]` crypto-common would get duplicated because of the `path = "../` in each crate. This moves the override to the workspace `Cargo.toml` and remove that duplicate crypto-common crate instance.
1 parent 2100251 commit 059ba53

7 files changed

Lines changed: 7 additions & 6 deletions

File tree

Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,6 @@ members = [
1515
]
1616

1717
[patch.crates-io]
18+
crypto-common = { path = "crypto-common" }
1819
digest = { path = "digest" }
1920
signature = { path = "signature" }

aead/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ such as AES-GCM as ChaCha20Poly1305, which provide a high-level API
1616
"""
1717

1818
[dependencies]
19-
crypto-common = { version = "0.2.0-rc.10", path = "../crypto-common" }
19+
crypto-common = { version = "0.2.0-rc.10" }
2020
inout = "0.2.2"
2121

2222
# optional dependencies

cipher/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ categories = ["cryptography", "no-std"]
1313
description = "Traits for describing block ciphers and stream ciphers"
1414

1515
[dependencies]
16-
crypto-common = { version = "0.2.0-rc.10", path = "../crypto-common" }
16+
crypto-common = { version = "0.2.0-rc.10" }
1717
inout = "0.2.2"
1818

1919
# optional dependencies

digest/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ categories = ["cryptography", "no-std"]
1313
description = "Traits for cryptographic hash functions and message authentication codes"
1414

1515
[dependencies]
16-
crypto-common = { version = "0.2.0-rc.10", path = "../crypto-common" }
16+
crypto-common = { version = "0.2.0-rc.10" }
1717

1818
# optional dependencies
1919
block-buffer = { version = "0.11", optional = true }

elliptic-curve/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ features = ["hybrid-array", "rand_core", "subtle", "zeroize"]
2525
[dependencies]
2626
array = { package = "hybrid-array", version = "0.4", default-features = false, features = ["zeroize"] }
2727
base16ct = "1"
28-
common = { package = "crypto-common", version = "0.2.0-rc.10", features = ["rand_core"], path = "../crypto-common" }
28+
common = { package = "crypto-common", version = "0.2.0-rc.10", features = ["rand_core"] }
2929
rand_core = { version = "0.10.0-rc-4", default-features = false }
3030
subtle = { version = "2.6", default-features = false }
3131
zeroize = { version = "1.7", default-features = false }

kem/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Traits for Key Encapsulation Mechanisms (KEMs): public-key cryptosystems designe
1717
"""
1818

1919
[dependencies]
20-
crypto-common = { version = "0.2.0-rc.10", features = ["rand_core"], path = "../crypto-common" }
20+
crypto-common = { version = "0.2.0-rc.10", features = ["rand_core"] }
2121
rand_core = "0.10.0-rc-4"
2222

2323
[features]

universal-hash/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ categories = ["cryptography", "no-std"]
1313
description = "Traits which describe the functionality of universal hash functions (UHFs)"
1414

1515
[dependencies]
16-
crypto-common = { version = "0.2.0-rc.10", path = "../crypto-common" }
16+
crypto-common = { version = "0.2.0-rc.10" }
1717
subtle = { version = "2.4", default-features = false }
1818

1919
[package.metadata.docs.rs]

0 commit comments

Comments
 (0)