Merge pull request #1042 from onekey-sec/update_flake_lock_action

Update flake.lock
onekey-sec · Jan 6, 2025 · 6639679 · 6639679
2 parents d0a276e + c2fd63b
commit 6639679
Show file tree

Hide file tree

Showing 5 changed files with 84 additions and 84 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/overlay.nix b/overlay.nix
@@ -17,6 +17,18 @@ final: prev:
         --replace-fail \
         'aligned_offset = offset & ~(4096 - 1);' \
         'aligned_offset = offset & ~(sysconf(_SC_PAGESIZE) - 1);'
+      substituteInPlace backed_block.cpp \
+        --replace-fail \
+        'reinterpret_cast<backed_block_list*>(calloc(sizeof(struct backed_block_list), 1));' \
+        'reinterpret_cast<backed_block_list*>(calloc(1, sizeof(struct backed_block_list)));'
+      substituteInPlace sparse.cpp \
+        --replace-fail \
+        'struct sparse_file* s = reinterpret_cast<sparse_file*>(calloc(sizeof(struct sparse_file), 1));' \
+        'struct sparse_file* s = reinterpret_cast<sparse_file*>(calloc(1, sizeof(struct sparse_file)));'
+      substituteInPlace simg2simg.cpp \
+        --replace-fail \
+        'out_s = (struct sparse_file**)calloc(sizeof(struct sparse_file*), files);' \
+        'out_s = (struct sparse_file**)calloc(files, sizeof(struct sparse_file*));'
     '';
   });
 

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -23,8 +23,8 @@ python-magic = "^0.4.27"
 pyperscan = "^0.3.0"
 lark = "^1.1.8"
 lz4 = "^4.3.2"
-lief = "^0.15.1"
-cryptography = ">=41.0,<44.0"
+lief = "^0.16.1"
+cryptography = ">=41.0"
 treelib = "^1.7.0"
 unblob-native = "^0.1.5"
 jefferson = "^0.4.5"

diff --git a/unblob/handlers/executable/elf.py b/unblob/handlers/executable/elf.py
@@ -143,7 +143,7 @@ def is_valid_header(self, header) -> bool:
             lief.ELF.Header.FILE_TYPE(header.e_type)
             lief.ELF.ARCH(header.e_machine)
             lief.ELF.Header.VERSION(header.e_version)
-        except RuntimeError:
+        except ValueError:
             return False
         return True
 
@@ -170,7 +170,7 @@ def get_last_section_end(
                     == lief.ELF.Section.TYPE.NOBITS
                 ):
                     continue
-            except RuntimeError:
+            except ValueError:
                 continue
 
             section_end = section_header.sh_offset + section_header.sh_size