From baae683771af5c57051216d2589435b8f8b67008 Mon Sep 17 00:00:00 2001
From: mday <mday@eitccorp.com>
Date: Tue, 30 Apr 2019 12:18:08 -0500
Subject: [PATCH] update the definition files of various object types so that
 the `required` and `requiredOneOf` lists no longer specify attributes that do
 not exist in the objects.

---
 objects/file/definition.json                      | 2 +-
 objects/mactime-timeline-analysis/definition.json | 4 ++--
 objects/original-imported-file/definition.json    | 2 +-
 objects/phishing-kit/definition.json              | 3 +--
 objects/python-etvx-event-log/definition.json     | 2 +-
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/objects/file/definition.json b/objects/file/definition.json
index 85b79c9..944834c 100644
--- a/objects/file/definition.json
+++ b/objects/file/definition.json
@@ -14,7 +14,7 @@
     "sha512/256",
     "tlsh",
     "pattern-in-file",
-    "x509-fingerprint-sha1",
+    "certificate",
     "malware-sample",
     "attachment",
     "path",
diff --git a/objects/mactime-timeline-analysis/definition.json b/objects/mactime-timeline-analysis/definition.json
index a8f32e9..cb20d2b 100644
--- a/objects/mactime-timeline-analysis/definition.json
+++ b/objects/mactime-timeline-analysis/definition.json
@@ -1,7 +1,7 @@
 {
   "requiredOneOf": [
-    "filepath",
-    "file_activity",
+    "file-path",
+    "activityType",
     "datetime"
   ],
   "attributes": {
diff --git a/objects/original-imported-file/definition.json b/objects/original-imported-file/definition.json
index 5bd93ff..6436924 100644
--- a/objects/original-imported-file/definition.json
+++ b/objects/original-imported-file/definition.json
@@ -1,7 +1,7 @@
 {
   "requiredOneOf": [
     "imported-sample",
-    "type"
+    "format"
   ],
   "attributes": {
     "imported-sample": {
diff --git a/objects/phishing-kit/definition.json b/objects/phishing-kit/definition.json
index 0da5baa..2112d20 100644
--- a/objects/phishing-kit/definition.json
+++ b/objects/phishing-kit/definition.json
@@ -90,7 +90,6 @@
   "requiredOneOf": [
     "kit-url",
     "reference-link",
-    "kit-name",
-    "kit-hash"
+    "kit-name"
   ]
 }
diff --git a/objects/python-etvx-event-log/definition.json b/objects/python-etvx-event-log/definition.json
index 2c50d9a..a2f9a7b 100644
--- a/objects/python-etvx-event-log/definition.json
+++ b/objects/python-etvx-event-log/definition.json
@@ -1,7 +1,7 @@
 {
   "required": [
     "source",
-    "type",
+    "event-type",
     "name"
   ],
   "attributes": {