From: Russ Combs (rucombs) <rucombs@cisco.com>
Date: Thu, 1 Dec 2016 02:07:29 +0000 (-0500)
Subject: Merge pull request #732 in SNORT/snort3 from lockfix1 to master
X-Git-Tag: 3.0.0-233~167
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fbf0225ff7729f74454c69df10641b09f94e9108;p=thirdparty%2Fsnort3.git

Merge pull request #732 in SNORT/snort3 from lockfix1 to master

Squashed commit of the following:

commit 45aa613f821d70b0e8e7cfb1d884c8047bd385c8
Author: Steve Chew <stechew@cisco.com>
Date:   Wed Nov 30 19:40:19 2016 -0500

    Removed unneeded lock.
---

diff --git a/src/network_inspectors/appid/service_plugins/service_ssl.cc b/src/network_inspectors/appid/service_plugins/service_ssl.cc
index b838f1098..eec2edc85 100644
--- a/src/network_inspectors/appid/service_plugins/service_ssl.cc
+++ b/src/network_inspectors/appid/service_plugins/service_ssl.cc
@@ -605,7 +605,6 @@ static bool parse_certificates(ServiceSSLData* ss)
             ss->org_name_strlen    = org_name_tot_len - 1;       /* Minus terminator. */
         }
 
-        crypto_lib_mutex.lock();
         while (certs_head)
         {
             certs_curr = certs_head;