From b08a2e47d77d0c671f298b6a6f1f75e20278f00c Mon Sep 17 00:00:00 2001
From: Mike Auty <mike.auty@gmail.com>
Date: Tue, 24 Mar 2020 01:21:11 +0000
Subject: [PATCH] Schemas: Implement changes in comments from dwarf2json#11

---
 volatility/schemas/schema-6.2.0.json | 77 +++++++++-------------------
 1 file changed, 25 insertions(+), 52 deletions(-)

diff --git a/volatility/schemas/schema-6.2.0.json b/volatility/schemas/schema-6.2.0.json
index 4cafff8e6..d2472ec9e 100644
--- a/volatility/schemas/schema-6.2.0.json
+++ b/volatility/schemas/schema-6.2.0.json
@@ -78,26 +78,20 @@
       },
       "additionalProperties": false
     },
-    "metadata_linux": {
+    "metadata_nix": {
       "type": "object",
       "properties": {
-        "elf": {
-          "$ref": "#/definitions/metadata_linux_elf"
+        "symbols": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/metadata_linux_item"
+          }
         },
-        "dwarf": {
-          "$ref": "#/definitions/metadata_dwarf"
-        }
-      },
-      "additionalProperties": false
-    },
-    "metadata_mac": {
-      "type": "object",
-      "properties": {
-        "elf": {
-          "$ref": "#/definitions/metadata_mac_macho"
-        },
-        "dwarf": {
-          "$ref": "#/definitions/metadata_dwarf"
+        "types": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/metadata_linux_item"
+          }
         }
       },
       "additionalProperties": false
@@ -106,48 +100,27 @@
       "type": "string",
       "pattern": "^6.[0-9]+.[0-9]+$"
     },
-    "metadata_linux_elf": {
+    "metadata_nix_item": {
       "type": "object",
       "properties": {
-        "symbols": {
-          "type": "boolean"
+        "kind": {
+          "type": "string",
+          "pattern": "^(dwarf|symtab|system-map)$"
         },
-        "buildid": {
+        "name": {
+          "type": "string"
+        },
+        "hash_type": {
+          "type": "string",
+          "pattern": "^(sha256)$"
+        },
+        "hash_value": {
           "type": "string",
           "pattern": "^[a-fA-F0-9]+$"
         }
       },
       "additionalProperties": false
     },
-    "metadata_mac_macho": {
-      "type": "object",
-      "properties": {
-        "symbols": {
-          "type": "boolean"
-        },
-        "uuid": {
-          "type": "string",
-          "pattern": "^[a-fA-F0-9]+-[a-fA-F0-9]+-[a-fA-F0-9]+-[a-fA-F0-9]+-[a-fA-F0-9]+$"
-        }
-      },
-      "additionalProperties": false
-    },
-    "metadata_dwarf": {
-      "type": "object",
-      "properties": {
-        "symbols": {
-          "type": "boolean"
-        },
-        "types": {
-          "type": "boolean"
-        },
-        "uuid": {
-          "type": "string",
-          "pattern": "^[a-fA-F0-9]+-[a-fA-F0-9]+-[a-fA-F0-9]+-[a-fA-F0-9]+-[a-fA-F0-9]+$"
-        }
-      },
-      "additionalProperties": false
-    },
     "element_metadata": {
       "type": "object",
       "oneOf": [
@@ -192,7 +165,7 @@
               "$ref": "#/definitions/metadata_producer"
             },
             "linux": {
-              "$ref": "#/definitions/metadata_linux"
+              "$ref": "#/definitions/metadata_nix"
             }
           },
           "required": [
@@ -210,7 +183,7 @@
               "$ref": "#/definitions/metadata_producer"
             },
             "mac": {
-              "$ref": "#/definitions/metadata_mac"
+              "$ref": "#/definitions/metadata_nix"
             }
           },
           "required": [