Update zerocopy to 0.8.6.

Resolves: #361. Update fuzzer lock file to resolve: time-rs/time#681
chipsalliance · Oct 16, 2024 · a0a334d · a0a334d
1 parent 7f172f1
commit a0a334d
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 38 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -13,7 +13,7 @@ members = [
 [workspace.dependencies]
 caliptra-cfi-lib-git = { git = "https://github.com/chipsalliance/caliptra-cfi.git", package = "caliptra-cfi-lib-git", rev = "a98e499d279e81ae85881991b1e9eee354151189", default-features = false, features = ["cfi", "cfi-counter" ] }
 caliptra-cfi-derive-git = { git = "https://github.com/chipsalliance/caliptra-cfi.git", package = "caliptra-cfi-derive-git", rev = "a98e499d279e81ae85881991b1e9eee354151189"}
-zerocopy = { version = "0.8.3", features = ["derive"] }
+zerocopy = { version = "0.8.6", features = ["derive"] }
 openssl = "0.10.64"
 
 [profile.firmware]

diff --git a/ci.sh b/ci.sh
@@ -87,9 +87,7 @@ run_verification_tests dpe_profile_p384_sha384 rustcrypto
   cargo fmt --check
   cargo clippy --features libfuzzer-sys
   cargo clippy --features afl
-  # https://github.com/google/zerocopy/issues/1867
-  # Currently this fuzzer fails to compile when using zerocopy v0.8.3.
-  # cargo +nightly-2023-11-16 fuzz build --features libfuzzer-sys
+  cargo +nightly-2023-11-16 fuzz build --features libfuzzer-sys
   cargo +nightly-2023-11-16 afl build --features afl
 )
 

diff --git a/dpe/fuzz/Cargo.lock b/dpe/fuzz/Cargo.lock
diff --git a/dpe/fuzz/Cargo.toml b/dpe/fuzz/Cargo.toml
@@ -14,6 +14,9 @@ libfuzzer-sys = { version = "0.4.6", optional = true }
 afl = { version = "0.13.3", optional = true }
 log = "0.4.19"
 simplelog = "0.12.1"
+# https://github.com/time-rs/time/issues/681
+# Once we move to a newer toolchain Cargo update should fix this.
+time = "=0.3.36"
 
 [dependencies.dpe]
 path = ".."