Merge branch 'dev' of github.com:MISP/misp-stix

MISP · Nov 6, 2023 · b52aed8 · b52aed8
2 parents dca6719 + a4f4725
commit b52aed8
Show file tree

Hide file tree

Showing 5 changed files with 678 additions and 663 deletions.
diff --git a/misp_stix_converter/stix2misp/converters/__init__.py b/misp_stix_converter/stix2misp/converters/__init__.py
@@ -7,4 +7,4 @@
     InternalSTIX2MalwareAnalysisConverter)
 from .stix2_malware_converter import (  # noqa
     ExternalSTIX2MalwareConverter, InternalSTIX2MalwareConverter)
-from .stix2_observable_converter import STIX2ObservableObjectConverter  # noqa
+from .stix2_observable_objects_converter import STIX2ObservableObjectConverter  # noqa
diff --git a/misp_stix_converter/stix2misp/converters/stix2_malware_analysis_converter.py b/misp_stix_converter/stix2misp/converters/stix2_malware_analysis_converter.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 from ... import Mapping
-from .stix2_observable_converter import (
+from .stix2_observable_objects_converter import (
     ExternalSTIX2SampleObservableConverter,
     InternalSTIX2SampleObservableConverter)
 from .stix2converter import (

diff --git a/misp_stix_converter/stix2misp/converters/stix2_malware_converter.py b/misp_stix_converter/stix2misp/converters/stix2_malware_converter.py
@@ -3,7 +3,7 @@
 
 from ... import Mapping
 from ..exceptions import UnknownParsingFunctionError
-from .stix2_observable_converter import (
+from .stix2_observable_objects_converter import (
     ExternalSTIX2SampleObservableConverter,
     InternalSTIX2SampleObservableConverter)
 from .stix2converter import (