Move files to library folder

chipsec/chipset.py

@@ -23,15 +23,15 @@
 """
 import errno
 import traceback
-from typing import Tuple, Union
+from typing import Tuple
 
 from chipsec.helper.oshelper import helper as os_helper
 from chipsec.helper.basehelper import Helper
 from chipsec.helper.nonehelper import NoneHelper
 from chipsec.hal import cpu, io, iobar, mmio, msgbus, msr, pci, physmem, ucode, igd, cpuid
-from chipsec.exceptions import UnknownChipsetError, OsHelperError
+from chipsec.library.exceptions import UnknownChipsetError, OsHelperError
 
-from chipsec.logger import logger
+from chipsec.library.logger import logger
 from chipsec.library.defines import ARCH_VID
 from chipsec.library.register import Register
 from chipsec.library.lock import Lock
@@ -70,7 +70,7 @@ def __init__(self):
         self.using_return_codes = False
         self.consistency_checking = False
         self.lock = Lock(self)
-        self.register :Register = Register(self)
+        self.register = Register(self)
         self.control = Control(self)
         self.device = Device(self)
 

chipsec/command.py

@@ -20,7 +20,7 @@
 from enum import Enum
 import traceback
 
-from chipsec.logger import logger
+from chipsec.library.logger import logger
 from chipsec.testcase import ExitCode
 
 class BaseCommand:

chipsec/config.py

@@ -23,9 +23,9 @@
 import os
 import xml.etree.ElementTree as ET
 from chipsec.library.defines import is_hex
-from chipsec.exceptions import CSConfigError
-from chipsec.file import get_main_dir
-from chipsec.logger import logger
+from chipsec.library.exceptions import CSConfigError
+from chipsec.library.file import get_main_dir
+from chipsec.library.logger import logger
 from chipsec.parsers import Stage
 from chipsec.parsers import stage_info, config_data
 

chipsec/hal/acpi.py

@@ -30,12 +30,12 @@
 from collections import namedtuple
 
 from chipsec.library.defines import bytestostring
-from chipsec.exceptions import UnimplementedAPIError
-from chipsec.file import read_file
+from chipsec.library.exceptions import UnimplementedAPIError
+from chipsec.library.file import read_file
 from chipsec.hal import acpi_tables
 from chipsec.hal.hal_base import HALBase
 from chipsec.hal.uefi import UEFI
-from chipsec.logger import logger, print_buffer_bytes
+from chipsec.library.logger import logger, print_buffer_bytes
 from chipsec.hal.acpi_tables import ACPI_TABLE
 
 # ACPI Table Header Format

chipsec/hal/acpi_tables.py

@@ -31,7 +31,7 @@
 from collections import namedtuple
 from uuid import UUID
 from typing import List, Optional, Tuple
-from chipsec.logger import logger, dump_buffer_bytes
+from chipsec.library.logger import logger, dump_buffer_bytes
 from chipsec.hal.uefi_common import EFI_GUID_FMT, EFI_GUID_STR
 
 

chipsec/hal/cmos.py

@@ -38,7 +38,7 @@
 """
 from typing import List
 from chipsec.hal import hal_base
-import chipsec.logger
+import chipsec.library.logger
 
 CMOS_ADDR_PORT_LOW = 0x70
 CMOS_DATA_PORT_LOW = 0x71
@@ -85,6 +85,6 @@ def dump_high(self) -> List[int]:
 
     def dump(self) -> None:
         self.logger.log("Low CMOS memory contents:")
-        chipsec.logger.pretty_print_hex_buffer(self.dump_low())
+        chipsec.library.logger.pretty_print_hex_buffer(self.dump_low())
         self.logger.log("\nHigh CMOS memory contents:")
-        chipsec.logger.pretty_print_hex_buffer(self.dump_high())
+        chipsec.library.logger.pretty_print_hex_buffer(self.dump_high())

chipsec/hal/cpu.py

@@ -25,7 +25,7 @@
 """
 from typing import Dict, List, Tuple, Optional
 from chipsec.hal import acpi, hal_base, paging
-from chipsec.logger import logger
+from chipsec.library.logger import logger
 
 VMM_NONE = 0
 VMM_XEN = 0x1

chipsec/hal/cpuid.py

@@ -27,7 +27,7 @@
 
 from typing import Tuple
 from chipsec.hal import hal_base
-from chipsec.logger import logger
+from chipsec.library.logger import logger
 
 
 class CpuID(hal_base.HALBase):

chipsec/hal/ec.py

@@ -43,7 +43,7 @@
 """
 from typing import List, Optional
 from chipsec.hal import hal_base
