From: Shravan Rangarajuvenkata (shrarang) <shrarang@cisco.com>
Date: Wed, 29 Jan 2020 11:28:44 +0000 (+0000)
Subject: Merge pull request #1968 in SNORT/snort3 from ~PGUPTE/snort3:intelhex to master
X-Git-Tag: 3.0.0-268~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=43b0e0e2c2b6f1c9dc9bf134d44184345cbc55a5;p=thirdparty%2Fsnort3.git

Merge pull request #1968 in SNORT/snort3 from ~PGUPTE/snort3:intelhex to master

Squashed commit of the following:

commit 502015d880f65dc234870871f4d515fab08939d1
Author: Payal Gupte <pgupte@cisco.com>
Date:   Tue Jan 28 15:56:55 2020 -0500

    file-magic: Added missing file magic pattern for IntelHEX.
---

diff --git a/lua/file_magic.lua b/lua/file_magic.lua
index e4725bc04..47c629087 100644
--- a/lua/file_magic.lua
+++ b/lua/file_magic.lua
@@ -181,6 +181,7 @@ file_magic =
     { type = 'IntelHEX', id = 302, category = 'System files', msg = 'Binary files for Microcontroller/Other Chip based applications', rev = 1, magic = { { content = '| 3A 32 |', offset = 0, }, { content = '| 30 33 |', offset = 7, }, }, },
     { type = 'IntelHEX', id = 303, category = 'System files', msg = 'Binary files for Microcontroller/Other Chip based applications', rev = 1, magic = { { content = '| 3A 32 |', offset = 0, }, { content = '| 30 34 |', offset = 7, }, }, },
     { type = 'IntelHEX', id = 304, category = 'System files', msg = 'Binary files for Microcontroller/Other Chip based applications', rev = 1, magic = { { content = '| 3A 32 |', offset = 0, }, { content = '| 30 35 |', offset = 7, }, }, },
+    { type = 'IntelHEX', id = 305, category = 'System files', msg = 'Binary files for Microcontroller/Other Chip based applications', rev = 1, magic = { { content = '| 3A 32 |', offset = 0, }, { content = '| 32 30 |', offset = 7, }, }, },    
     { type = 'IntelHEX', id = 306, category = 'System files', msg = 'Binary files for Microcontroller/Other Chip based applications', rev = 1, magic = { { content = '| 3A 32 |', offset = 0, }, { content = '| 32 32 |', offset = 7, }, }, },
     { type = 'REG', id = 307, category = 'System files', msg = 'Windows Registry and Registry Undo files (REG)', rev = 1, magic = { { content = '| FF FE |', offset = 0, }, }, },
     { type = 'MSHTML', id = 308, category = 'Office Documents', msg = 'Proprietary layout engine for Microsoft Internet Explorer', rev = 1, magic = { { content = '| 3D 22 2D 2D 2D 2D 3D 5F |', offset = 60, }, }, },