From a35fa04f00929dc1a4e50c3db5e107bdcf6b49b4 Mon Sep 17 00:00:00 2001
From: Donghyun Kim <digitalisx99@gmail.com>
Date: Thu, 10 Mar 2022 01:12:49 +0900
Subject: [PATCH] Update BootableFlag Symbol

---
 .../symbols/windows/extensions/mbr.py         |  7 ++++--
 .../framework/symbols/windows/mbr.json        | 22 ++++---------------
 2 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/volatility3/framework/symbols/windows/extensions/mbr.py b/volatility3/framework/symbols/windows/extensions/mbr.py
index 8e02db822..7cb4c1463 100644
--- a/volatility3/framework/symbols/windows/extensions/mbr.py
+++ b/volatility3/framework/symbols/windows/extensions/mbr.py
@@ -2,6 +2,8 @@
 # which is available at https://www.volatilityfoundation.org/license/vsl-v1.0
 #
 
+import struct
+
 from volatility3.framework import objects
 
 class PARTITION_TABLE(objects.StructType):
@@ -18,6 +20,7 @@ class PARTITION_TABLE(objects.StructType):
 class PARTITION_ENTRY(objects.StructType):
 
     def set_index(self, index:int):
+        """Set Partition Entry Index."""
         self.index = index
     
     def get_bootable_flag(self) -> int:
@@ -26,7 +29,7 @@ class PARTITION_ENTRY(objects.StructType):
     
     def is_bootable(self) -> bool:
         """Check Bootable Partition."""
-        return False if not (self.BootableFlag == 0x80) else True
+        return False if not (self.get_bootable_flag() == 0x80) else True
 
     def get_partition_type(self) -> str:
         """Get Partition Type."""
@@ -68,7 +71,7 @@ class PARTITION_ENTRY(objects.StructType):
         """Get overall of Partition Entry Info"""
         processed_entry = "\n===== Partition Table #{0} =====\n".format(self.index+1)
         processed_entry += "Boot Flag: {0:#x} {1}\n".format(
-                                self.is_bootable(),
+                                self.get_bootable_flag(),
                                 "(Bootable)" if self.is_bootable() else ''
                             )
         processed_entry += "Partition Type: {0:#x} ({1})\n".format(
diff --git a/volatility3/framework/symbols/windows/mbr.json b/volatility3/framework/symbols/windows/mbr.json
index 9173633d1..122c020c3 100644
--- a/volatility3/framework/symbols/windows/mbr.json
+++ b/volatility3/framework/symbols/windows/mbr.json
@@ -34,10 +34,10 @@
             "endian": "little"
         },
         "int": {
-            "endian": "little",
             "kind": "int",
+            "size": 4,
             "signed": true,
-            "size": 4
+            "endian": "little"
         }, 
         "unsigned short": {
             "kind": "int", 
@@ -51,12 +51,6 @@
             "signed": false, 
             "endian": "little"
         },
-        "char": {
-            "endian": "little",
-            "kind": "char",
-            "signed": true,
-            "size": 1
-        },
         "wchar": {
             "kind": "int", 
             "size": 2, 
@@ -66,14 +60,6 @@
     },
     "symbols": {},
     "enums": {
-        "BootableFlag":{
-            "base": "unsigned char",
-            "constants": {
-                "Bootable": 0,
-                "Non-Bootable": 128
-            },
-            "size": 1
-        },
         "PartitionTypes": {
             "base": "unsigned char",
             "constants": {
@@ -140,8 +126,8 @@
                 "BootableFlag": {
                     "offset": 0,
                     "type": {
-                        "kind": "enum",
-                        "name": "BootableFlag"
+                        "kind": "base",
+                        "name": "unsigned char"
                     }
                 },
                 "StartingCHS": {