Merge branch 'master' of github.com:MISP/PyMISP

pull/511/head
Raphaël Vinot 2019-12-10 17:28:10 +01:00
commit 3983efa373
1 changed files with 8 additions and 0 deletions

View File

@ -187,7 +187,9 @@
"domain", "domain",
"domain|ip", "domain|ip",
"email-dst", "email-dst",
"email-src",
"email-subject", "email-subject",
"eppn",
"hassh-md5", "hassh-md5",
"hasshserver-md5", "hasshserver-md5",
"hex", "hex",
@ -418,6 +420,7 @@
"comment", "comment",
"email-dst", "email-dst",
"email-src", "email-src",
"eppn",
"github-organisation", "github-organisation",
"github-repository", "github-repository",
"github-username", "github-username",
@ -612,6 +615,10 @@
"default_category": "Payload delivery", "default_category": "Payload delivery",
"to_ids": 0 "to_ids": 0
}, },
"eppn": {
"default_category": "Network activity",
"to_ids": 1
},
"filename": { "filename": {
"default_category": "Payload delivery", "default_category": "Payload delivery",
"to_ids": 1 "to_ids": 1
@ -1135,6 +1142,7 @@
"email-subject", "email-subject",
"email-thread-index", "email-thread-index",
"email-x-mailer", "email-x-mailer",
"eppn",
"filename", "filename",
"filename|authentihash", "filename|authentihash",
"filename|impfuzzy", "filename|impfuzzy",