Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update zerocopy to 0.8.6. #362

Merged
merged 1 commit into from
Oct 16, 2024
+51 −38
Merged

Update zerocopy to 0.8.6. #362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Cargo.lock
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
4 changes: 1 addition & 3 deletions ci.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand Down
72 changes: 42 additions & 30 deletions dpe/fuzz/Cargo.lock
View file
Open in desktop

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

3 changes: 3 additions & 0 deletions dpe/fuzz/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ".."
Expand Down
Loading