@@ -912,6 +912,11 @@ int recvloop_th(int *socketds, unsigned nsockets, struct cl_engine *engine, unsi

 	    options |= CL_SCAN_STRUCTURED_SSN_STRIPPED;

     }

+#ifdef HAVE__INTERNAL__SHA_COLLECT

+    if(optget(opts, "DevCollectHashes")->enabled)

+	options |= CL_SCAN_INTERNAL_COLLECT_SHA;

+#endif

+

     selfchk = optget(opts, "SelfCheck")->numarg;

     if(!selfchk) {

 	logg("Self checking disabled.\n");

@@ -523,6 +523,11 @@ int scanmanager(const struct optstruct *opts)

     if(optget(opts, "algorithmic-detection")->enabled)

 	options |= CL_SCAN_ALGORITHMIC;

+#ifdef HAVE__INTERNAL__SHA_COLLECT

+    if(optget(opts, "dev-collect-hashes")->enabled)

+	options |= CL_SCAN_INTERNAL_COLLECT_SHA;

+#endif

+

     if(optget(opts, "detect-structured")->enabled) {

 	options |= CL_SCAN_STRUCTURED;

@@ -109,6 +109,8 @@ typedef enum {

 #define CL_SCAN_PARTIAL_MESSAGE         0x40000

 #define CL_SCAN_HEURISTIC_PRECEDENCE    0x80000

+#define CL_SCAN_INTERNAL_COLLECT_SHA    0x80000000 /* Enables hash output in sha-collect builds - for internal use only */

+

 /* recommended scan settings */

 #define CL_SCAN_STDOPT		(CL_SCAN_ARCHIVE | CL_SCAN_MAIL | CL_SCAN_OLE2 | CL_SCAN_PDF | CL_SCAN_HTML | CL_SCAN_PE | CL_SCAN_ALGORITHMIC | CL_SCAN_ELF)

@@ -394,7 +394,7 @@ int cli_checkfp(unsigned char *digest, size_t size, cli_ctx *ctx)

     cli_dbgmsg("FP SIGNATURE: %s:%u:%s\n", md5, (unsigned int) size, *ctx->virname ? *ctx->virname : "Name");

 #ifdef HAVE__INTERNAL__SHA_COLLECT

-    if(ctx->sha_collect>0) {

+    if((ctx->options & CL_SCAN_INTERNAL_COLLECT_SHA) && ctx->sha_collect>0) {

         SHA1Context sha1;

         SHA256_CTX sha256;

         fmap_t *map = *ctx->fmap;

@@ -2345,7 +2345,7 @@ int cl_scandesc(int desc, const char **virname, unsigned long int *scanned, cons

     ctx.hook_lsig_matches = cli_bitset_init();

 #ifdef HAVE__INTERNAL__SHA_COLLECT

-    do {

+    if(scanoptions & CL_SCAN_INTERNAL_COLLECT_SHA) {

 	char link[32];

 	ssize_t linksz;

@@ -329,6 +329,10 @@ const struct clam_option __clam_options[] = {

     { "DevACDepth", "dev-ac-depth", 0, TYPE_NUMBER, MATCH_NUMBER, -1, NULL, FLAG_HIDDEN, OPT_CLAMD | OPT_CLAMSCAN, "", "" },

+#ifdef HAVE__INTERNAL__SHA_COLLECT

+    { "DevCollectHashes", "dev-collect-hashes", 0, TYPE_BOOL, MATCH_BOOL, -1, NULL, FLAG_HIDDEN, OPT_CLAMD | OPT_CLAMSCAN, "", "" },

+#endif

+

     /* Freshclam-only entries */

     /* FIXME: drop this entry and use LogFile */