Clam 2256 add alz support

clam-format

@@ -50,6 +50,8 @@ clang-format-16 -i -verbose unit_tests/*.h
 clang-format-16 -i -verbose win32/compat/*.c
 clang-format-16 -i -verbose win32/compat/*.h
 
+rustfmt `find . -name "*.rs"`
+
 # Undo changes to specific files that we don't really want to reformat
 git checkout libclamav/iana_cctld.h
 git checkout libclamav/bytecode_api_decl.c

libclamav/dconf.c

@@ -108,6 +108,7 @@ static struct dconf_module modules[] = {
     {"ARCHIVE", "EGG", ARCH_CONF_EGG, 1},
     {"ARCHIVE", "UDF", ARCH_CONF_UDF, 1},
     {"ARCHIVE", "LHA", ARCH_CONF_LHA_LZH, 1},
+    {"ARCHIVE", "ALZ", ARCH_CONF_ALZ, 1},
 
     {"DOCUMENT", "HTML", DOC_CONF_HTML, 1},
     {"DOCUMENT", "RTF", DOC_CONF_RTF, 1},

libclamav/dconf.h

@@ -98,6 +98,7 @@ struct cli_dconf {
 #define ARCH_CONF_EGG     0x4000000
 #define ARCH_CONF_UDF     0x8000000
 #define ARCH_CONF_LHA_LZH 0x10000000
+#define ARCH_CONF_ALZ     0x20000000
 
 /* Document flags */
 #define DOC_CONF_HTML         0x1

libclamav/filetypes.c

