Merge pull request #981 in SNORT/snort3 from siri1 to master

Squashed commit of the following:

commit 715c0a144bfe9fb3617b3c2b6aad2e7a6a5b68d9
Author: Steve Chew <stechew@cisco.com>
Date:   Fri Jul 28 17:18:05 2017 -0400

    Enable SSL certificate pattern matching for AppId.

diff --git a/src/network_inspectors/appid/lua_detector_api.cc b/src/network_inspectors/appid/lua_detector_api.cc
index d93d0cd18242e3073ff1ea63fcdb0fbb29228dc6..aac5b1e652ccc802e797f9ac55adb200e5017115 100644 (file)
--- a/src/network_inspectors/appid/lua_detector_api.cc
+++ b/src/network_inspectors/appid/lua_detector_api.cc
@@ -974,18 +974,13 @@ static int detector_add_ssl_cert_pattern(lua_State* L)
         return 0;
     }
 
-#ifdef REMOVED_WHILE_NOT_IN_USE
     uint8_t* pattern_str = (uint8_t*)snort_strdup(tmp_string);
-    if (!ssl_add_cert_pattern(pattern_str, pattern_size, type, app_id,
-        &ud->appid_config->serviceSslConfig))
+    if (!ssl_add_cert_pattern(pattern_str, pattern_size, type, app_id))
     {
         snort_free(pattern_str);
         ErrorMessage("Failed to add an SSL pattern list member");
         return 0;
     }
-#else
-    UNUSED(type);
-#endif
 
     AppInfoManager::get_instance().set_app_info_active(app_id);
     return 0;

diff --git a/src/network_inspectors/appid/service_plugins/service_ssl.cc b/src/network_inspectors/appid/service_plugins/service_ssl.cc
index 6cbf16040fe129404858b8822e989d706a398f41..84fab4e09b7b645a107e32b01abe247dfffeea82 100644 (file)
--- a/src/network_inspectors/appid/service_plugins/service_ssl.cc
+++ b/src/network_inspectors/appid/service_plugins/service_ssl.cc
@@ -1028,7 +1028,7 @@ static int ssl_scan_patterns(SearchTool* matcher, const uint8_t* data, size_t si
         }
         tmpMp = mp;
         mp = mp->next;
-        free (tmpMp);
+        snort_free (tmpMp);
     }
     if (!best_match)
         return 0;
@@ -1123,7 +1123,7 @@ static void ssl_patterns_free(DetectorSSLCertPattern** list)
         {
             if (tmp_pattern->dpattern->pattern)
                 snort_free(tmp_pattern->dpattern->pattern);
-            free (tmp_pattern->dpattern);
+            snort_free (tmp_pattern->dpattern);
         }
         snort_free(tmp_pattern);
     }