Merge branch 'BinaryAnalysisPlatform:master' into msp430-bap-lifter

BinaryAnalysisPlatform · Jul 31, 2024 · 4468d21 · 4468d21
2 parents 8853bfe + bff05c4
commit 4468d21
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/bap-byteweight.opam b/bap-byteweight.opam
@@ -12,7 +12,7 @@ depends: [
   "dune" {>= "3.1"}
   "bap-signatures" {= version}
   "bap-std" {= version}
-  "camlzip" {>= "1.0" & < "2.0"}
+  "camlzip" {>= "1.12" & < "2.0"}
   "core_kernel" {>= "v0.14" & < "v0.16"}
   "bap-common" {= version}
   "ppx_bap" {= version}

diff --git a/dune-project b/dune-project
@@ -283,7 +283,7 @@
  (depends
   (bap-signatures (= :version))
   (bap-std (= :version))
-  (camlzip (and (>= 1.0) (< 2.0)))
+  (camlzip (and (>= 1.12) (< 2.0)))
   (core_kernel (and (>= v0.14) (< v0.16)))
   (bap-common (= :version))
   (ppx_bap (= :version))

diff --git a/lib/bap_byteweight/bap_byteweight_signatures.ml b/lib/bap_byteweight/bap_byteweight_signatures.ml
@@ -109,9 +109,8 @@ let update_or_fail ?compiler target data payload path =
   let path = make_entry ?compiler target data in
   let data = Bytes.unsafe_to_string (data.save payload) in
   Zip.add_entry data zip path;
-  List.iter entries ~f:(fun ({Zip.filename; extra; comment; mtime},data) ->
-      Zip.add_entry data zip filename
-        ~extra ~comment ~mtime)
+  List.iter entries ~f:(fun ({Zip.filename; comment; mtime},data) ->
+      Zip.add_entry data zip filename ~comment ~mtime)
 
 let copy input output =
   let len = 0x1000 in