From 1ff5c7e1b63623363008fd45610874b64cb4c297 Mon Sep 17 00:00:00 2001
From: Hannes Mehnert <hannes@mehnert.org>
Date: Fri, 28 Oct 2022 13:57:30 +0200
Subject: [PATCH] if --verify is passed, don't use the md5s/sha512s from disk,
 instead re-create them

---
 mirage/unikernel.ml | 32 ++++++--------------------------
 1 file changed, 6 insertions(+), 26 deletions(-)

diff --git a/mirage/unikernel.ml b/mirage/unikernel.ml
index f9cc4f8..59420e2 100644
--- a/mirage/unikernel.ml
+++ b/mirage/unikernel.ml
@@ -283,12 +283,16 @@ module Make
         let t = empty dev dev_md5s dev_sha512s in
         Cache.read t.dev_md5s >>= fun r ->
         (match r with
-         | Ok Some s -> Result.iter (fun md5s -> t.md5s <- md5s) (unmarshal_sm s)
+         | Ok Some s ->
+           if not verify then
+             Result.iter (fun md5s -> t.md5s <- md5s) (unmarshal_sm s)
          | Ok None -> Logs.debug (fun m -> m "No md5s cached")
          | Error e -> Logs.warn (fun m -> m "Error reading md5s cache: %a" Cache.pp_error e));
         Cache.read t.dev_sha512s >>= fun r ->
         (match r with
-         | Ok Some s -> Result.iter (fun sha512s -> t.sha512s <- sha512s) (unmarshal_sm s)
+         | Ok Some s ->
+           if not verify then
+             Result.iter (fun sha512s -> t.sha512s <- sha512s) (unmarshal_sm s)
          | Ok None -> Logs.debug (fun m -> m "No sha512s cached")
          | Error e -> Logs.warn (fun m -> m "Error reading sha512s cache: %a" Cache.pp_error e));
         let md5s = SSet.of_list (List.map snd (SM.bindings t.md5s))
@@ -321,18 +325,6 @@ module Make
                     t.md5s <- SM.add (to_hex digest) name t.md5s
                   in
                   Some f
-                else if verify then
-                  let f s =
-                    let digest = MD5.get s |> to_hex in
-                    match SM.find_opt digest t.md5s with
-                    | Some x when String.equal name x -> ()
-                    | y ->
-                      Logs.err (fun m -> m "corrupt MD5 data for %s, \
-                                            expected %a, computed %s"
-                                   name Fmt.(option ~none:(any "NONE") string) y
-                                   digest)
-                  in
-                  Some f
                 else
                   None
               and sha512_final =
@@ -342,18 +334,6 @@ module Make
                     t.sha512s <- SM.add (to_hex digest) name t.sha512s
                   in
                   Some f
-                else if verify then
-                  let f s =
-                    let digest = SHA512.get s |> to_hex in
-                    match SM.find_opt digest t.sha512s with
-                    | Some x when String.equal name x -> ()
-                    | y ->
-                      Logs.err (fun m -> m "corrupt SHA512 data for %s, \
-                                            expected %a, computed %s"
-                                   name Fmt.(option ~none:(any "NONE") string) y
-                                   digest)
-                  in
-                  Some f
                 else
                   None
               in