admin/chipsec-chipsec
1
0
Fork 0
mirror of https://github.com/chipsec/chipsec synced 2026-06-08 13:31:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

each helper checks for driver in appropriate places

Browse Source
This commit is contained in:
Loucaides
2017-07-25 13:42:03 -04:00
committed by Erik Bjorge
parent 2a1adea0ca
commit a4d1333bbd
3 changed files with 38 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
chipsec/helper/helpers.py
+2 -4
View File
@@ -25,8 +25,6 @@ import chipsec.file
from chipsec.helper.efi import *
from chipsec.helper.linux import *
from chipsec.helper.osx import *
if os.path.isfile("C:\\Windows\\System32\\drivers\\chipsec_hlpr.sys") or os.path.isfile(os.path.join( chipsec.file.get_main_dir(), "chipsec", "helper", "win", "win7_" + platform.machine().lower(), "chipsec_hlpr.sys")):
from chipsec.helper.win import *
elif (os.path.isfile(os.path.join("C:\\Windows\\System32\\drivers\\RwDrv.sys")) or os.path.isfile(os.path.join( chipsec.file.get_main_dir(), "chipsec", "helper", "rwe", "win7_" + platform.machine().lower(), "RwDrv.sys" ))):
from chipsec.helper.rwe import *
from chipsec.helper.win import *
from chipsec.helper.rwe import *
chipsec/helper/rwe/rwehelper.py
+20 -19
View File
@@ -72,10 +72,11 @@ kernel32 = windll.kernel32
drv_hndl_error_msg = "Cannot open rwe driver handle. Make sure rwe driver is installed and started if you are using option -e (see README)"
DRIVER_FILE_NAME = "RwDrv.sys"
DEVICE_FILE = "\\\\.\\RwDrv"
SERVICE_NAME = "RwDrv"
DISPLAY_NAME = "RwDrv"
DRIVER_FILE_PATHS = ["C:\\Windows\\System32\\drivers", os.path.join( chipsec.file.get_main_dir(), "chipsec", "helper", "rwe", "win7_" + platform.machine().lower())]
DRIVER_FILE_NAME = "RwDrv.sys"
DEVICE_FILE = "\\\\.\\RwDrv"
SERVICE_NAME = "RwDrv"
DISPLAY_NAME = "RwDrv"
CHIPSEC_INSTALL_PATH = os.path.join(sys.prefix, "Lib\site-packages\chipsec")
@@ -247,7 +248,8 @@ class RweHelper(Helper):
def __init__(self):
super(RweHelper, self).__init__()
import platform
import platform, os
self.os_system = platform.system()
self.os_release = platform.release()
self.os_version = platform.version()
@@ -257,15 +259,24 @@ class RweHelper(Helper):
win_ver = "win7_" + self.os_machine.lower()
if ("5" == self.os_release): win_ver = "winxp"
if logger().HAL: logger().log( "[helper] OS: %s %s %s" % (self.os_system, self.os_release, self.os_version) )
if logger().HAL: logger().log( "[helper] Using 'helper/win/%s' path for driver" % win_ver )
self.use_existing_service = False
self.driver_path = None
self.win_ver = win_ver
self.driver_handle = None
self.device_file = pywintypes.Unicode(DEVICE_FILE)
# check DRIVER_FILE_PATHS for the DRIVER_FILE_NAME
self.driver_path = None
for path in DRIVER_FILE_PATHS:
driver_path = os.path.join(path, DRIVER_FILE_NAME)
if os.path.isfile(driver_path):
self.driver_path = driver_path
if logger().HAL: logger().log("[helper] found driver in %s" % driver_path)
if self.driver_path == None:
if logger().HAL: logger().log("[helper] RWE Driver Not Found")
raise DriverNotFound
c_int_p = POINTER(c_int)
# enable required SeSystemEnvironmentPrivilege privilege
@@ -354,17 +365,7 @@ class RweHelper(Helper):
handle_winerror(fn, msg, hr)
if logger().VERBOSE: logger().log( "[helper] service control manager opened (handle = 0x%08x)" % hscm )
driver_path = os.path.join( chipsec.file.get_main_dir(), "chipsec", "helper", "rwe", self.win_ver, DRIVER_FILE_NAME )
if not os.path.isfile( driver_path ):
driver_path = os.path.join("C:\\", "Windows","System32","drivers", DRIVER_FILE_NAME)
if logger().VERBOSE: logger().log( "[helper] Did not find local RWE driver. Trying %s" % driver_path )
if os.path.isfile( driver_path ):
self.driver_path = driver_path
if logger().VERBOSE: logger().log( "[helper] driver path: '%s'" % os.path.abspath(self.driver_path) )
else:
logger().error( "could not locate driver file '%.256s'" % driver_path )
return False
if logger().VERBOSE: logger().log( "[helper] driver path: '%s'" % os.path.abspath(self.driver_path) )
try:
hs = win32service.CreateService(
@@ -375,7 +376,7 @@ class RweHelper(Helper):
win32service.SERVICE_KERNEL_DRIVER,
win32service.SERVICE_DEMAND_START,
win32service.SERVICE_ERROR_NORMAL,
os.path.abspath(driver_path),
os.path.abspath(self.driver_path),
None, 0, u"", None, None )
if hs:
if logger().VERBOSE: logger().log( "[helper] service '%s' created (handle = 0x%08x)" % (SERVICE_NAME,hs) )
chipsec/helper/win/win32helper.py
+16 -14
View File
@@ -73,6 +73,7 @@ kernel32 = windll.kernel32
drv_hndl_error_msg = "Cannot open chipsec driver handle. Make sure chipsec driver is installed and started if you are using option -e (see README)"
DRIVER_FILE_PATHS = [ "C:\\Windows\\System32\\drivers", os.path.join( chipsec.file.get_main_dir(), "chipsec", "helper", "win", "win7_" + platform.machine().lower()) ]
DRIVER_FILE_NAME = "chipsec_hlpr.sys"
DEVICE_FILE = "\\\\.\\chipsec_hlpr"
SERVICE_NAME = "chipsec"
@@ -244,7 +245,8 @@ class Win32Helper(Helper):
def __init__(self):
super(Win32Helper, self).__init__()
import platform
import platform, os
self.os_system = platform.system()
self.os_release = platform.release()
self.os_version = platform.version()
@@ -254,15 +256,24 @@ class Win32Helper(Helper):
win_ver = "win7_" + self.os_machine.lower()
if ("5" == self.os_release): win_ver = "winxp"
if logger().HAL: logger().log( "[helper] OS: %s %s %s" % (self.os_system, self.os_release, self.os_version) )
if logger().HAL: logger().log( "[helper] Using 'helper/win/%s' path for driver" % win_ver )
self.use_existing_service = False
self.driver_path = None
self.win_ver = win_ver
self.driver_handle = None
self.device_file = pywintypes.Unicode(DEVICE_FILE)
# check DRIVER_FILE_PATHS for the DRIVER_FILE_NAME
self.driver_path = None
for path in DRIVER_FILE_PATHS:
driver_path = os.path.join(path, DRIVER_FILE_NAME)
if os.path.isfile(driver_path):
self.driver_path = driver_path
if logger().HAL: logger().log("[helper] found driver in %s" % driver_path)
if self.driver_path == None:
if logger().HAL: logger().log("[helper] CHIPSEC Windows Driver Not Found")
raise DriverNotFound
c_int_p = POINTER(c_int)
# enable required SeSystemEnvironmentPrivilege privilege
@@ -351,16 +362,7 @@ class Win32Helper(Helper):
handle_winerror(fn, msg, hr)
if logger().VERBOSE: logger().log( "[helper] service control manager opened (handle = 0x%08x)" % hscm )
driver_path = os.path.join( chipsec.file.get_main_dir(), "chipsec", "helper", "win", self.win_ver, DRIVER_FILE_NAME )
if not os.path.isfile( driver_path ):
driver_path = os.path.join( "C:\\Windows\\System32\\drivers", DRIVER_FILE_NAME)
if os.path.isfile( driver_path ):
self.driver_path = driver_path
if logger().VERBOSE: logger().log( "[helper] driver path: '%s'" % os.path.abspath(self.driver_path) )
else:
logger().error( "could not locate driver file '%.256s'" % driver_path )
return False
if logger().VERBOSE: logger().log( "[helper] driver path: '%s'" % os.path.abspath(self.driver_path) )
try:
hs = win32service.CreateService(
@@ -371,7 +373,7 @@ class Win32Helper(Helper):
win32service.SERVICE_KERNEL_DRIVER,
win32service.SERVICE_DEMAND_START,
win32service.SERVICE_ERROR_NORMAL,
os.path.abspath(driver_path),
os.path.abspath(self.driver_path),
None, 0, u"", None, None )
if hs:
if logger().VERBOSE: logger().log( "[helper] service '%s' created (handle = 0x%08x)" % (SERVICE_NAME,hs) )