From: Shravan Rangarajuvenkata (shrarang) <shrarang@cisco.com>
Date: Thu, 30 Apr 2020 15:45:42 +0000 (+0000)
Subject: Merge pull request #2188 in SNORT/snort3 from ~SATHIRKA/snort3:tls_decryption to... 
X-Git-Tag: 3.0.1-3~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=79d0e6ec6404db53bb22869b413b648b81fdafe9;p=thirdparty%2Fsnort3.git

Merge pull request #2188 in SNORT/snort3 from ~SATHIRKA/snort3:tls_decryption to master

Squashed commit of the following:

commit ea235de539cf4d7a36d07983133e1137e8fcccd1
Author: Sreeja Athirkandathil Narayanan <sathirka@cisco.com>
Date:   Wed Apr 29 11:39:52 2020 -0400

    appid: Update miscellaneous appid on first decrypted packet
---

diff --git a/src/network_inspectors/appid/appid_discovery.cc b/src/network_inspectors/appid/appid_discovery.cc
index 67c507692..1b90ec304 100644
--- a/src/network_inspectors/appid/appid_discovery.cc
+++ b/src/network_inspectors/appid/appid_discovery.cc
@@ -937,7 +937,10 @@ void AppIdDiscovery::do_post_discovery(Packet* p, AppIdSession& asd,
         if (asd.get_session_flags(APPID_SESSION_DECRYPTED))
         {
             if (asd.misc_app_id == APP_ID_NONE)
+            {
                 asd.update_encrypted_app_id(service_id);
+                misc_id = asd.misc_app_id;
+            }
         }
         else if (is_discovery_done and asd.get_session_flags(APPID_SESSION_DECRYPT_MONITOR))
             asd.set_session_flags(APPID_SESSION_CONTINUE);