MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'misp-stix' of https://github.com/MISP/MISP into develop

pull/8053/head
chrisr3d 2021-12-22 14:25:16 +01:00
parent 2e1c6f3465 576f0ff9d5
commit 924dd08cdb
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/files/scripts/misp-stix

@ -1 +1 @@
Subproject commit e6d7f2ef318a8c5b166df69e4d2f721cf32da964
Subproject commit fbdedcf172812c93804d4e978a0404be991eac25

4
app/files/scripts/misp2stix.py
View File

@ -91,8 +91,8 @@ class StixAttributesExport(StixExport):
super().__init__(format, debug)
self._parser = MISPtoSTIX1AttributesParser(orgname, version)
self.__features = (
'campaigns', 'courses_of_action', 'exploit_targets', 'indicators',
'observables', 'threat_actors', 'ttps'
'observables', 'indicators', 'ttps', 'exploit_targets',
'courses_of_action', 'campaigns', 'threat_actors'
)
self._output_files = {}