Pull request #3866: build: generate and tag 3.1.63.0

Merge in SNORT/snort3 from ~PRBG/snort3:build_3.1.63.0 to master

Squashed commit of the following:

commit a13e97e42f217a66596af5add0744ef034e37d74
Author: Priyanka Gurudev <prbg@cisco.com>
Date:   Thu Jun 1 16:10:04 2023 -0400

    build: generate and tag 3.1.63.0

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dfc7da10db807b499bc377965d8cff53e84037c2..86bdcef30df3906f90d4bf2f5fcfe6b2d74214fa 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 62)
+set (VERSION_PATCH 63)
 set (VERSION_SUBLEVEL 0)
 set (VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.${VERSION_SUBLEVEL}")
 

diff --git a/ChangeLog.md b/ChangeLog.md
index e36f867a6e0d97eeb9bf9b56bef40ed32d43f42e..e72735a5d2220347d8194baf4a82e459a0a2dac6 100644 (file)
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,14 @@
+2023-06-01: 3.1.63.0
+
+* appid: changes logic in ssl pattern matching
+* http_inspect: rebuild start line
+* loggers: reuse sensor_id u2 event field for tenant_id value
+* main: add Pig destructor to free dynamic memory
+* main: allow network IDs to use up to 32 bits.
+* main: handling the return code in case of error in creation of daq instance
+* perf_monitor: fix data bus subscription
+* stream_tcp: account for data from zero window probes
+
 2023-05-21: 3.1.62.0
 
 * appid: added logic to check for encrypted appid before assigning SSL service based on port

diff --git a/doc/reference/snort_reference.text b/doc/reference/snort_reference.text
index 62fd22798026f61329f53e1809f3bdd0f8fdc109..fedfe29eed5a95d935ddfd0aa7b12e6545fa7781 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.62.0 2023-05-21 12:06:30 EDT TST
+Revision 3.1.63.0 2023-06-01 16:02:55 EDT TST
 
 ---------------------------------------------------------------------
 
@@ -1127,7 +1127,7 @@ Configuration:
   * multi network.checksum_eval = all: checksums to verify { all | ip
     | noip | tcp | notcp | udp | noudp | icmp | noicmp | none }
   * int network.id = 0: correlate unified2 events with configuration
-    { 0:65535 }
+    { 0:max32 }
   * int network.min_ttl = 1: alert / normalize packets with lower TTL
     / hop limit (you must enable rules and / or normalization also) {
     1:255 }
@@ -5897,6 +5897,8 @@ Peg counts:
     (max)
   * stream_tcp.zero_len_tcp_opt: number of zero length tcp options
     (sum)
+  * stream_tcp.zero_win_probes: number of tcp zero window probes
+    (sum)
 
 
 5.52. stream_udp
@@ -9997,7 +9999,7 @@ libraries see the Getting Started section of the manual.
   * multi network.checksum_eval = all: checksums to verify { all | ip
     | noip | tcp | notcp | udp | noudp | icmp | noicmp | none }
   * int network.id = 0: correlate unified2 events with configuration
-    { 0:65535 }
+    { 0:max32 }
   * int network.layers = 40: the maximum number of protocols that
     Snort can correctly decode { 3:255 }
   * int network.max_ip6_extensions = 0: the maximum number of IP6
@@ -12176,6 +12178,8 @@ libraries see the Getting Started section of the manual.
   * stream_tcp.untracked: tcp packets not tracked (sum)
   * stream_tcp.zero_len_tcp_opt: number of zero length tcp options
     (sum)
+  * stream_tcp.zero_win_probes: number of tcp zero window probes
+    (sum)
   * stream.total_prunes: total sessions pruned (sum)
   * stream_udp.created: udp session trackers created (sum)
   * stream_udp.ignored: udp packets ignored (sum)

diff --git a/doc/upgrade/snort_upgrade.text b/doc/upgrade/snort_upgrade.text
index a4615af92f82dea1abe95de645748e0c420997be..c8c86e1b1809dd6c6fa39eb02a854fb187e680f2 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.62.0 2023-05-21 12:07:36 EDT TST
+Revision 3.1.63.0 2023-06-01 16:03:43 EDT TST
 
 ---------------------------------------------------------------------
 

diff --git a/doc/user/snort_user.text b/doc/user/snort_user.text
index 209eb7cf2185867ef57fca8835a07b1ad590d793..a63db29a983bec66ae6e2f6455ed2b889b133abe 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.62.0 2023-05-21 12:06:51 EDT TST
+Revision 3.1.63.0 2023-06-01 16:03:11 EDT TST
 
 ---------------------------------------------------------------------