@@ -138,6 +138,7 @@ static const struct ftmap_s {
     { "CL_TYPE_EGG",                CL_TYPE_EGG             },
     { "CL_TYPE_EGGSFX",             CL_TYPE_EGGSFX          },
     { "CL_TYPE_UDF",                CL_TYPE_UDF             },
+    { "CL_TYPE_ALZ",                CL_TYPE_ALZ             },
     { "CL_TYPE_ONENOTE",            CL_TYPE_ONENOTE         },
     { "CL_TYPE_PYTHON_COMPILED",    CL_TYPE_PYTHON_COMPILED },
     { "CL_TYPE_LHA_LZH",            CL_TYPE_LHA_LZH         },

libclamav/filetypes.h

@@ -126,6 +126,7 @@ typedef enum cli_file {
     CL_TYPE_MHTML,
     CL_TYPE_LNK,
     CL_TYPE_UDF,
+    CL_TYPE_ALZ,
     CL_TYPE_OTHER,  /* on-the-fly, used for target 14 (OTHER) */
     CL_TYPE_IGNORED /* please don't add anything below */
 } cli_file_t;

libclamav/filetypes_int.h

@@ -301,5 +301,6 @@ static const char *ftypes_int[] = {
     "1:2:2d6c68(30|31|32|33|34|35|36|37|64|78)2d:LHA or LZH archive:CL_TYPE_ANY:CL_TYPE_LHA_LZH:210",
     "1:2:2d6c7a(73|34|35)2d:LHA archive using .LZS extension:CL_TYPE_ANY:CL_TYPE_LHA_LZH:210",
     "1:2:2d706d302d:LHA archive using PMarc (.PMA) extension:CL_TYPE_ANY:CL_TYPE_LHA_LZH:210",
+    "0:0:414c5a01:ALZ:CL_TYPE_ANY:CL_TYPE_ALZ:210",
     NULL};
 #endif

libclamav/hwp.c

@@ -1828,7 +1828,6 @@ static cl_error_t hwp3_cb(void *cbdata, int fd, const char *filepath, cli_ctx *c
     if (SCAN_COLLECT_METADATA)
         cli_jsonint(ctx->wrkproperty, "ParagraphCount", p);
 
-
     last = 0;
     /* 'additional information block #1's - attachments and media */
     while (!last && ((ret = parsehwp3_infoblk_1(ctx, map, &offset, &last)) == CL_SUCCESS)) continue;

libclamav/mbox.c

@@ -3217,7 +3217,7 @@ parseMimeHeader(message *m, const char *cmd, const table_t *rfc821Table, const c
 #ifdef CL_THREAD_SAFE
                                 s = strtok_r(NULL, ";", &strptr);
 #else
-                                s = strtok(NULL, ";");
+                                s       = strtok(NULL, ";");
 #endif
                                 if (s == NULL)
                                     break;
@@ -4387,7 +4387,7 @@ do_multipart(message *mainMessage, message **messages, int i, mbox_status *rc, m
              * This can save a lot of memory
              */
             messageDestroy(messages[i]);
-            messages[i] = NULL;
+            messages[i]  = NULL;
             mctx->wrkobj = thisobj;
 
             if (body) {

libclamav/others.h

@@ -587,16 +587,16 @@ extern LIBCLAMAV_EXPORT int have_rar;
 
 /* based on macros from A. Melnikoff */
 #define cbswap16(v) (((v & 0xff) << 8) | (((v) >> 8) & 0xff))
-#define cbswap32(v) ((((v) & 0x000000ff) << 24) | (((v) & 0x0000ff00) << 8) | \
-                     (((v) & 0x00ff0000) >> 8) | (((v) & 0xff000000) >> 24))
-#define cbswap64(v) ((((v) & 0x00000000000000ffULL) << 56) | \
-                     (((v) & 0x000000000000ff00ULL) << 40) | \
-                     (((v) & 0x0000000000ff0000ULL) << 24) | \
-                     (((v) & 0x00000000ff000000ULL) << 8) |  \
-                     (((v) & 0x000000ff00000000ULL) >> 8) |  \
-                     (((v) & 0x0000ff0000000000ULL) >> 24) | \
-                     (((v) & 0x00ff000000000000ULL) >> 40) | \
-                     (((v) & 0xff00000000000000ULL) >> 56))
+#define cbswap32(v) ((((v)&0x000000ff) << 24) | (((v)&0x0000ff00) << 8) | \
+                     (((v)&0x00ff0000) >> 8) | (((v)&0xff000000) >> 24))
+#define cbswap64(v) ((((v)&0x00000000000000ffULL) << 56) | \
+                     (((v)&0x000000000000ff00ULL) << 40) | \
+                     (((v)&0x0000000000ff0000ULL) << 24) | \
+                     (((v)&0x00000000ff000000ULL) << 8) |  \
+                     (((v)&0x000000ff00000000ULL) >> 8) |  \
+                     (((v)&0x0000ff0000000000ULL) >> 24) | \
+                     (((v)&0x00ff000000000000ULL) >> 40) | \
+                     (((v)&0xff00000000000000ULL) >> 56))
 
 #ifndef HAVE_ATTRIB_PACKED
 #define __attribute__(x)
@@ -822,8 +822,8 @@ size_t cli_recursion_stack_get_size(cli_ctx *ctx, int index);
 /* used by: spin, yc (C) aCaB */
 #define __SHIFTBITS(a) (sizeof(a) << 3)
 #define __SHIFTMASK(a) (__SHIFTBITS(a) - 1)
-#define CLI_ROL(a, b) a = (a << ((b) & __SHIFTMASK(a))) | (a >> ((__SHIFTBITS(a) - (b)) & __SHIFTMASK(a)))
-#define CLI_ROR(a, b) a = (a >> ((b) & __SHIFTMASK(a))) | (a << ((__SHIFTBITS(a) - (b)) & __SHIFTMASK(a)))
+#define CLI_ROL(a, b) a = (a << ((b)&__SHIFTMASK(a))) | (a >> ((__SHIFTBITS(a) - (b)) & __SHIFTMASK(a)))
+#define CLI_ROR(a, b) a = (a >> ((b)&__SHIFTMASK(a))) | (a << ((__SHIFTBITS(a) - (b)) & __SHIFTMASK(a)))
 
 /* Implementation independent sign-extended signed right shift */
 #ifdef HAVE_SAR

libclamav/scanners.c

@@ -4551,6 +4551,12 @@ cl_error_t cli_magic_scan(cli_ctx *ctx, cli_file_t type)
                 ret = scan_onenote(ctx);
             break;
 
+        case CL_TYPE_ALZ:
+            if (SCAN_PARSE_ARCHIVE && (DCONF_ARCH & ARCH_CONF_ALZ)) {
+                ret = cli_scanalz(ctx);
+            }
+            break;
+
         case CL_TYPE_LHA_LZH:
             if (SCAN_PARSE_ARCHIVE && (DCONF_ARCH & ARCH_CONF_LHA_LZH))
                 ret = scan_lha_lzh(ctx);

libclamav/sis.c

@@ -628,7 +628,7 @@ enum { T_INVALID,
 
 const char *sisfields[] = {"Invalid", "String", "Array", "Compressed", "Version", "VersionRange", "Date", "Time", "DateTime", "Uid", "Unused", "Language", "Contents", "Controller", "Info", "SupportedLanguages", "SupportedOptions", "Prerequisites", "Dependency", "Properties", "Property", "Signatures", "CertificateChain", "Logo", "FileDescription", "Hash", "If", "ElseIf", "InstallBlock", "Expression", "Data", "DataUnit", "FileData", "SupportedOption", "ControllerChecksum", "DataChecksum", "Signature", "Blob", "SignatureAlgorithm", "SignatureCertificateChain", "DataIndex", "Capabilities"};
 
-#define ALIGN4(x) (((x) & ~3) + ((((x) & 1) | (((x) >> 1) & 1)) << 2))
+#define ALIGN4(x) (((x) & ~3) + ((((x)&1) | (((x) >> 1) & 1)) << 2))
 
 #define HERE printf("here\n"), abort();
 

libclamav_rust/Cargo.toml

@@ -22,6 +22,9 @@ unicode-segmentation = "1.10"
 bindgen = "0.65"
 onenote_parser = { git = "https://github.com/Cisco-Talos/onenote.rs.git", branch = "CLAM-2329-new-from-slice" }
 hex-literal = "0.4"
+inflate = "0.4"
+bzip2-rs = "0.1"
+byteorder = "1.5"
 delharc = "0.5"
 
 [lib]

libclamav_rust/cbindgen.toml

@@ -37,6 +37,7 @@ include = [
   "evidence::evidence_add_indicator",
   "evidence::IndicatorType",
   "scanners::scan_onenote",
+  "scanners::cli_scanalz",
 ]
 
 # prefix = "CAPI_"