66Copyright (C) 2014-2018 Plato Mavropoulos
77"""
88
9- title = 'ME Analyzer v1.46.1 '
9+ title = 'ME Analyzer v1.48.0 '
1010
1111import os
1212import re
@@ -3059,8 +3059,8 @@ def cse_unpack(fpt_part_all, bpdt_part_all, fw_type, file_end, fpt_start, fpt_ch
30593059
30603060 print (col_y + '\n --> Stored $FPT %s Partition "%s" [0x%0.6X - 0x%0.6X]' % (part_type , part_name , part_start , part_end ) + col_e )
30613061
3062- if part [0 ] in [b'UTOK' ,b'STKN' , b'OEMP' ] :
3063- ext_print ,x1 = key_anl (mod_fname , [], part_name , [variant , major , minor , hotfix , build ]) # Retrieve & Store UTOK/STKN/OEMP Extension Info
3062+ if part [0 ] in [b'UTOK' ,b'STKN' ] :
3063+ ext_print ,x1 = key_anl (mod_fname , [], part_name , [variant , major , minor , hotfix , build ]) # Retrieve & Store UTOK/STKN Extension Info
30643064
30653065 # Print Manifest/Metadata/Key Extension Info
30663066 for index in range (0 , len (ext_print ), 2 ) : # Only Name (index), skip Info (index + 1)
@@ -3120,8 +3120,8 @@ def cse_unpack(fpt_part_all, bpdt_part_all, fw_type, file_end, fpt_start, fpt_ch
31203120
31213121 print (col_y + '\n --> Stored BPDT %s Partition "%s" [0x%0.6X - 0x%0.6X]' % (part_order , part_name , part_start , part_end ) + col_e )
31223122
3123- if part [0 ] in ['UTOK' , 'OEMP' ] :
3124- ext_print ,x1 = key_anl (mod_fname , [], part_name , [variant , major , minor , hotfix , build ]) # Retrieve & Store UTOK/OEMP Extension Info
3123+ if part [0 ] in ['UTOK' ] :
3124+ ext_print ,x1 = key_anl (mod_fname , [], part_name , [variant , major , minor , hotfix , build ]) # Retrieve & Store UTOK Extension Info
31253125
31263126 # Print Manifest/Metadata/Key Extension Info
31273127 for index in range (0 , len (ext_print ), 2 ) : # Only Name (index), skip Info (index + 1)
@@ -3305,7 +3305,7 @@ def ext_anl(input_type, input_offset, file_end, var_ver) :
33053305 hdr_rev_tag = '' # CSE Extension Header Revision Tag
33063306 mod_rev_tag = '' # CSE Extension Module Revision Tag
33073307
3308- if ((variant ,major ) == ('CSME' ,12 ) and ( minor ,hotfix , build ) not in [ (0 ,0 , 7070 ),( 0 , 0 , 7075 )] ) or dnx_version == 2 :
3308+ if ((variant ,major ) == ('CSME' ,12 ) and not (( minor ,hotfix ) == (0 ,0 ) and build >= 7000 ) ) or dnx_version == 2 :
33093309 if ext_tag in ext_tag_rev_hdr : hdr_rev_tag = '_R2'
33103310 if ext_tag in ext_tag_rev_mod : mod_rev_tag = '_R2'
33113311 else :
@@ -4225,7 +4225,7 @@ def key_anl(mod_fname, ext_print, mod_name, var_ver) :
42254225 hdr_rev_tag = '' # CSE Extension Header Revision Tag
42264226 mod_rev_tag = '' # CSE Extension Module Revision Tag
42274227
4228- if (variant ,major ) == ('CSME' ,12 ) and ( minor ,hotfix , build ) not in [ (0 ,0 , 7070 ),( 0 , 0 , 7075 )] :
4228+ if (variant ,major ) == ('CSME' ,12 ) and not (( minor ,hotfix ) == (0 ,0 ) and build >= 7000 ) :
42294229 if ext_tag in ext_tag_rev_hdr : hdr_rev_tag = '_R2'
42304230 if ext_tag in ext_tag_rev_mod : mod_rev_tag = '_R2'
42314231 else :
@@ -4610,6 +4610,7 @@ def uefi_find(file_in, uf_path) :
46104610\n \
46114611\n \
46124612\n \
4613+ \n \
46134614format (file_in ).replace (' ' , '' )
46144615
46154616 try :
@@ -4693,15 +4694,16 @@ def fovd_clean(fovdtype) :
46934694def fw_types (fw_type ) :
46944695 type_db = 'NaN'
46954696
4696- if variant in ['SPS' ,'CSSPS' ] and (fw_type == "Region" or fw_type == "Region, Stock" or fw_type == "Region, Extracted" ) : # SPS --> Region (EXTR at DB)
4697- fw_type = "Region"
4698- type_db = "EXTR"
4699- elif fw_type == "Region, Extracted" : type_db = "EXTR"
4700- elif fw_type == "Region, Stock" or fw_type == "Region" : type_db = "RGN"
4701- elif fw_type == "Update" : type_db = "UPD"
4702- elif fw_type == "Operational" : type_db = "OPR"
4703- elif fw_type == "Recovery" : type_db = "REC"
4704- elif fw_type == "Unknown" : type_db = "UNK"
4697+ if variant in ['SPS' ,'CSSPS' ] and fw_type in ['Region' ,'Region, Stock' ,'Region, Extracted' ] : # SPS --> Region (EXTR at DB)
4698+ fw_type = 'Region'
4699+ type_db = 'EXTR'
4700+ elif fw_type == 'Region, Extracted' : type_db = 'EXTR'
4701+ elif fw_type == 'Region, FWUpdate' : type_db = 'FWU'
4702+ elif fw_type == 'Region, Stock' or fw_type == 'Region' : type_db = 'RGN'
4703+ elif fw_type == 'Update' : type_db = 'UPD'
4704+ elif fw_type == 'Operational' : type_db = 'OPR'
4705+ elif fw_type == 'Recovery' : type_db = 'REC'
4706+ elif fw_type == 'Unknown' : type_db = 'UNK'
47054707
47064708 return fw_type , type_db
47074709
@@ -5103,6 +5105,7 @@ def mass_scan(f_path) :
51035105 me11_sku_anl = False
51045106 me11_ker_msg = False
51055107 can_search_db = True
5108+ fpt_chk_null = False
51065109 fpt_chk_fail = False
51075110 fpt_num_fail = False
51085111 cse_lt_exist = False
@@ -5473,7 +5476,7 @@ def mass_scan(f_path) :
54735476 else :
54745477 p_empty = 'No'
54755478
5476- if p_empty == 'No' :
5479+ if p_empty == 'No' and p_offset_spi < file_end :
54775480 # Get CSE Partition Instance ID
54785481 cse_in_id ,x1 ,x2 = cse_part_inid (reading , p_offset_spi , ext_dict )
54795482 cse_in_id_str = '%0.4X' % cse_in_id
@@ -5517,11 +5520,11 @@ def mass_scan(f_path) :
55175520 fpt_romb_found = True
55185521 if p_offset_spi != 0 and p_size != 0 : fpt_romb_used = True
55195522
5520- # CSME12+ FWUpdate tool requires PMC firmware (PMCP, EXTR not RGN )
5523+ # CSME12+ FWUpdate tool requires PMC firmware (PMCP)
55215524 if p_name == 'PMCP' and p_empty == 'No' : fwu_pmcp_found = True
55225525
5523- # Detect if CSE firmware has OEM/ODM Unlock Token (UTOK/STKN/OEMP )
5524- if p_name in ('UTOK' ,'STKN' , 'OEMP' ) and reading [p_offset_spi :p_offset_spi + 0x10 ] != b'\xFF ' * 0x10 : utok_found = True
5526+ # Detect if CSE firmware has OEM/ODM Unlock Token (UTOK/STKN)
5527+ if p_name in ('UTOK' ,'STKN' ) and p_offset_spi < file_end and reading [p_offset_spi :p_offset_spi + 0x10 ] != b'\xFF ' * 0x10 : utok_found = True
55255528
55265529 if 0 < p_offset_spi < p_max_size and 0 < p_size < p_max_size : eng_fw_end = p_offset_spi + p_size
55275530 else : eng_fw_end = p_max_size
@@ -5609,7 +5612,7 @@ def mass_scan(f_path) :
56095612 if p_type in bpdt_dict : p_name = bpdt_dict [p_type ]
56105613 else : p_name = 'Unknown'
56115614
5612- if p_empty == 'No' :
5615+ if p_empty == 'No' and p_offset_spi < file_end :
56135616 # Get CSE Partition Instance ID
56145617 cse_in_id ,x1 ,x2 = cse_part_inid (reading , p_offset_spi , ext_dict )
56155618
@@ -5626,7 +5629,7 @@ def mass_scan(f_path) :
56265629
56275630 pt_dbpdt .add_row ([p_name ,'%0.2d' % p_type ,'Primary' ,p_offset_print ,p_size_print ,p_end_print ,'%0.4X' % cse_in_id ,p_empty ])
56285631
5629- if p_type == 5 and p_empty == 'No' : # Secondary BPDT (S-BPDT)
5632+ if p_type == 5 and p_empty == 'No' and p_offset_spi < file_end : # Secondary BPDT (S-BPDT)
56305633 init_s_bpdt_ver = int .from_bytes (reading [start_fw_start_match + 0x6 :start_fw_start_match + 0x8 ], 'little' ) # BPDT Version
56315634 if init_s_bpdt_ver == 2 : s_bpdt_hdr = get_struct (reading , p_offset_spi , BPDT_Header_2 )
56325635 else : s_bpdt_hdr = get_struct (reading , p_offset_spi , BPDT_Header )
@@ -5683,7 +5686,7 @@ def mass_scan(f_path) :
56835686 bpdt_part_all .append ([p_name , p_offset_spi , p_offset_spi + p_size , p_type , p_empty , 'Primary' , cse_in_id ])
56845687
56855688 # Adjust Manifest Header to Recovery section based on BPDT
5686- if p_type == 2 and p_empty == 'No' : # CSE_BUP
5689+ if p_type == 2 and p_empty == 'No' and p_offset_spi < file_end : # CSE_BUP
56875690 # Only if partition exists at file (counter-example: sole IFWI etc)
56885691 # noinspection PyTypeChecker
56895692 if p_offset_spi + p_size <= file_end :
@@ -5699,9 +5702,9 @@ def mass_scan(f_path) :
56995702 # Show BPDT Partition info on demand (-dfpt)
57005703 if param .fpt_disp : print ('%s\n ' % pt_dbpdt )
57015704
5702- # Detect if CSE firmware has OEM/ODM Unlock Token (UTOK/STKN/OEMP )
5705+ # Detect if CSE firmware has OEM/ODM Unlock Token (UTOK/STKN)
57035706 for part in bpdt_part_all :
5704- if part [0 ] in ('UTOK' ,'STKN' , 'OEMP' ) and reading [part [1 ]:part [1 ] + 0x10 ] != b'\xFF ' * 0x10 : utok_found = True
5707+ if part [0 ] in ('UTOK' ,'STKN' ) and reading [part [1 ]:part [1 ] + 0x10 ] != b'\xFF ' * 0x10 : utok_found = True
57055708
57065709 # Detect BPDT partition overlaps
57075710 for part in bpdt_part_all :
@@ -5757,8 +5760,10 @@ def mass_scan(f_path) :
57575760 fpt_chk_calc = '0x%0.2X' % ((0x100 - chk_sum & 0xFF ) & 0xFF )
57585761 if fpt_chk_calc != fpt_chk_file : fpt_chk_fail = True
57595762
5760- # CSME12+, CSTXE3+, CSSPS5+ EXTR checksum from FIT is a placeholder (0x00), ignore
5761- if fpt_chk_fail and fpt_chk_file == '0x00' and variant in ['CSME' ,'CSTXE' ,'CSSPS' ] : fpt_chk_fail = False
5763+ # CSME12+ & CSTXE EXTR checksum from FIT is a placeholder (0x00), ignore
5764+ if ((variant == 'CSME' and major >= 12 ) or variant == 'CSTXE' ) and fpt_chk_file == '0x00' :
5765+ fpt_chk_null = True
5766+ fpt_chk_fail = False
57625767
57635768 # Check SPS3 $FPT Checksum validity (from Lordkag's UEFIStrip)
57645769 if variant == 'SPS' and major == 3 :
@@ -6013,7 +6018,7 @@ def mass_scan(f_path) :
60136018 elif rgn_exist : # SPS 1-3 have their own firmware Types
60146019 if variant == 'SPS' : fw_type = 'Region' # SPS is built manually so EXTR
60156020 elif variant == 'ME' and (2 <= major <= 7 ) :
6016- # Check 1, FOVD section
6021+ # Check 1, FOVD partition
60176022 if (major > 2 and not fovd_clean ('new' )) or (major == 2 and not fovd_clean ('old' )) : fw_type = 'Region, Extracted'
60186023 else :
60196024 # Check 2, EFFS/NVKR strings
@@ -6023,12 +6028,16 @@ def mass_scan(f_path) :
60236028 else : fw_type = 'Region, Extracted'
60246029 elif major in [2 ,3 ] : fw_type_fix = True # ME2-Only Fix 1, ME3-Only Fix 1
60256030 else : fw_type = 'Region, Stock'
6026- elif (variant in [ 'ME' , 'CSME' ] and 8 <= major <= 12 ) or variant == 'TXE' or ( variant == ' CSSPS' and major == 4 ) :
6031+ elif (variant == 'ME' and major >= 8 ) or variant in [ 'CSME' , 'CSTXE' , ' CSSPS', 'TXE' ] :
60276032 # Check 1, FITC Version
6028- if fpt_hdr .FitBuild == 0 or fpt_hdr . FitBuild == 65535 : # 0000/FFFF --> clean ME/ TXE
6033+ if fpt_hdr .FitBuild in [ 0 , 65535 ] : # 0000/FFFF --> clean CS(ME)/CS( TXE)
60296034 fw_type = 'Region, Stock'
6030- # Check 2, FOVD section
6035+
6036+ # Check 2, FOVD partition
60316037 if not fovd_clean ('new' ) : fw_type = 'Region, Extracted'
6038+
6039+ # Check 3, CSTXE FIT temporarily/placeholder $FPT Header and Checksum
6040+ if reading [fpt_start :fpt_start + 0x10 ] + reading [fpt_start + 0x1C :fpt_start + 0x30 ] == b'\xFF ' * 0x24 : fw_type = 'Region, Extracted'
60326041 else :
60336042 # Get FIT/FITC version used to build the image
60346043 fitc_ver_found = True
@@ -6037,11 +6046,9 @@ def mass_scan(f_path) :
60376046 fitc_minor = fpt_hdr .FitMinor
60386047 fitc_hotfix = fpt_hdr .FitHotfix
60396048 fitc_build = fpt_hdr .FitBuild
6040- elif variant == 'CSME' or variant == 'CSTXE' or variant == 'CSSPS' :
6041- # Extracted are created by FIT temporarily, placeholder $FPT header and checksum
6042- if reading [fpt_start :fpt_start + 0x10 ] + reading [fpt_start + 0x1C :fpt_start + 0x30 ] + \
6043- reading [fpt_start + 0x1B :fpt_start + 0x1C ] == b'\xFF ' * 0x24 + b'\x00 ' : fw_type = 'Region, Extracted'
6044- else : fw_type = 'Region, Stock'
6049+
6050+ # Check 4, CSME12+ FIT FWUpdate image
6051+ if reading [fpt_start :fpt_start + 0x10 ] == b'\xFF ' * 0x10 and fwu_pmcp_found and not fpt_chk_null : fw_type = 'Region, FWUpdate'
60456052 else :
60466053 fw_type = 'Update' # No Region detected, Update
60476054
@@ -6058,7 +6065,6 @@ def mass_scan(f_path) :
60586065 # Detect Firmware Release (Production, Pre-Production, ROM-Bypass, Other)
60596066 mn2_flags_pvbit ,mn2_flags_reserved ,mn2_flags_pre ,mn2_flags_debug = mn2_ftpr_hdr .get_flags ()
60606067 rel_signed = ['Production' , 'Debug' ][mn2_flags_debug ]
6061- #rel_flag = ['PRD', 'PRE'][mn2_flags_pre] # Set only at ME9-10
60626068
60636069 # Check for ROM-Bypass entry at $FPT
60646070 if rgn_exist and fpt_romb_found :
@@ -6857,6 +6863,7 @@ def mass_scan(f_path) :
68576863 name_db = "%s.%s.%s.%s_%s_%s_%s" % (major , minor , hotfix , build , sku_db , rel_db , type_db ) # The re-created filename without extension
68586864 name_db_rgn = "%s.%s.%s.%s_%s_%s_RGN_%s" % (major , minor , hotfix , build , sku_db , rel_db , rsa_sig_hash ) # The equivalent RGN filename
68596865 name_db_extr = "%s.%s.%s.%s_%s_%s_EXTR_%s" % (major , minor , hotfix , build , sku_db , rel_db , rsa_sig_hash ) # The equivalent EXTR filename
6866+ name_db_fwu = "%s.%s.%s.%s_%s_%s_FWU_%s" % (major , minor , hotfix , build , sku_db , rel_db , rsa_sig_hash ) # The equivalent FWU filename
68606867 elif variant in ['CSSPS' ,'SPS' ] and sku != 'NaN' :
68616868 name_db = "%s.%s.%s.%s_%s_%s_%s" % ("{0:02d}" .format (major ), "{0:02d}" .format (minor ), "{0:02d}" .format (hotfix ), "{0:03d}" .format (build ), sku_db , rel_db , type_db )
68626869 name_db_rgn = "%s.%s.%s.%s_%s_%s_RGN_%s" % ("{0:02d}" .format (major ), "{0:02d}" .format (minor ), "{0:02d}" .format (hotfix ), "{0:03d}" .format (build ), sku_db , rel_db , rsa_sig_hash )
@@ -6881,9 +6888,10 @@ def mass_scan(f_path) :
68816888 if len (line ) < 2 or line [:3 ] == '***' :
68826889 continue # Skip empty lines or comments
68836890 else : # Search the re-created file name without extension at the database
6884- if name_db_hash in line : fw_in_db_found = "Yes" # Known firmware, nothing new
6885- if type_db == 'EXTR' and name_db_rgn in line :
6886- rgn_over_extr_found = True # Same firmware found at database but RGN instead of imported EXTR, so nothing new
6891+ if name_db_hash in line : fw_in_db_found = 'Yes' # Known firmware, nothing new
6892+ if (type_db == 'EXTR' and (name_db_rgn in line or (variant == 'CSME' and major >= 12 and name_db_fwu in line ))) or \
6893+ (type_db == 'FWU' and name_db_rgn in line ) :
6894+ rgn_over_extr_found = True # Same firmware found but of preferred type (RGN > FWU > EXTR), nothing new
68876895 fw_in_db_found = 'Yes'
68886896 # Only for ME8+ or ME7 non-PRD or ME6.0 IGN
68896897 if type_db == 'UPD' and ((variant in ['ME' ,'CSME' ] and (major > 7 or (major == 7 and release != 'Production' ) or
0 commit comments