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

pull/325/head
Raphaël Vinot 2019-01-14 10:12:53 +01:00
commit d4daa2f827
1 changed files with 16 additions and 0 deletions

View File

@ -93,6 +93,14 @@
"default_category": "Network activity", "default_category": "Network activity",
"to_ids": 1 "to_ids": 1
}, },
"hassh-md5": {
"default_category": "Network activity",
"to_ids": 1
},
"hasshserver-md5": {
"default_category": "Network activity",
"to_ids": 1
},
"regkey": { "regkey": {
"default_category": "Persistence mechanism", "default_category": "Persistence mechanism",
"to_ids": 1 "to_ids": 1
@ -642,6 +650,8 @@
"http-method", "http-method",
"user-agent", "user-agent",
"ja3-fingerprint-md5", "ja3-fingerprint-md5",
"hassh-md5",
"hasshserver-md5",
"regkey", "regkey",
"regkey|value", "regkey|value",
"AS", "AS",
@ -882,6 +892,8 @@
"x509-fingerprint-md5", "x509-fingerprint-md5",
"x509-fingerprint-sha256", "x509-fingerprint-sha256",
"ja3-fingerprint-md5", "ja3-fingerprint-md5",
"hassh-md5",
"hasshserver-md5",
"other", "other",
"hostname|port", "hostname|port",
"email-dst-display-name", "email-dst-display-name",
@ -1038,6 +1050,8 @@
"x509-fingerprint-sha1", "x509-fingerprint-sha1",
"x509-fingerprint-sha256", "x509-fingerprint-sha256",
"ja3-fingerprint-md5", "ja3-fingerprint-md5",
"hassh-md5",
"hasshserver-md5",
"other", "other",
"hex", "hex",
"cookie", "cookie",
@ -1104,6 +1118,8 @@
"x509-fingerprint-md5", "x509-fingerprint-md5",
"x509-fingerprint-sha256", "x509-fingerprint-sha256",
"ja3-fingerprint-md5", "ja3-fingerprint-md5",
"hassh-md5",
"hasshserver-md5",
"github-repository", "github-repository",
"other", "other",
"cortex" "cortex"