commit 8ed29ce59dfe6712a493faa86ab41c8fce6bb79e
author Alice Wang <aliceywang@google.com> Fri Dec 01 08:33:12 2023 +0000
committer Alice Wang <aliceywang@google.com> Thu Dec 07 14:35:55 2023 +0000
tree e54d43fe6efa567e0508d1a3ae18d79ecbc5c976
parent 46211912331c2f31500663e1207770e9270582cd

[dm][refactoring] Use hex crate to encode/decode hex string

Bug: 239413416
Test: atest MicrodroidTests
Change-Id: I259cc08fc264b41df3228d01f7b89ad55c530259

apkdmverity/Android.bp

diff --git a/apkdmverity/Android.bp b/apkdmverity/Android.bp
index c4c90cd..0cb8ca1 100644
--- a/apkdmverity/Android.bp
+++ b/apkdmverity/Android.bp
@@ -15,6 +15,7 @@
         "libbitflags",
         "libclap",
         "libdm_rust",
+        "libhex",
         "libitertools",
         "liblibc",
         "libnix",

apkdmverity/src/main.rs

diff --git a/apkdmverity/src/main.rs b/apkdmverity/src/main.rs
index 2901304..0ecb0ea 100644
--- a/apkdmverity/src/main.rs
+++ b/apkdmverity/src/main.rs
@@ -46,7 +46,7 @@
 
     for (apk, idsig, name, roothash) in apks.tuples() {
         let roothash = if roothash != "none" {
-            Some(util::parse_hexstring(roothash).expect("failed to parse roothash"))
+            Some(hex::decode(roothash).expect("failed to parse roothash"))
         } else {
             None
         };