@@ -528,7 +528,7 @@ ole2_walk_property_tree(ole2_header_t * hdr, const char *dir, int32_t prop_index

 {

     property_t      prop_block[4];

     int32_t         idx, current_block, i, curindex;

-    char           *dirname;

+    char           *name, *dirname;

     ole2_list_t     node_list;

     int             ret, func_ret;

@@ -698,6 +698,18 @@ ole2_walk_property_tree(ole2_header_t * hdr, const char *dir, int32_t prop_index

         case 1:                /* Directory */

             ole2_listmsg("directory node\n");

             if (dir) {

+#if HAVE_JSON

+                if ((ctx->options & CL_SCAN_FILE_PROPERTIES) && (ctx->wrkproperty != NULL)) {

+                    if (json_object_object_get(ctx->wrkproperty, "DigitalSignatures") == NULL) {

+                        name = get_property_name2(prop_block[idx].name, prop_block[idx].name_size);

+                        cli_dbgmsg("[dir] %s\n", name);

+                        if (name && (!strcmp(name, "_xmlsignatures") || !strcmp(name, "_signatures"))) {

+                            cli_jsonbool(ctx->wrkproperty, "DigitalSignatures", 1);

+                            free(name);

+                        }

+                    }

+                }

+#endif

                 dirname = (char *)cli_malloc(strlen(dir) + 8);

                 if (!dirname) {

 		    ole2_listmsg("OLE2: malloc failed for dirname\n");

@@ -472,7 +472,7 @@ static int ooxml_extn_cb(int fd, cli_ctx *ctx)

 static int ooxml_content_cb(int fd, cli_ctx *ctx)

 {

     int ret = CL_SUCCESS;

-    int core=0, extn=0, cust=0;

+    int core=0, extn=0, cust=0, dsig=0;

     const xmlChar *name, *value, *CT, *PN;

     xmlTextReaderPtr reader = NULL;

     uint32_t loff;

@@ -542,10 +542,23 @@ static int ooxml_content_cb(int fd, cli_ctx *ctx)

             else {

                 cli_dbgmsg("ooxml_content_cb: found custom properties file \"%s\" @ %x\n", PN, loff);

                 /* custom properties ignored for now */

+                cli_jsonbool(ctx->wrkproperty, "CustomProperties", 1);

                 //ret = unzip_single_internal(ctx, loff, ooxml_cust_cb);

             }

             cust = 1;

         }

+        else if (!dsig && !xmlStrcmp(CT, "application/vnd.openxmlformats-package.digital-signature-xmlsignature+xml")) {

+            if (unzip_search(ctx, PN+1, xmlStrlen(PN)-1, &loff) != CL_VIRUS) {

+                cli_dbgmsg("cli_process_ooxml: failed to find digital signature file \"%s\"!\n", PN);

+            }

+            else {

+                cli_dbgmsg("ooxml_content_cb: found digital signature file \"%s\" @ %x\n", PN, loff);

+                /* digital signatures ignored for now */

+                cli_jsonbool(ctx->wrkproperty, "DigitalSignatures", 1);

+                //ret = unzip_single_internal(ctx, loff, ooxml_dsig_cb);

+            }

+            dsig = 1;

+        }

         if (ret != CL_SUCCESS)

             goto ooxml_content_exit;