Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
binwalk
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fact-gitdep
binwalk
Commits
cb5c5751
Commit
cb5c5751
authored
Sep 05, 2017
by
Craig Heffner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated deps.sh to install a known-working ubi_reader commit version.
parent
8cc9352c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
2 deletions
+9
-2
deps.sh
deps.sh
+4
-1
extractor.py
src/binwalk/modules/extractor.py
+5
-1
No files found.
deps.sh
View file @
cb5c5751
...
...
@@ -91,7 +91,10 @@ function install_unstuff
function
install_ubireader
{
git clone https://github.com/jrspruitt/ubi_reader
(
cd
ubi_reader
&&
$SUDO
python setup.py install
)
# Some UBIFS extraction breaks after this commit, due to "Added fatal error check if UBI block extends beyond file size"
# (see this commit: https://github.com/jrspruitt/ubi_reader/commit/af678a5234dc891e8721ec985b1a6e74c77620b6)
# Reset to a known working commit.
(
cd
ubi_reader
&&
git reset
--hard
0955e6b95f07d849a182125919a1f2b6790d5b51
&&
$SUDO
python setup.py install
)
$SUDO
rm
-rf
ubi_reader
}
...
...
src/binwalk/modules/extractor.py
View file @
cb5c5751
...
...
@@ -564,6 +564,7 @@ class Extractor(Module):
Returns the name of the extracted file (blank string if nothing was extracted).
'''
fname
=
''
rule
=
None
recurse
=
False
original_dir
=
os
.
getcwd
()
rules
=
self
.
match
(
description
)
...
...
@@ -650,7 +651,10 @@ class Extractor(Module):
os
.
chdir
(
original_dir
)
return
(
output_directory
,
fname
,
recurse
,
str
(
rule
[
'cmd'
]))
if
rule
is
not
None
:
return
(
output_directory
,
fname
,
recurse
,
str
(
rule
[
'cmd'
]))
else
:
return
(
output_directory
,
fname
,
recurse
,
''
)
def
_entry_offset
(
self
,
index
,
entries
,
description
):
'''
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment