From e42da04c0e887542671fdff9522e145a0f72b00d Mon Sep 17 00:00:00 2001 From: Prakash B R Date: Wed, 24 Jan 2024 19:22:30 +0530 Subject: [PATCH 1/3] Added 0xB0 to InvalidXmlChar list --- src/xmlcli/XmlCliLib.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/xmlcli/XmlCliLib.py b/src/xmlcli/XmlCliLib.py index 107e92e..2d5b753 100644 --- a/src/xmlcli/XmlCliLib.py +++ b/src/xmlcli/XmlCliLib.py @@ -1136,7 +1136,7 @@ def PatchXmlData(XmlListBuff, XmlAddr, XmlSize): offset = offset + 5 + DataSize log.info(f'Patch buffer data size = {PacketSize:d} bytes') -InValidXmlChar=['\x00', '\x01', '\x02', '\x03', '\x04', '\x05', '\x06', '\x07', '\x08', '\x0B', '\x0C', '\x0E', '\x0F', '\x10', '\x11', '\x12', '\x13', '\x14', '\x15', '\x16', '\x17', '\x18', '\x19', '\x1A', '\x1B', '\x1C', '\x1D', '\x1E', '\x1F', '\x7F', '\x80', '\x81', '\x82', '\x83', '\x84', '\x86', '\x87', '\x88', '\x89', '\x8A', '\x8B', '\x8C', '\x8D', '\x8E', '\x8F', '\x90', '\x91', '\x92', '\x93', '\x94', '\x95', '\x96', '\x97', '\x98', '\x99', '\x9A', '\x9B', '\x9C', '\x9D', '\x9E', '\x9F', '\xAE'] +InValidXmlChar=['\x00', '\x01', '\x02', '\x03', '\x04', '\x05', '\x06', '\x07', '\x08', '\x0B', '\x0C', '\x0E', '\x0F', '\x10', '\x11', '\x12', '\x13', '\x14', '\x15', '\x16', '\x17', '\x18', '\x19', '\x1A', '\x1B', '\x1C', '\x1D', '\x1E', '\x1F', '\x7F', '\x80', '\x81', '\x82', '\x83', '\x84', '\x86', '\x87', '\x88', '\x89', '\x8A', '\x8B', '\x8C', '\x8D', '\x8E', '\x8F', '\x90', '\x91', '\x92', '\x93', '\x94', '\x95', '\x96', '\x97', '\x98', '\x99', '\x9A', '\x9B', '\x9C', '\x9D', '\x9E', '\x9F', '\xAE', '\xB0'] def SanitizeXml(filename): try: MyTree = ET.parse(filename) From 2c781684fdda6c316a5cb80e5314bb6515b6048f Mon Sep 17 00:00:00 2001 From: Prakash B R Date: Wed, 24 Jan 2024 19:25:41 +0530 Subject: [PATCH 2/3] Bumped to version 2.0.3 --- HISTORY.rst | 6 ++++++ src/xmlcli/_version.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/HISTORY.rst b/HISTORY.rst index e6de95c..c6cfe0b 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -2,3 +2,9 @@ History ======= +2.0.3 (2024-01-17) +------------------ +- Feature Improvements: + - Updated the list of invalid XML characters to enhance parsing accuracy. + - Upgraded dependencies to enhance the security of the application + diff --git a/src/xmlcli/_version.py b/src/xmlcli/_version.py index e1badec..39209f4 100644 --- a/src/xmlcli/_version.py +++ b/src/xmlcli/_version.py @@ -7,7 +7,7 @@ # MINOR ------------ MINOR = 0 # BUILD ------ -BUILD = 2 # or __revision__ +BUILD = 3 # or __revision__ # TAG ------- TAG = "" __version__ = LooseVersion("{major}.{minor}.{build}{tag}".format( From b7efee853c49d9020fc2cdd3e24175e3872e051f Mon Sep 17 00:00:00 2001 From: Prakash B R Date: Wed, 24 Jan 2024 19:31:12 +0530 Subject: [PATCH 3/3] Established global variables and defined their interdependencies for determining firmware base mask alignment --- src/xmlcli/XmlCliLib.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/xmlcli/XmlCliLib.py b/src/xmlcli/XmlCliLib.py index 2d5b753..c9cb9e3 100644 --- a/src/xmlcli/XmlCliLib.py +++ b/src/xmlcli/XmlCliLib.py @@ -123,6 +123,10 @@ CliSpecMajorVersion = 0x00 CliSpecMinorVersion = 0x00 +MAXIMUM_BIOS_MEMORY_MAP = 0xFFFFFFFF +PAGE_SIZE = 0x1000 +FIRMWARE_BASE_MASK_ALIGNMENT = (MAXIMUM_BIOS_MEMORY_MAP - PAGE_SIZE + 0x1) + CliCmdDict = {APPEND_BIOS_KNOBS_CMD_ID: 'APPEND_BIOS_KNOBS_CMD_ID', RESTOREMODIFY_KNOBS_CMD_ID: 'RESTOREMODIFY_KNOBS_CMD_ID', READ_BIOS_KNOBS_CMD_ID : 'READ_BIOS_KNOBS_CMD_ID', LOAD_DEFAULT_KNOBS_CMD_ID: 'LOAD_DEFAULT_KNOBS_CMD_ID', PROG_BIOS_CMD_ID : 'PROG_BIOS_CMD_ID', FETCH_BIOS_CMD_ID: 'FETCH_BIOS_CMD_ID',