From: Russ Combs <rucombs@cisco.com>
Date: Tue, 16 Jun 2015 15:21:12 +0000 (-0400)
Subject: Squashed commit of the following:
X-Git-Tag: 3.0.0-233~947
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=857c3eb2baa4acf600fc1e9271fca5cd1ff1d19f;p=thirdparty%2Fsnort3.git

Squashed commit of the following:

commit 9305b4efbfef9657155bb19accf09fcfa64d4878
Author: Bhagyashree Bantwal <bbantwal@cisco.com>
Date:   Tue Jun 16 11:07:24 2015 -0400

    ssl assertion change
---

diff --git a/src/service_inspectors/ssl/ssl_inspector.cc b/src/service_inspectors/ssl/ssl_inspector.cc
index 33670957c..76c4861d6 100644
--- a/src/service_inspectors/ssl/ssl_inspector.cc
+++ b/src/service_inspectors/ssl/ssl_inspector.cc
@@ -445,7 +445,7 @@ void Ssl::show(SnortConfig*)
 void Ssl::eval(Packet* p)
 {
     // precondition - what we registered for
-    assert(p->is_tcp() && p->dsize && p->data);
+    assert(p->has_tcp_data());
 
     ++sslstats.total_packets;
     snort_ssl(config, p);