diff --git a/fact_extractor/install/unpacker.py b/fact_extractor/install/unpacker.py index 4720411f..b4d91cff 100644 --- a/fact_extractor/install/unpacker.py +++ b/fact_extractor/install/unpacker.py @@ -70,7 +70,7 @@ 'openjdk-14-jdk' ] }, - # Packages common to all plateforms + # Packages common to all platforms 'common': { 'apt': [ 'libjpeg-dev', @@ -145,19 +145,20 @@ 'git+https://github.com/fkie-cad/fact_helper_file.git', 'patool', 'archmage', + # jefferson + deps + 'git+https://github.com/sviehb/jefferson.git', + 'cstruct==2.1', + 'python-lzo', # binwalk 'git+https://github.com/ReFirmLabs/binwalk@v2.3.2', 'pyqtgraph', 'capstone', - 'cstruct==1.8', - 'python-lzo', 'numpy', 'scipy', 'git+https://github.com/jrspruitt/ubi_reader@v0.6.3-master' # pinned as broken currently ], 'github': [ ('kartone/sasquatch', ['./build.sh']), - ('svidovich/jefferson-3', ['sudo python3 setup.py install']), ('rampageX/firmware-mod-kit', ['(cd src && make)', 'cp src/yaffs2utils/unyaffs2 src/untrx src/tpl-tool/src/tpl-tool ../../bin/']) ] } @@ -175,7 +176,7 @@ def install_dependencies(dependencies): def main(distribution): - # removes due to compatibilty reasons + # removes due to compatibility reasons try: apt_remove_packages('python-lzma') pip2_remove_packages('pyliblzma') diff --git a/fact_extractor/plugins/unpacking/jffs2/test/test_plugin_jffs2.py b/fact_extractor/plugins/unpacking/jffs2/test/test_plugin_jffs2.py index 6ac3939c..cb8c7985 100644 --- a/fact_extractor/plugins/unpacking/jffs2/test/test_plugin_jffs2.py +++ b/fact_extractor/plugins/unpacking/jffs2/test/test_plugin_jffs2.py @@ -12,7 +12,7 @@ def test_unpacker_selection_generic(self): self.check_unpacker_selection('filesystem/jffs2-big', 'JFFS2') def test_extraction_little(self): - self.check_unpacking_of_standard_unpack_set(TEST_DATA_DIR / 'jffs2_be.img', additional_prefix_folder='jffs-root/fs_1') + self.check_unpacking_of_standard_unpack_set(TEST_DATA_DIR / 'jffs2_be.img', additional_prefix_folder='jffs-root') def test_extraction_big(self): - self.check_unpacking_of_standard_unpack_set(TEST_DATA_DIR / 'jffs2_le.img', additional_prefix_folder='jffs-root/fs_1') + self.check_unpacking_of_standard_unpack_set(TEST_DATA_DIR / 'jffs2_le.img', additional_prefix_folder='jffs-root')