From cfb692d4ec7dc27350e52f0654aed822bec5e5c3 Mon Sep 17 00:00:00 2001 From: Sree Revoori <105384008+sree-revoori1@users.noreply.github.com> Date: Wed, 20 Mar 2024 15:15:41 -0700 Subject: [PATCH] Revert "Update CFI to latest revision" This reverts commit 0741181d1cbe8d8ce54836f41e248e13e4f35e8f. --- Cargo.lock | 4 ++-- Cargo.toml | 4 ++-- dpe/fuzz/Cargo.lock | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c8e227cb..4278158a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -176,7 +176,7 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "caliptra-cfi-derive" version = "0.1.0" -source = "git+https://github.com/chipsalliance/caliptra-cfi.git?rev=96f7ebc48ee02aa3e0f858463f4c2a7e13eee504#96f7ebc48ee02aa3e0f858463f4c2a7e13eee504" +source = "git+https://github.com/chipsalliance/caliptra-cfi.git?rev=25473cebb25f638646091c54b5e337b9a2697f07#25473cebb25f638646091c54b5e337b9a2697f07" dependencies = [ "paste", "proc-macro2", @@ -187,7 +187,7 @@ dependencies = [ [[package]] name = "caliptra-cfi-lib" version = "0.1.0" -source = "git+https://github.com/chipsalliance/caliptra-cfi.git?rev=96f7ebc48ee02aa3e0f858463f4c2a7e13eee504#96f7ebc48ee02aa3e0f858463f4c2a7e13eee504" +source = "git+https://github.com/chipsalliance/caliptra-cfi.git?rev=25473cebb25f638646091c54b5e337b9a2697f07#25473cebb25f638646091c54b5e337b9a2697f07" [[package]] name = "cc" diff --git a/Cargo.toml b/Cargo.toml index 037a76bb..e177a102 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,7 +11,7 @@ members = [ ] [workspace.dependencies] -caliptra-cfi-lib = { git = "https://github.com/chipsalliance/caliptra-cfi.git", package = "caliptra-cfi-lib", rev = "96f7ebc48ee02aa3e0f858463f4c2a7e13eee504", default-features = false, features = ["cfi", "cfi-counter" ] } -caliptra-cfi-derive = { git = "https://github.com/chipsalliance/caliptra-cfi.git", package = "caliptra-cfi-derive", rev = "96f7ebc48ee02aa3e0f858463f4c2a7e13eee504"} +caliptra-cfi-lib = { git = "https://github.com/chipsalliance/caliptra-cfi.git", package = "caliptra-cfi-lib", rev = "25473cebb25f638646091c54b5e337b9a2697f07", default-features = false, features = ["cfi", "cfi-counter" ] } +caliptra-cfi-derive = { git = "https://github.com/chipsalliance/caliptra-cfi.git", package = "caliptra-cfi-derive", rev = "25473cebb25f638646091c54b5e337b9a2697f07"} zerocopy = "0.6.6" openssl = "0.10.64" diff --git a/dpe/fuzz/Cargo.lock b/dpe/fuzz/Cargo.lock index a1cb612b..c4d8f453 100644 --- a/dpe/fuzz/Cargo.lock +++ b/dpe/fuzz/Cargo.lock @@ -116,7 +116,7 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "caliptra-cfi-derive" version = "0.1.0" -source = "git+https://github.com/chipsalliance/caliptra-cfi.git?rev=96f7ebc48ee02aa3e0f858463f4c2a7e13eee504#96f7ebc48ee02aa3e0f858463f4c2a7e13eee504" +source = "git+https://github.com/chipsalliance/caliptra-cfi.git?rev=25473cebb25f638646091c54b5e337b9a2697f07#25473cebb25f638646091c54b5e337b9a2697f07" dependencies = [ "paste", "proc-macro2", @@ -127,7 +127,7 @@ dependencies = [ [[package]] name = "caliptra-cfi-lib" version = "0.1.0" -source = "git+https://github.com/chipsalliance/caliptra-cfi.git?rev=96f7ebc48ee02aa3e0f858463f4c2a7e13eee504#96f7ebc48ee02aa3e0f858463f4c2a7e13eee504" +source = "git+https://github.com/chipsalliance/caliptra-cfi.git?rev=25473cebb25f638646091c54b5e337b9a2697f07#25473cebb25f638646091c54b5e337b9a2697f07" [[package]] name = "cc"