Merge branch 'main' of github.com:MISP/misp-objects into main

pull/281/head
Alexandre Dulaunoy 2020-08-24 13:33:10 +02:00
commit fbe850e6c4
No known key found for this signature in database
GPG Key ID: 09E2CD4944E6CBCD
2 changed files with 37 additions and 1 deletions

View File

@ -364,6 +364,30 @@
"misp-attribute": "sha256",
"ui-priority": 1
},
"sha3-224": {
"description": "Secure Hash Algorithm 3 (224 bits)",
"misp-attribute": "sha3-224",
"recommended": false,
"ui-priority": 0
},
"sha3-256": {
"description": "Secure Hash Algorithm 3 (256 bits)",
"misp-attribute": "sha3-256",
"recommended": false,
"ui-priority": 0
},
"sha3-384": {
"description": "Secure Hash Algorithm 3 (384 bits)",
"misp-attribute": "sha3-384",
"recommended": false,
"ui-priority": 0
},
"sha3-512": {
"description": "Secure Hash Algorithm 3 (512 bits)",
"misp-attribute": "sha3-512",
"recommended": false,
"ui-priority": 0
},
"sha384": {
"description": "Secure Hash Algorithm 2 (384 bits)",
"misp-attribute": "sha384",
@ -447,6 +471,10 @@
"sha512",
"sha512/224",
"sha512/256",
"sha3-224",
"sha3-256",
"sha3-384",
"sha3-512",
"tlsh",
"pattern-in-file",
"certificate",
@ -456,5 +484,5 @@
"fullpath"
],
"uuid": "688c46fb-5edb-40a3-8273-1af7923e2215",
"version": 21
"version": 22
}

View File

@ -98,6 +98,10 @@
"filename|sha512",
"filename|sha512/224",
"filename|sha512/256",
"filename|sha3-224",
"filename|sha3-256",
"filename|sha3-384",
"filename|sha3-512",
"filename|ssdeep",
"filename|tlsh",
"filename|vhash",
@ -174,6 +178,10 @@
"sha512",
"sha512/224",
"sha512/256",
"sha3-224",
"sha3-256",
"sha3-384",
"sha3-512",
"sigma",
"size-in-bytes",
"snort",