Skip to content

Commit 66e302b

Browse files
committed
temp: use forked ed25519-dalek, bump rand
This commit cannot be included in a release, because it makes the codebase rely on an unreleased crate.
1 parent 9010159 commit 66e302b

File tree

13 files changed

+84
-196
lines changed

13 files changed

+84
-196
lines changed

Cargo.lock

+35-87
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ members = [
2525

2626
# Patch dependencies on tink crates so that they refer to the versions within this same repository.
2727
[patch.crates-io]
28+
# TODO(#7): remove if/when https://github.com/dalek-cryptography/ed25519-dalek/pull/160 is merged.
29+
ed25519-dalek = { git = "https://github.com/daviddrysdale/ed25519-dalek", branch = "rand-bump" }
2830
rinkey = { path = "rinkey" }
2931
tink-aead = { path = "aead" }
3032
tink-awskms = { path = "integration/awskms" }

aead/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ aes-gcm-siv = "^0.10"
1717
chacha20poly1305 = "^0.8"
1818
generic-array = "^0.14.4"
1919
prost = { version = "^0.8", default-features = false }
20-
rand = { version = "^0.7", default-features = false, features = ["alloc", "getrandom"] }
20+
rand = { version = "^0.8", default-features = false, features = ["alloc", "getrandom"] }
2121
spin = { version = "^0.9.2", features = ["once"] }
2222
tink-core = "^0.3"
2323
tink-mac = "^0.3"

core/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ digest = "^0.9"
2626
hkdf = "^0.11"
2727
lazy_static = { version = "^1.4", features = ["spin_no_std"] }
2828
prost = { version = "^0.8", default-features = false }
29-
rand = { version = "^0.7", default-features = false, features = ["alloc", "getrandom"] }
29+
rand = { version = "^0.8", default-features = false, features = ["alloc", "getrandom"] }
3030
serde = { version = "^1.0.126", features = ["derive"], optional = true }
3131
serde_json = { version = "^1.0.64", optional = true }
3232
sha-1 = { version = "^0.9.7", default-features = false }

deny.toml

+3-15
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ targets = [
99
{ triple = "x86_64-pc-windows-msvc" },
1010
]
1111

12+
[sources]
13+
allow-git = [ "https://github.com/daviddrysdale/ed25519-dalek" ]
14+
1215
# Deny all advisories unless explicitly ignored.
1316
[advisories]
1417
vulnerability = "deny"
@@ -50,21 +53,6 @@ version = "=0.4.4"
5053
name = "security-framework-sys"
5154
version = "=0.4.3"
5255

53-
# ed25519-dalek(v1.0.1) => rand_core(v0.5.x), {rand(v0.7.3) => getrandom(v0.1.*)}
54-
# tonic(v0.4.0) ..=> rand(v0.8.3) ..=> {rand_core(v0.6.x), getrandom(v0.2.x)}
55-
[[bans.skip]]
56-
name = "getrandom"
57-
version = "0.1.15"
58-
[[bans.skip]]
59-
name = "rand"
60-
version = "0.7.3"
61-
[[bans.skip]]
62-
name = "rand_core"
63-
version = "0.5.1"
64-
[[bans.skip]]
65-
name = "rand_chacha"
66-
version = "0.2.2"
67-
6856
# hyper-rustls(v0.22.1) => rustls => ring(v0.16.20) => spin(v0.5.2)
6957
[[bans.skip]]
7058
name = "spin"

0 commit comments

Comments
 (0)