From c1cec7aec7e1a175b3ef1db53ebfb105fe0f21d9 Mon Sep 17 00:00:00 2001 From: Christian Kreibich Date: Thu, 5 Jun 2025 17:22:01 -0700 Subject: [PATCH] Suppress warnings on deprecated DPD scripts during Zeekygen Also fix corresponding baseline. --- scripts/zeekygen/__load__.zeek | 10 ++++++++++ .../btest/Baseline/coverage.bare-mode-errors/errors | 2 -- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/scripts/zeekygen/__load__.zeek b/scripts/zeekygen/__load__.zeek index eaec660a80..c2c2832940 100644 --- a/scripts/zeekygen/__load__.zeek +++ b/scripts/zeekygen/__load__.zeek @@ -2,7 +2,12 @@ # Scripts which are commented out in test-all-policy.zeek. @load frameworks/analyzer/deprecated-dpd-log.zeek + +# Remove in v8.1: replaced by frameworks/analyzer/detect-protocols.zeek +@pragma push ignore-deprecations @load frameworks/dpd/detect-protocols.zeek +@pragma pop ignore-deprecations + @load protocols/ssl/decryption.zeek @ifdef ( Cluster::CLUSTER_BACKEND_ZEROMQ ) @load frameworks/cluster/backend/zeromq/connect.zeek @@ -10,7 +15,12 @@ @load frameworks/cluster/nodes-experimental/manager.zeek @load frameworks/control/controllee.zeek @load frameworks/control/controller.zeek + +# Remove in v8.1: replaced by frameworks/analyzer/packet-segment-logging.zeek +@pragma push ignore-deprecations @load frameworks/dpd/packet-segment-logging.zeek +@pragma pop ignore-deprecations + @load frameworks/management/agent/main.zeek @load frameworks/management/controller/main.zeek @load frameworks/management/node/__load__.zeek diff --git a/testing/btest/Baseline/coverage.bare-mode-errors/errors b/testing/btest/Baseline/coverage.bare-mode-errors/errors index 34e3f35578..e62eb8dd19 100644 --- a/testing/btest/Baseline/coverage.bare-mode-errors/errors +++ b/testing/btest/Baseline/coverage.bare-mode-errors/errors @@ -1,7 +1,5 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. ### NOTE: This file has been sorted with diff-sort. -warning in <...>/detect-protocols.zeek, line 1: deprecated script loaded from <...>/__load__.zeek:5 ("frameworks<...>/detect-protocols.zeek moved to frameworks<...>/detect-protocols.zeek. Please switch to frameworks<...>/detect-protocols.zeek. Remove in 8.1") warning in <...>/detect-protocols.zeek, line 1: deprecated script loaded from command line arguments ("frameworks<...>/detect-protocols.zeek moved to frameworks<...>/detect-protocols.zeek. Please switch to frameworks<...>/detect-protocols.zeek. Remove in 8.1") warning in <...>/detect-sqli.zeek, line 16: deprecated script loaded from command line arguments "Remove in v8.1: Switch to the improved detect-sql-injection script" -warning in <...>/packet-segment-logging.zeek, line 1: deprecated script loaded from <...>/__load__.zeek:13 ("Please switch to frameworks<...>/packet-segment-logging, which logs to analyzer.log. Remove in 8.1") warning in <...>/packet-segment-logging.zeek, line 1: deprecated script loaded from command line arguments ("Please switch to frameworks<...>/packet-segment-logging, which logs to analyzer.log. Remove in 8.1")