From: Victor Julien <victor@inliniac.net>
Date: Tue, 17 Sep 2019 13:01:45 +0000 (+0200)
Subject: smtp: fix file_data inspection
X-Git-Tag: suricata-5.0.0-rc1~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d4bc46038133a26ac0010ef64c865746f95814c7;p=thirdparty%2Fsuricata.git

smtp: fix file_data inspection

Continue tracking data if API is used with detect. Detection engine
then manages the tracking.

Bug #2395.
---

diff --git a/src/util-file.c b/src/util-file.c
index 4d21f5c6e9..88a086adce 100644
--- a/src/util-file.c
+++ b/src/util-file.c
@@ -609,7 +609,8 @@ static int FileAppendDataDo(File *ff, const uint8_t *data, uint32_t data_len)
         SCReturnInt(-1);
     }
 
-    if (FileStoreNoStoreCheck(ff) == 1) {
+    if ((ff->flags & FILE_USE_DETECT) == 0 &&
+            FileStoreNoStoreCheck(ff) == 1) {
 #ifdef HAVE_NSS
         int hash_done = 0;
         /* no storage but forced hashing */