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

pull/93/head
Raphaël Vinot 2018-03-27 10:26:21 +02:00
commit 7c9e0420e1
1 changed files with 3 additions and 2 deletions

View File

@ -2,7 +2,8 @@
"requiredOneOf": [ "requiredOneOf": [
"x509-fingerprint-md5", "x509-fingerprint-md5",
"x509-fingerprint-sha1", "x509-fingerprint-sha1",
"x509-fingerprint-sha256" "x509-fingerprint-sha256",
"serial-number"
], ],
"attributes": { "attributes": {
"subject": { "subject": {
@ -83,7 +84,7 @@
"misp-attribute": "text" "misp-attribute": "text"
} }
}, },
"version": 5, "version": 6,
"description": "x509 object describing a X.509 certificate", "description": "x509 object describing a X.509 certificate",
"meta-category": "network", "meta-category": "network",
"uuid": "d1ab756a-26b5-4349-9f43-765630f0911c", "uuid": "d1ab756a-26b5-4349-9f43-765630f0911c",