Merge pull request #2725 in SNORT/snort3 from ~MIALTIZE/snort3:3_1_1_0 to master

Squashed commit of the following:

commit 094794410a5872f3da801bc83644d481489dcfb1
Author: Michael Altizer <mialtize@cisco.com>
Date:   Thu Jan 28 10:46:22 2021 -0500

    build: Generate and tag 3.1.1.0

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a7219cd3744a7bfa308b94e9c4a3b856216e0290..401e25228273757b61adfd2cda6705f3afb71856 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ project (snort CXX C)
 
 set (VERSION_MAJOR 3)
 set (VERSION_MINOR 1)
-set (VERSION_PATCH 0)
+set (VERSION_PATCH 1)
 set (VERSION_SUBLEVEL 0)
 set (VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.${VERSION_SUBLEVEL}")
 

diff --git a/ChangeLog b/ChangeLog
index 66dfd7508dcaa387eae5dc04ee88f5cbee428387..5a609eb29e740900d007b466fa8ce7a6a04b8b5f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,27 @@
+2021/01/28 - 3.1.1.0
+
+-- appid: Add support for snmpv3 report pdu
+-- appid: Always store container session api object in stash
+-- appid: Do not process sip event for an existing session after detector reload
+-- appid: Remove unused code; cleanup FIXIT comments related to reload
+-- appid: Send reload detectors and third-party messages to socket immediately if appid is not
+   enabled
+-- codecs: Update tcp naptha check to make sure it is ipv4 traffic
+-- file_api: Remove file context after file name set if processing is complete
+-- file_api: Stop processing signature when type verdict is 'FILE_VERDICT_STOP'
+-- flow: Update direction and interface info in HA flow
+-- ftp: Use Stream packet holding to handle ftp-data EoF
+-- http_inspect: Add chunked processing to dev notes
+-- http_inspect: Provide file_id to set file name and read new return value
+-- http_inspect: Validate and normalize scheme
+-- http_inspect: Validate URI scheme length
+-- inspector: Add a global reference count for uses that are not thread specific
+-- lrucache: Changes for memcap for support constant cache objects with variable size.
+-- managers: Clean all inactive inspectors warning about ones that are still referenced
+-- mime: Provide file_id to set file name and read new return value
+-- payload_injector: Inject settings frame
+-- rna: Minimize synchronization overhead
+
 2021/01/13 - 3.1.0.0
 
 -- appid: Store stats in map

diff --git a/doc/reference/snort_reference.text b/doc/reference/snort_reference.text
index 4c229ffddb24a1b55639152d494024bb8b42a389..217ce759fbcc2dcc5fd21c3baa4b9a285fbf9780 100644 (file)
--- a/doc/reference/snort_reference.text
+++ b/doc/reference/snort_reference.text
@@ -8,7 +8,7 @@ Snort 3 Reference Manual
 The Snort Team
 
 Revision History
-Revision 3.1.0.0 2021-01-13 13:25:56 EST TST
+Revision 3.1.1.0 2021-01-28 10:50:42 EST TST
 
 ---------------------------------------------------------------------
 
@@ -3833,6 +3833,7 @@ Rules:
   * 119:260 (http_inspect) HTTP Content-Length message body was
     truncated
   * 119:261 (http_inspect) HTTP chunked message body was truncated
+  * 119:262 (http_inspect) HTTP URI scheme longer than 10 characters
 
 Peg counts:
 
@@ -11655,6 +11656,7 @@ these libraries see the Getting Started section of the manual.
   * 119:260 (http_inspect) HTTP Content-Length message body was
     truncated
   * 119:261 (http_inspect) HTTP chunked message body was truncated
+  * 119:262 (http_inspect) HTTP URI scheme longer than 10 characters
   * 121:1 (http2_inspect) invalid flag set on HTTP/2 frame
   * 121:2 (http2_inspect) HPACK integer value has leading zeros
   * 121:3 (http2_inspect) HTTP/2 stream initiated with invalid stream

diff --git a/doc/upgrade/snort_upgrade.text b/doc/upgrade/snort_upgrade.text
index f0e146ab4d670eb2632a01933ac199be9826c5a5..135d029dbc781002f85e19a302967ff00a7beb7b 100644 (file)
--- a/doc/upgrade/snort_upgrade.text
+++ b/doc/upgrade/snort_upgrade.text
@@ -8,7 +8,7 @@ Snort 3 Upgrade Manual
 The Snort Team
 
 Revision History
-Revision 3.1.0.0 2021-01-13 13:25:45 EST TST
+Revision 3.1.1.0 2021-01-28 10:50:31 EST TST
 
 ---------------------------------------------------------------------
 

diff --git a/doc/user/snort_user.text b/doc/user/snort_user.text
index 44a6627d1ba013e5256582db25f29c764959b762..86d3c73ef20b176d0f354d93b2e4178cb7d9e7ac 100644 (file)
--- a/doc/user/snort_user.text
+++ b/doc/user/snort_user.text
@@ -8,7 +8,7 @@ Snort 3 User Manual
 The Snort Team
 
 Revision History
-Revision 3.1.0.0 2021-01-13 13:25:45 EST TST
+Revision 3.1.1.0 2021-01-28 10:50:32 EST TST
 
 ---------------------------------------------------------------------