Merge branch '2.4' into event_recovery

pull/6327/head
iglocska 2020-09-16 00:04:26 +02:00
commit 45f4d40294
No known key found for this signature in database
GPG Key ID: BEA224F1FEF113AC
1 changed files with 4 additions and 0 deletions

View File

@ -120,6 +120,10 @@ cybox_to_misp_object = {
"Whois": "whois"
}
test_mechanisms_mapping = {
'yaraTM:YaraTestMechanismType': 'yara'
}
marking_mapping = {
'AIS:AISMarkingStructure': 'parse_AIS_marking',
'tlpMarking:TLPMarkingStructureType': 'parse_TLP_marking'