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

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

pull/325/head
Raphaël Vinot 2019-01-03 11:49:16 +01:00
parent b9d865b756 2c882c1887
commit 1805f2e746
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pymisp/data/describeTypes.json
View File

@ -89,6 +89,10 @@
"default_category": "Network activity", "default_category": "Network activity",
"to_ids": 0 "to_ids": 0
}, },
"ja3-fingerprint-md5": {
"default_category": "Network activity",
"to_ids": 1
},
"regkey": { "regkey": {
"default_category": "Persistence mechanism", "default_category": "Persistence mechanism",
"to_ids": 1 "to_ids": 1
@ -637,6 +641,7 @@
"url", "url",
"http-method", "http-method",
"user-agent", "user-agent",
"ja3-fingerprint-md5",
"regkey", "regkey",
"regkey|value", "regkey|value",
"AS", "AS",
@ -876,6 +881,7 @@
"x509-fingerprint-sha1", "x509-fingerprint-sha1",
"x509-fingerprint-md5", "x509-fingerprint-md5",
"x509-fingerprint-sha256", "x509-fingerprint-sha256",
"ja3-fingerprint-md5",
"other", "other",
"hostname|port", "hostname|port",
"email-dst-display-name", "email-dst-display-name",
@ -1031,6 +1037,7 @@
"x509-fingerprint-md5", "x509-fingerprint-md5",
"x509-fingerprint-sha1", "x509-fingerprint-sha1",
"x509-fingerprint-sha256", "x509-fingerprint-sha256",
"ja3-fingerprint-md5",
"other", "other",
"hex", "hex",
"cookie", "cookie",
@ -1096,6 +1103,7 @@
"x509-fingerprint-sha1", "x509-fingerprint-sha1",
"x509-fingerprint-md5", "x509-fingerprint-md5",
"x509-fingerprint-sha256", "x509-fingerprint-sha256",
"ja3-fingerprint-md5",
"github-repository", "github-repository",
"other", "other",
"cortex" "cortex"

2
pymisp/data/misp-objects

@ -1 +1 @@
Subproject commit 11a462e79b02428a08b11698d45aa8aa5ab6887d Subproject commit b6593451c2eb7765246e94cb88b650f2a65428ce