-from chipsec.logger import print_buffer_bytes
+from chipsec.library.logger import print_buffer_bytes
 
 #
 # Embedded Controller ACPI ports

chipsec/hal/hal_base.py

@@ -23,10 +23,10 @@
 Base for HAL Components
 """
 
-import chipsec.logger
+import chipsec.library.logger
 
 
 class HALBase:
     def __init__(self, cs):
         self.cs = cs
-        self.logger = chipsec.logger.logger()
+        self.logger = chipsec.library.logger.logger()

chipsec/hal/igd.py

@@ -33,7 +33,7 @@
 
 from typing import Optional, Tuple
 from chipsec.hal import hal_base
-from chipsec.logger import print_buffer_bytes
+from chipsec.library.logger import print_buffer_bytes
 
 
 class IGD(hal_base.HALBase):

chipsec/hal/interrupts.py

@@ -33,7 +33,7 @@
 import uuid
 from typing import Optional, Tuple
 from chipsec.hal import hal_base
-from chipsec.logger import logger, print_buffer_bytes
+from chipsec.library.logger import logger, print_buffer_bytes
 from chipsec.hal.acpi import ACPI
 from chipsec.hal.acpi_tables import UEFI_TABLE, GAS
 from chipsec.library.defines import bytestostring

chipsec/hal/io.py

@@ -32,7 +32,7 @@
 """
 
 from typing import List
-from chipsec.logger import logger
+from chipsec.library.logger import logger
 
 
 class PortIO:

chipsec/hal/iobar.py

@@ -30,9 +30,9 @@
 """
 from typing import Tuple, List
 from chipsec.hal import hal_base
-from chipsec.logger import logger
-from chipsec.exceptions import IOBARNotFoundError
-from chipsec.exceptions import CSReadError
+from chipsec.library.logger import logger
+from chipsec.library.exceptions import IOBARNotFoundError
+from chipsec.library.exceptions import CSReadError
 
 DEFAULT_IO_BAR_SIZE = 0x100
 

chipsec/hal/iommu.py

@@ -24,7 +24,7 @@
 """
 
 from chipsec.hal import hal_base, mmio, paging
-from chipsec.exceptions import IOMMUError
+from chipsec.library.exceptions import IOMMUError
 
 IOMMU_ENGINE_DEFAULT = 'VTD'
 IOMMU_ENGINE_GFX = 'GFXVTD'

chipsec/hal/locks.py

@@ -23,7 +23,7 @@
 from typing import List, Optional
 from chipsec.library.defines import bit, is_set
 from chipsec.hal.hal_base import HALBase
-from chipsec.exceptions import CSReadError, HWAccessViolationError
+from chipsec.library.exceptions import CSReadError, HWAccessViolationError
 
 
 class LockResult:

chipsec/hal/mmio.py

@@ -45,8 +45,8 @@
 """
 from typing import List, Optional, Tuple
 from chipsec.hal import hal_base
-from chipsec.exceptions import CSReadError
-from chipsec.logger import logger
+from chipsec.library.exceptions import CSReadError
+from chipsec.library.logger import logger
 from chipsec.library.defines import get_bits
 
 DEFAULT_MMIO_BAR_SIZE = 0x1000

chipsec/hal/msgbus.py

@@ -37,7 +37,7 @@
 
 from typing import Optional
 from chipsec.hal import hal_base
-from chipsec.exceptions import RegisterNotFoundError
+from chipsec.library.exceptions import RegisterNotFoundError
 
 
 #

chipsec/hal/msr.py

@@ -35,7 +35,7 @@
 """
 
 from typing import Dict, Tuple, Optional
-from chipsec.logger import logger, print_buffer_bytes
+from chipsec.library.logger import logger, print_buffer_bytes
 
 
 DESCRIPTOR_TABLE_CODE_IDTR = 0

chipsec/hal/paging.py

@@ -26,8 +26,8 @@
 import struct
 from typing import Dict, List, Optional, Any
 import chipsec.library.defines as defines
-from chipsec.logger import logger
-from chipsec.exceptions import InvalidMemoryAddress
+from chipsec.library.logger import logger
+from chipsec.library.exceptions import InvalidMemoryAddress
 
 ADDR_MASK = defines.MASK_64b
 MAXPHYADDR = 0x000FFFFFFFFFF000

