X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=kernel_hardening_checker%2F__init__.py;h=a1c8e06b3a87c1b2c615bc66e93cacd9da0b930c;hb=4a4ac47bb27161044480181f7f7f3ec8adb9e732;hp=7a90a0247fad077fe208d7cea9545a1fa96ee1ff;hpb=a88e0633185026fbd02184061a6f12b004da7fa0;p=kconfig-hardened-check.git diff --git a/kernel_hardening_checker/__init__.py b/kernel_hardening_checker/__init__.py index 7a90a02..a1c8e06 100644 --- a/kernel_hardening_checker/__init__.py +++ b/kernel_hardening_checker/__init__.py @@ -22,14 +22,14 @@ from .engine import StrOrNone, TupleOrNone, ChecklistObjType from .engine import print_unknown_options, populate_with_data, perform_checks, override_expected_value -def _open(file: str, *args, **kwargs) -> TextIO: +def _open(file: str) -> TextIO: if file.endswith('.gz'): - return gzip.open(file, *args, **kwargs) - return open(file, *args, **kwargs) + return gzip.open(file, 'rt', encoding='utf-8') + return open(file, 'rt', encoding='utf-8') def detect_arch(fname: str, archs: List[str]) -> Tuple[StrOrNone, str]: - with _open(fname, 'rt', encoding='utf-8') as f: + with _open(fname) as f: arch_pattern = re.compile(r"CONFIG_[a-zA-Z0-9_]+=y$") arch = None for line in f.readlines(): @@ -46,7 +46,7 @@ def detect_arch(fname: str, archs: List[str]) -> Tuple[StrOrNone, str]: def detect_kernel_version(fname: str) -> Tuple[TupleOrNone, str]: - with _open(fname, 'rt', encoding='utf-8') as f: + with _open(fname) as f: ver_pattern = re.compile(r"^# Linux/.+ Kernel Configuration$|^Linux version .+") for line in f.readlines(): if ver_pattern.match(line): @@ -65,7 +65,7 @@ def detect_kernel_version(fname: str) -> Tuple[TupleOrNone, str]: def detect_compiler(fname: str) -> Tuple[StrOrNone, str]: gcc_version = None clang_version = None - with _open(fname, 'rt', encoding='utf-8') as f: + with _open(fname) as f: for line in f.readlines(): if line.startswith('CONFIG_GCC_VERSION='): gcc_version = line[19:-1] @@ -133,7 +133,7 @@ def print_checklist(mode: StrOrNone, checklist: List[ChecklistObjType], with_res def parse_kconfig_file(_mode: StrOrNone, parsed_options: Dict[str, str], fname: str) -> None: - with _open(fname, 'rt', encoding='utf-8') as f: + with _open(fname) as f: opt_is_on = re.compile(r"CONFIG_[a-zA-Z0-9_]+=.+$") opt_is_off = re.compile(r"# CONFIG_[a-zA-Z0-9_]+ is not set$")