diff --git a/requirements.txt b/requirements.txt index 5f3a100..8cd9ba7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,5 +8,5 @@ py-tlsh pytz XlsxWriter PyYAML -fosslight_util>=2.1.0 +fosslight_util>=2.1.6 dependency-check diff --git a/src/fosslight_binary/binary_analysis.py b/src/fosslight_binary/binary_analysis.py index 2e8ffe3..41f9e6d 100755 --- a/src/fosslight_binary/binary_analysis.py +++ b/src/fosslight_binary/binary_analysis.py @@ -90,12 +90,15 @@ def init(path_to_find_bin, output_file_name, formats, path_to_exclude=[]): for i, output_extension in enumerate(output_extensions): if output_files[i] is None or output_files[i] == "": if formats: - if formats[i].startswith('spdx'): - if platform.system() != 'Windows': - output_files[i] = f"fosslight_spdx_bin_{start_time}" - else: - logger.warning('spdx format is not supported on Windows. Please remove spdx from format.') + if formats[i].startswith('spdx') or formats[i].startswith('cyclonedx'): + if platform.system() == 'Windows': + logger.warning(f'{formats[i]} is not supported on Windows. Please remove {formats[i]} from format.') to_remove.append(i) + else: + if formats[i].startswith('spdx'): + output_files[i] = f"fosslight_spdx_bin_{start_time}" + elif formats[i].startswith('cyclonedx'): + output_files[i] = f'fosslight_cyclonedx_bin_{start_time}' else: if output_extension == _json_ext: output_files[i] = f"fosslight_opossum_bin_{start_time}"