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 33670957c51fd862286cf597d23c55381b4a3baf..76c4861d6e6c6c91cc13ea044513be9f9e6472cd 100644 (file)
--- 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);