chipmunkmc/edl
1
0
Fork 0
mirror of https://github.com/bkerler/edl.git synced 2024-11-14 19:14:58 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Detection fixes

Browse source
This commit is contained in:
Bjoern Kerler 2020-09-23 17:18:53 +02:00
parent 86dfc6101f
commit c816aa528f
2 changed files with 47 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
Library/sahara.py
View file

@ -129,43 +129,46 @@ class qualcomm_sahara():
0x26:"Invalid IMG Hash Table Size"
}
def convertmsmid(self, msmid):
if int(msmid, 16) in sochw:
names = sochw[int(msmid, 16)].split(",")
for name in names:
for ids in msmids:
if msmids[ids] == name:
msmid = hex(ids)[2:].lower()
while (len(msmid) < 8):
msmid = '0' + msmid
return msmid
def init_loader_db(self):
self.loaderdb = {}
loaderdb = {}
for (dirpath, dirnames, filenames) in os.walk("Loaders"):
for filename in filenames:
fn = os.path.join(dirpath, filename)
found=False
for ext in [".bin",".mbn",".elf"]:
found = False
for ext in [".bin", ".mbn", ".elf"]:
if ext in filename[-4:]:
found=True
found = True
break
if found==False:
continue
if found == False:
continue
try:
hwid = filename.split("_")[0].lower()
msmid=hwid[:8]
devid=hwid[8:]
msmid = hwid[:8]
devid = hwid[8:]
pkhash = filename.split("_")[1].lower()
if int(msmid,16) in sochw:
names=sochw[int(msmid,16)].split(",")
for name in names:
for ids in msmids:
if msmids[ids]==name:
msmid=hex(ids)[2:].lower()
while (len(msmid)<8):
msmid='0'+msmid
if msmid not in self.loaderdb:
self.loaderdb[msmid + devid] = {}
if pkhash not in self.loaderdb[msmid + devid]:
self.loaderdb[msmid + devid][pkhash] = fn
msmid = self.convertmsmid(msmid)
mhwid = self.convertmsmid(msmid) + devid
if mhwid not in loaderdb:
loaderdb[mhwid] = {}
if pkhash not in loaderdb[mhwid]:
loaderdb[mhwid][pkhash] = fn
else:
if msmid not in self.loaderdb:
self.loaderdb[msmid+devid] = {}
if pkhash not in self.loaderdb[msmid+devid]:
self.loaderdb[msmid+devid][pkhash] = fn
loaderdb[mhwid][pkhash].append(fn)
except:
continue
return self.loaderdb
self.loaderdb=loaderdb
return loaderdb
def get_error_desc(self,status):
if status in self.ErrorDesc:

36
fhloaderparse.py
View file

@ -200,29 +200,31 @@ def init_loader_db():
devid=hwid[8:]
pkhash = filename.split("_")[1].lower()
msmid=convertmsmid(msmid)
if msmid not in loaderdb:
loaderdb[msmid + devid] = {}
if pkhash not in loaderdb[msmid + devid]:
loaderdb[msmid + devid][pkhash] = fn
mhwid=convertmsmid(msmid)+devid
if mhwid not in loaderdb:
loaderdb[mhwid] = {}
if pkhash not in loaderdb[mhwid]:
loaderdb[mhwid][pkhash] = fn
else:
if msmid not in loaderdb:
loaderdb[msmid+devid] = {}
if pkhash not in loaderdb[msmid+devid]:
loaderdb[msmid+devid][pkhash] = fn
loaderdb[mhwid][pkhash].append(fn)
except:
continue
return loaderdb
def is_duplicate(loaderdb, si):
for loader in loaderdb:
for hash in loaderdb[loader]:
lhash = si.pk_hash[:16]
if lhash == hash:
msmid = si.hw_id[:8]
devid = si.hw_id[8:]
rid = convertmsmid(msmid) + devid
if si.hw_id == loader or rid == loader:
return True
lhash = si.pk_hash[:16].lower()
msmid = si.hw_id[:8].lower()
devid = si.hw_id[8:].lower()
hwid=si.hw_id.lower()
rid = (convertmsmid(msmid) + devid).lower()
if hwid in loaderdb:
loader=loaderdb[hwid]
if lhash in loader:
return True
if rid in loaderdb:
loader = loaderdb[rid]
if lhash in loader:
return True
return False
def main(argv):