From: Russ Combs <rucombs@cisco.com>
Date: Thu, 11 Jun 2015 19:56:29 +0000 (-0400)
Subject: build 157
X-Git-Tag: 3.0.0-233~950
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bb04da72bc5965f10714cb5d13d99cfb3fd57add;p=thirdparty%2Fsnort3.git

build 157
---

diff --git a/ChangeLog b/ChangeLog
index 1c3824c07..f1f7a5a7f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
-Pending - build 157
+15/06/11 - build 157
 
+-- port ssl from snort
 -- fix stream_tcp so call splitter finish only if scan was called
 -- changed drop rules drop current packet only
 -- unchanged block rules block all packets on flow
diff --git a/doc/config_changes.txt b/doc/config_changes.txt
index 641773862..ce91ebe68 100644
--- a/doc/config_changes.txt
+++ b/doc/config_changes.txt
@@ -138,6 +138,7 @@ change -> sfportscan: 'proto' ==> 'protos'
 change -> sfportscan: 'scan_type' ==> 'scan_types'
 change -> smtp: 'ports' ==> 'bindings'
 change -> ssh: 'server_ports' ==> 'bindings'
+change -> ssl: 'ports' ==> 'bindings'
 change -> stream5_global: 'max_active_responses' ==> 'max_responses'
 change -> stream5_global: 'max_icmp' ==> 'max_sessions'
 change -> stream5_global: 'max_ip' ==> 'max_sessions'
@@ -282,6 +283,7 @@ deleted -> ssh: 'enable_recognition'
 deleted -> ssh: 'enable_respoverflow'
 deleted -> ssh: 'enable_srvoverflow'
 deleted -> ssh: 'enable_ssh1crc32'
+deleted -> ssl: 'noinspect_encrypted'
 deleted -> stream5_global: 'disabled'
 deleted -> stream5_global: 'flush_on_alert'
 deleted -> stream5_global: 'no_midstream_drop_alerts'
diff --git a/src/main/build.h b/src/main/build.h
index 7b208e004..55fc1b044 100644
--- a/src/main/build.h
+++ b/src/main/build.h
@@ -7,5 +7,5 @@
 //                                               //
 //-----------------------------------------------//
 
-#define BUILD "156"
+#define BUILD "157"
 
diff --git a/src/service_inspectors/ssl/ssl_inspector.cc b/src/service_inspectors/ssl/ssl_inspector.cc
index 77a9f1af2..33670957c 100644
--- a/src/service_inspectors/ssl/ssl_inspector.cc
+++ b/src/service_inspectors/ssl/ssl_inspector.cc
@@ -157,8 +157,8 @@ static inline bool SSLPP_is_encrypted(SSL_PROTO_CONF* config, uint32_t ssl_flags
     return false;
 }
 
-static inline uint32_t SSLPP_process_alert(SSL_PROTO_CONF* config, uint32_t ssn_flags, uint32_t
-    new_flags, Packet* packet)
+static inline uint32_t SSLPP_process_alert(
+    SSL_PROTO_CONF*, uint32_t ssn_flags, uint32_t new_flags, Packet* packet)
 {
     DEBUG_WRAP(DebugMessage(DEBUG_SSL, "Process Alert\n"); );