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

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 67c50769281ee5ef32a28762ee1e9f22aa00f8b7..1b90ec30463f8babefab2746855494589bc0cc0c 100644 (file)
--- 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);