commit 00a48471fb9abdc863ae63195eddbc04f3e378ec
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Oct 16 14:24:40 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Oct 16 14:24:40 2023 +0000
tree 52ef038935832071cdc6189b62f1deebab225e9d
parent cbe9fff2348b9b1eeb9f9c1a7f0ee404a0beff04
parent 59b785f2a694c2f86c85ded5ae1638a184be4517

Merge "Use libhex" into main am: e88e69dabc am: 60e8f52d2e am: 502ad1e8e4 am: 59b785f2a6

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/2786546

Change-Id: Ib03cc39cd2612e14c68d8dfa8944b3307d9802a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

compos/Android.bp

diff --git a/compos/Android.bp b/compos/Android.bp
index 19123dd..b840506 100644
--- a/compos/Android.bp
+++ b/compos/Android.bp
@@ -14,6 +14,7 @@
         "libanyhow",
         "libbinder_rs",
         "libcompos_common",
+        "libhex",
         "liblibc",
         "liblog_rust",
         "libminijail_rust",

compos/src/artifact_signer.rs

diff --git a/compos/src/artifact_signer.rs b/compos/src/artifact_signer.rs
index 76da00a..bfd886e 100644
--- a/compos/src/artifact_signer.rs
+++ b/compos/src/artifact_signer.rs
@@ -53,7 +53,7 @@
 
         let file = File::open(path).with_context(|| format!("Opening {}", path.display()))?;
         let digest = fsverity::measure(file.as_fd())?;
-        let digest = to_hex_string(&digest);
+        let digest = hex::encode(digest);
 
         self.file_digests.push((target_path.to_owned(), digest));
         Ok(())
@@ -82,7 +82,3 @@
         Ok(())
     }
 }
-
-fn to_hex_string(buf: &[u8]) -> String {
-    buf.iter().map(|b| format!("{:02x}", b)).collect()
-}