chipsec/hal/pci.py

@@ -40,10 +40,10 @@
 from collections import namedtuple
 import itertools
 from typing import List, Tuple, Optional
-from chipsec.logger import logger, pretty_print_hex_buffer
-from chipsec.file import write_file
+from chipsec.library.logger import logger, pretty_print_hex_buffer
+from chipsec.library.file import write_file
 from chipsec.hal.pcidb import VENDORS, DEVICES
-from chipsec.exceptions import OsHelperError
+from chipsec.library.exceptions import OsHelperError
 from chipsec.library.defines import is_all_ones, MASK_16b, MASK_32b, MASK_64b, BOUNDARY_4KB
 
 #

chipsec/hal/physmem.py

@@ -31,7 +31,7 @@
 from struct import unpack, pack
 from typing import Tuple, Optional
 from chipsec.hal.hal_base import HALBase
-from chipsec.logger import print_buffer_bytes
+from chipsec.library.logger import print_buffer_bytes
 
 
 class Memory(HALBase):

chipsec/hal/smbios.py

@@ -27,7 +27,7 @@
 from typing import Dict, List, Optional, Tuple, Any, Union, Type
 from chipsec.library.defines import BOUNDARY_1MB, bytestostring
 from chipsec.hal import hal_base, uefi
-from chipsec.logger import logger
+from chipsec.library.logger import logger
 
 SCAN_LOW_LIMIT = 0xF0000
 SCAN_SIZE = 0x10000

chipsec/hal/smbus.py

@@ -30,7 +30,7 @@
 """
 from typing import List
 from chipsec.hal import iobar, hal_base
-from chipsec.exceptions import IOBARNotFoundError, RegisterNotFoundError
+from chipsec.library.exceptions import IOBARNotFoundError, RegisterNotFoundError
 
 SMBUS_COMMAND_QUICK = 0
 SMBUS_COMMAND_BYTE = 1

chipsec/hal/spd.py

@@ -37,7 +37,7 @@
 from typing import Any, List
 from collections import namedtuple
 
-from chipsec.logger import logger, print_buffer_bytes
+from chipsec.library.logger import logger, print_buffer_bytes
 
 SPD_SMBUS_ADDRESS = 0xA0  # A2, A4, A6, A8, AA, AC, AE
 SPD_SMBUS_ADDRESS_DIMM0 = SPD_SMBUS_ADDRESS

chipsec/hal/spi.py

@@ -46,11 +46,11 @@
 import time
 from typing import Dict, Tuple, Optional
 from chipsec.library.defines import ALIGNED_4KB, BIT0, BIT1, BIT2, BIT5
-from chipsec.file import write_file, read_file
-from chipsec.logger import print_buffer_bytes
+from chipsec.library.file import write_file, read_file
+from chipsec.library.logger import print_buffer_bytes
 from chipsec.hal import hal_base, mmio
 from chipsec.hal.spi_jedec_ids import JEDEC_ID
-from chipsec.exceptions import SpiRuntimeError, UnimplementedAPIError
+from chipsec.library.exceptions import SpiRuntimeError, UnimplementedAPIError
 
 SPI_READ_WRITE_MAX_DBC = 64
 SPI_READ_WRITE_DEF_DBC = 4

chipsec/hal/spi_descriptor.py

@@ -29,7 +29,7 @@
 
 import struct
 from typing import Dict, List, Optional, Tuple
-from chipsec.logger import logger, print_buffer_bytes
+from chipsec.library.logger import logger, print_buffer_bytes
 from chipsec.hal import spi
 
 SPI_FLASH_DESCRIPTOR_SIGNATURE = struct.pack('=I', 0x0FF0A55A)

chipsec/hal/spi_uefi.py

@@ -41,8 +41,8 @@
 from typing import Dict, List, Optional, Union, Any, Callable, TYPE_CHECKING
 if TYPE_CHECKING:
     from chipsec.hal.uefi_fv import EFI_MODULE
-from chipsec.logger import logger
-from chipsec.file import write_file, read_file
+from chipsec.library.logger import logger
+from chipsec.library.file import write_file, read_file
 from chipsec.hal.uefi_compression import COMPRESSION_TYPE_LZMA, COMPRESSION_TYPE_EFI_STANDARD, COMPRESSION_TYPES_ALGORITHMS, COMPRESSION_TYPE_UNKNOWN, COMPRESSION_TYPE_LZMAF86
 from chipsec.hal.uefi_common import bit_set, EFI_GUID_SIZE, EFI_GUID_FMT
 from chipsec.hal.uefi_platform import FWType, fw_types, EFI_NVRAM_GUIDS, EFI_PLATFORM_FS_GUIDS, NVAR_NVRAM_FS_FILE

chipsec/hal/tpm.py

@@ -29,7 +29,7 @@
 from collections import namedtuple
 from typing import Dict, Tuple, Callable
 
-from chipsec.logger import print_buffer_bytes
+from chipsec.library.logger import print_buffer_bytes
 from chipsec.hal import hal_base
 import chipsec.hal.tpm12_commands
 

chipsec/hal/tpm12_commands.py

@@ -28,7 +28,7 @@
 
 import struct
 from typing import Dict, Tuple
-from chipsec.logger import logger
+from chipsec.library.logger import logger
 
 COMMAND_FORMAT = "=HIIIII"
 

chipsec/hal/tpm_eventlog.py

@@ -29,7 +29,7 @@
 import struct
 
 from typing import Any, Dict, BinaryIO, Optional, Type, TypeVar
-from chipsec.logger import logger
+from chipsec.library.logger import logger
 
 EventType = TypeVar('EventType', bound='TcgPcrEvent')
 

chipsec/hal/ucode.py

@@ -31,8 +31,8 @@
 import struct
 import os
 from typing import AnyStr
-from chipsec.logger import logger
-from chipsec.file import read_file
+from chipsec.library.logger import logger
+from chipsec.library.file import read_file
 
 IA32_MSR_BIOS_UPDT_TRIG = 0x79
 IA32_MSR_BIOS_SIGN_ID = 0x8B

chipsec/hal/uefi.py

@@ -35,8 +35,8 @@
 from chipsec.hal.uefi_common import EFI_VARIABLE_BOOTSERVICE_ACCESS, EFI_VARIABLE_RUNTIME_ACCESS, EFI_VARIABLE_HARDWARE_ERROR_RECORD, SECURE_BOOT_SIG_VAR
 from chipsec.hal.uefi_common import IS_VARIABLE_ATTRIBUTE, EFI_TABLE_HEADER_FMT, EFI_SYSTEM_TABLE_SIGNATURE, EFI_RUNTIME_SERVICES_SIGNATURE, EFI_BOOT_SERVICES_SIGNATURE
 from chipsec.hal.uefi_common import EFI_DXE_SERVICES_TABLE_SIGNATURE, EFI_CONFIGURATION_TABLE, ACPI_VARIABLE_SET_STRUCT_SIZE
-from chipsec.logger import logger, print_buffer_bytes
-from chipsec.file import write_file, read_file
+from chipsec.library.logger import logger, print_buffer_bytes
+from chipsec.library.file import write_file, read_file
 from chipsec.library.defines import bytestostring
 from chipsec.helper.oshelper import OsHelperError
 

chipsec/hal/uefi_common.py

@@ -30,8 +30,8 @@
 from uuid import UUID
 from typing import Dict, List, Tuple, Optional, Any, Callable
 
-from chipsec.file import read_file, write_file
-from chipsec.logger import logger, dump_buffer, dump_buffer_bytes
+from chipsec.library.file import read_file, write_file
+from chipsec.library.logger import logger, dump_buffer, dump_buffer_bytes
 from chipsec.library.defines import bytestostring
 
 # from chipsec.helper.oshelper import helper
@@ -438,7 +438,7 @@ def parse_auth_var(db: bytes, decode_dir: str) -> List[bytes]:
             var_name = codecs.decode(db[tof:tof + name_size], 'utf-16')
         except UnicodeDecodeError:
             logger().log_warning(f'Unable to decode {db[tof:tof + name_size]}')
-            var_name = "chipsec.exceptions!"
+            var_name = "chipsec.library.exceptions!"
         tof += name_size
         sig_data = db[tof:tof + cert_data_size]
         entries.append(sig_data)

chipsec/hal/uefi_compression.py

@@ -35,7 +35,7 @@
     has_eficomp = False
 
 from typing import List, Any
-from chipsec.logger import logger
+from chipsec.library.logger import logger
 
 #
 # Compression Types