diff --git a/testing/btest/core/history-flip.zeek b/testing/btest/core/history-flip.zeek index c62c1ce77d..b14c3671c0 100644 --- a/testing/btest/core/history-flip.zeek +++ b/testing/btest/core/history-flip.zeek @@ -2,5 +2,4 @@ # @TEST-EXEC: btest-diff conn.log @load base/protocols/http -@load base/frameworks/dpd @load policy/protocols/conn/mac-logging diff --git a/testing/btest/core/pcap/dynamic-filter.zeek b/testing/btest/core/pcap/dynamic-filter.zeek index ccd5f83a3d..529a2ece0a 100644 --- a/testing/btest/core/pcap/dynamic-filter.zeek +++ b/testing/btest/core/pcap/dynamic-filter.zeek @@ -5,7 +5,6 @@ @load base/protocols/conn @load base/protocols/http @load base/protocols/dns -@load base/frameworks/dpd redef enum PcapFilterID += { A, B }; diff --git a/testing/btest/core/radiotap.zeek b/testing/btest/core/radiotap.zeek index 2e4cb58a3b..21272408ec 100644 --- a/testing/btest/core/radiotap.zeek +++ b/testing/btest/core/radiotap.zeek @@ -3,4 +3,3 @@ @load base/protocols/conn @load base/protocols/dns -@load base/frameworks/dpd diff --git a/testing/btest/core/tcp/miss-end-data.zeek b/testing/btest/core/tcp/miss-end-data.zeek index 180913c0ac..0e4e2e66db 100644 --- a/testing/btest/core/tcp/miss-end-data.zeek +++ b/testing/btest/core/tcp/miss-end-data.zeek @@ -4,7 +4,6 @@ @load base/protocols/conn @load base/protocols/http -@load base/frameworks/dpd redef report_gaps_for_partial = T; diff --git a/testing/btest/core/tcp/missing-syn.zeek b/testing/btest/core/tcp/missing-syn.zeek index 9ab6414743..23bf9f3a49 100644 --- a/testing/btest/core/tcp/missing-syn.zeek +++ b/testing/btest/core/tcp/missing-syn.zeek @@ -3,4 +3,3 @@ @load base/protocols/conn @load base/protocols/http -@load base/frameworks/dpd diff --git a/testing/btest/core/tunnels/ayiya.test b/testing/btest/core/tunnels/ayiya.test index c07139babb..3c6401f604 100644 --- a/testing/btest/core/tunnels/ayiya.test +++ b/testing/btest/core/tunnels/ayiya.test @@ -6,4 +6,3 @@ @load base/protocols/tunnels @load base/protocols/conn @load base/protocols/http -@load base/frameworks/dpd diff --git a/testing/btest/core/tunnels/geneve.zeek b/testing/btest/core/tunnels/geneve.zeek index edfd79f689..8d344c0dc5 100644 --- a/testing/btest/core/tunnels/geneve.zeek +++ b/testing/btest/core/tunnels/geneve.zeek @@ -4,7 +4,6 @@ # @TEST-EXEC: btest-diff tunnel.log @load base/frameworks/tunnels -@load base/frameworks/dpd @load base/protocols/conn event geneve_packet(c: connection, inner: pkt_hdr, vni: count) diff --git a/testing/btest/core/tunnels/gre-pptp.test b/testing/btest/core/tunnels/gre-pptp.test index 13b640077a..ddbd06246a 100644 --- a/testing/btest/core/tunnels/gre-pptp.test +++ b/testing/btest/core/tunnels/gre-pptp.test @@ -4,6 +4,5 @@ # @TEST-EXEC: btest-diff dns.log # @load base/frameworks/tunnels -@load base/frameworks/dpd @load base/protocols/conn @load base/protocols/dns diff --git a/testing/btest/core/tunnels/gre.test b/testing/btest/core/tunnels/gre.test index b7f4e06b8b..077e2f6a35 100644 --- a/testing/btest/core/tunnels/gre.test +++ b/testing/btest/core/tunnels/gre.test @@ -5,7 +5,6 @@ # @TEST-EXEC: btest-diff ssh.log # @load base/frameworks/tunnels -@load base/frameworks/dpd @load base/protocols/conn @load base/protocols/dns @load base/protocols/ssh diff --git a/testing/btest/core/tunnels/gtp/different_dl_and_ul.test b/testing/btest/core/tunnels/gtp/different_dl_and_ul.test index c8325b178d..79f43713c4 100644 --- a/testing/btest/core/tunnels/gtp/different_dl_and_ul.test +++ b/testing/btest/core/tunnels/gtp/different_dl_and_ul.test @@ -10,6 +10,5 @@ # seems to fail to correct the checksums when there's IP fragmentation). # @load base/frameworks/tunnels -@load base/frameworks/dpd @load base/protocols/conn @load base/protocols/http diff --git a/testing/btest/core/tunnels/gtp/inner_ipv6.test b/testing/btest/core/tunnels/gtp/inner_ipv6.test index cad9f0f9a6..451ad7bcd0 100644 --- a/testing/btest/core/tunnels/gtp/inner_ipv6.test +++ b/testing/btest/core/tunnels/gtp/inner_ipv6.test @@ -6,6 +6,5 @@ # there is sometimes already native IPv6. @load base/frameworks/tunnels -@load base/frameworks/dpd @load base/protocols/conn @load base/protocols/dns diff --git a/testing/btest/core/tunnels/gtp/opt_header.test b/testing/btest/core/tunnels/gtp/opt_header.test index c198df8034..4bb5a15ecf 100644 --- a/testing/btest/core/tunnels/gtp/opt_header.test +++ b/testing/btest/core/tunnels/gtp/opt_header.test @@ -9,7 +9,6 @@ @load base/protocols/conn @load base/protocols/ssl @load base/frameworks/tunnels -@load base/frameworks/dpd event gtpv1_g_pdu_packet(outer: connection, inner_gtp: gtpv1_hdr, inner_ip: pkt_hdr) { diff --git a/testing/btest/core/tunnels/teredo.zeek b/testing/btest/core/tunnels/teredo.zeek index d82e4acf2b..6deb603816 100644 --- a/testing/btest/core/tunnels/teredo.zeek +++ b/testing/btest/core/tunnels/teredo.zeek @@ -5,7 +5,6 @@ # @TEST-EXEC: btest-diff http.log @load base/frameworks/tunnels -@load base/frameworks/dpd @load base/frameworks/notice/weird @load base/protocols/tunnels @load base/protocols/conn diff --git a/testing/btest/core/tunnels/teredo_bubble_with_payload.test b/testing/btest/core/tunnels/teredo_bubble_with_payload.test index b0e664bf6b..83f9e3c3ac 100644 --- a/testing/btest/core/tunnels/teredo_bubble_with_payload.test +++ b/testing/btest/core/tunnels/teredo_bubble_with_payload.test @@ -6,7 +6,6 @@ # @TEST-EXEC: btest-diff weird.log @load base/frameworks/tunnels -@load base/frameworks/dpd @load base/frameworks/notice/weird @load base/protocols/tunnels @load base/protocols/conn diff --git a/testing/btest/core/tunnels/vxlan.zeek b/testing/btest/core/tunnels/vxlan.zeek index 6fa2f88c9a..cc1ae42fcf 100644 --- a/testing/btest/core/tunnels/vxlan.zeek +++ b/testing/btest/core/tunnels/vxlan.zeek @@ -4,7 +4,6 @@ # @TEST-EXEC: btest-diff tunnel.log @load base/frameworks/tunnels -@load base/frameworks/dpd @load base/protocols/conn event vxlan_packet(c: connection, inner: pkt_hdr, vni: count) diff --git a/testing/btest/core/vlan-mpls.zeek b/testing/btest/core/vlan-mpls.zeek index dfe4f881ec..acfff8dc36 100644 --- a/testing/btest/core/vlan-mpls.zeek +++ b/testing/btest/core/vlan-mpls.zeek @@ -3,4 +3,3 @@ @load base/protocols/conn @load base/protocols/http -@load base/frameworks/dpd diff --git a/testing/btest/core/wlanmon.zeek b/testing/btest/core/wlanmon.zeek index cfbf2cf327..7328f48242 100644 --- a/testing/btest/core/wlanmon.zeek +++ b/testing/btest/core/wlanmon.zeek @@ -3,4 +3,3 @@ @load base/protocols/conn @load base/protocols/dns -@load base/frameworks/dpd diff --git a/testing/btest/scripts/base/frameworks/analyzer/disable-analyzer.zeek b/testing/btest/scripts/base/frameworks/analyzer/disable-analyzer.zeek index afa2caa70b..ff457c3d70 100644 --- a/testing/btest/scripts/base/frameworks/analyzer/disable-analyzer.zeek +++ b/testing/btest/scripts/base/frameworks/analyzer/disable-analyzer.zeek @@ -7,7 +7,6 @@ @load base/protocols/conn @load base/protocols/dns @load base/protocols/ssh -@load base/frameworks/dpd redef Analyzer::disabled_analyzers += { Analyzer::ANALYZER_SSH }; diff --git a/testing/btest/scripts/base/frameworks/input/config/enum-set.zeek b/testing/btest/scripts/base/frameworks/input/config/enum-set.zeek index 1bfd964202..d5b0c7bbfb 100644 --- a/testing/btest/scripts/base/frameworks/input/config/enum-set.zeek +++ b/testing/btest/scripts/base/frameworks/input/config/enum-set.zeek @@ -8,7 +8,6 @@ DPD::ignore_violations Analyzer::ANALYZER_SYSLOG @TEST-END-FILE @load base/frameworks/config -@load base/frameworks/dpd redef exit_only_after_terminate = T; redef InputConfig::empty_field = "EMPTY"; diff --git a/testing/btest/scripts/base/frameworks/logging/sqlite/wikipedia.zeek b/testing/btest/scripts/base/frameworks/logging/sqlite/wikipedia.zeek index e1e0c0bf87..d7f601c1a7 100644 --- a/testing/btest/scripts/base/frameworks/logging/sqlite/wikipedia.zeek +++ b/testing/btest/scripts/base/frameworks/logging/sqlite/wikipedia.zeek @@ -12,4 +12,3 @@ @load base/protocols/http @load base/protocols/dns @load base/protocols/conn -@load base/frameworks/dpd diff --git a/testing/btest/scripts/base/frameworks/netcontrol/packetfilter.zeek b/testing/btest/scripts/base/frameworks/netcontrol/packetfilter.zeek index 329b12d16f..6fd8c8d780 100644 --- a/testing/btest/scripts/base/frameworks/netcontrol/packetfilter.zeek +++ b/testing/btest/scripts/base/frameworks/netcontrol/packetfilter.zeek @@ -4,7 +4,6 @@ @load base/protocols/conn @load base/protocols/smtp @load base/protocols/dns -@load base/frameworks/dpd @load base/frameworks/netcontrol event NetControl::init() diff --git a/testing/btest/scripts/base/protocols/ftp/cwd-navigation.zeek b/testing/btest/scripts/base/protocols/ftp/cwd-navigation.zeek index 7f04f573c1..b10adec833 100644 --- a/testing/btest/scripts/base/protocols/ftp/cwd-navigation.zeek +++ b/testing/btest/scripts/base/protocols/ftp/cwd-navigation.zeek @@ -5,7 +5,6 @@ @load base/protocols/conn @load base/protocols/ftp -@load base/frameworks/dpd # Make sure we're tracking the CWD correctly. event ftp_reply(c: connection, code: count, msg: string, cont_resp: bool) &priority=10 diff --git a/testing/btest/scripts/base/protocols/ftp/ftp-ipv4.zeek b/testing/btest/scripts/base/protocols/ftp/ftp-ipv4.zeek index 18d1890280..52887ce43e 100644 --- a/testing/btest/scripts/base/protocols/ftp/ftp-ipv4.zeek +++ b/testing/btest/scripts/base/protocols/ftp/ftp-ipv4.zeek @@ -6,4 +6,3 @@ @load base/protocols/conn @load base/protocols/ftp -@load base/frameworks/dpd diff --git a/testing/btest/scripts/base/protocols/ftp/ftp-ipv6.zeek b/testing/btest/scripts/base/protocols/ftp/ftp-ipv6.zeek index 5f33407223..fd1eec0c0d 100644 --- a/testing/btest/scripts/base/protocols/ftp/ftp-ipv6.zeek +++ b/testing/btest/scripts/base/protocols/ftp/ftp-ipv6.zeek @@ -6,4 +6,3 @@ @load base/protocols/conn @load base/protocols/ftp -@load base/frameworks/dpd diff --git a/testing/btest/scripts/base/protocols/http/http-connect-with-header.zeek b/testing/btest/scripts/base/protocols/http/http-connect-with-header.zeek index 9cdb8d1eae..89d409e50e 100644 --- a/testing/btest/scripts/base/protocols/http/http-connect-with-header.zeek +++ b/testing/btest/scripts/base/protocols/http/http-connect-with-header.zeek @@ -10,4 +10,3 @@ @load base/protocols/http @load base/protocols/ssl @load base/protocols/tunnels -@load base/frameworks/dpd diff --git a/testing/btest/scripts/base/protocols/http/http-connect.zeek b/testing/btest/scripts/base/protocols/http/http-connect.zeek index 9bf5d321b2..232bcf9608 100644 --- a/testing/btest/scripts/base/protocols/http/http-connect.zeek +++ b/testing/btest/scripts/base/protocols/http/http-connect.zeek @@ -10,4 +10,3 @@ @load base/protocols/http @load base/protocols/smtp @load base/protocols/tunnels -@load base/frameworks/dpd diff --git a/testing/btest/scripts/base/protocols/http/http-no-crlf.zeek b/testing/btest/scripts/base/protocols/http/http-no-crlf.zeek index 10326a62a8..458be00446 100644 --- a/testing/btest/scripts/base/protocols/http/http-no-crlf.zeek +++ b/testing/btest/scripts/base/protocols/http/http-no-crlf.zeek @@ -7,4 +7,3 @@ @load base/protocols/conn @load base/protocols/http -@load base/frameworks/dpd diff --git a/testing/btest/scripts/base/protocols/imap/starttls.test b/testing/btest/scripts/base/protocols/imap/starttls.test index dc8970b8bb..6b32d86bb7 100644 --- a/testing/btest/scripts/base/protocols/imap/starttls.test +++ b/testing/btest/scripts/base/protocols/imap/starttls.test @@ -6,7 +6,6 @@ @load base/protocols/ssl @load base/protocols/conn -@load base/frameworks/dpd @load base/protocols/imap redef SSL::log_include_server_certificate_subject_issuer=T; diff --git a/testing/btest/scripts/base/protocols/irc/basic.test b/testing/btest/scripts/base/protocols/irc/basic.test index 7d5e1fb0cd..ca7fc547a8 100644 --- a/testing/btest/scripts/base/protocols/irc/basic.test +++ b/testing/btest/scripts/base/protocols/irc/basic.test @@ -8,7 +8,6 @@ @load base/protocols/conn @load base/protocols/irc -@load base/frameworks/dpd # dcc mime types are irrelevant to this test, so filter it out event zeek_init() diff --git a/testing/btest/scripts/base/protocols/irc/starttls.test b/testing/btest/scripts/base/protocols/irc/starttls.test index 9a0ec689ad..a066576be8 100644 --- a/testing/btest/scripts/base/protocols/irc/starttls.test +++ b/testing/btest/scripts/base/protocols/irc/starttls.test @@ -4,6 +4,5 @@ # @TEST-EXEC: btest-diff x509.log @load base/protocols/conn -@load base/frameworks/dpd @load base/protocols/ssl @load base/protocols/irc diff --git a/testing/btest/scripts/base/protocols/krb/krb-service-name.test b/testing/btest/scripts/base/protocols/krb/krb-service-name.test index 90d7305371..ebfed2b6b8 100644 --- a/testing/btest/scripts/base/protocols/krb/krb-service-name.test +++ b/testing/btest/scripts/base/protocols/krb/krb-service-name.test @@ -4,4 +4,3 @@ @load base/protocols/krb @load base/protocols/conn -@load base/frameworks/dpd diff --git a/testing/btest/scripts/base/protocols/modbus/events.zeek b/testing/btest/scripts/base/protocols/modbus/events.zeek index ba7f6cdaee..4c83299f68 100644 --- a/testing/btest/scripts/base/protocols/modbus/events.zeek +++ b/testing/btest/scripts/base/protocols/modbus/events.zeek @@ -9,7 +9,6 @@ @load base/protocols/modbus @load base/protocols/conn -@load base/frameworks/dpd redef DPD::ignore_violations_after = 1; diff --git a/testing/btest/scripts/base/protocols/pop3/starttls.zeek b/testing/btest/scripts/base/protocols/pop3/starttls.zeek index cf5371d284..ca3cf96d40 100644 --- a/testing/btest/scripts/base/protocols/pop3/starttls.zeek +++ b/testing/btest/scripts/base/protocols/pop3/starttls.zeek @@ -4,7 +4,6 @@ # @TEST-EXEC: btest-diff x509.log @load base/protocols/conn -@load base/frameworks/dpd @load base/protocols/ssl module POP3; diff --git a/testing/btest/scripts/base/protocols/rdp/rdpeudp-handshake-fail.zeek b/testing/btest/scripts/base/protocols/rdp/rdpeudp-handshake-fail.zeek index 149821cf8a..06d9fb4675 100644 --- a/testing/btest/scripts/base/protocols/rdp/rdpeudp-handshake-fail.zeek +++ b/testing/btest/scripts/base/protocols/rdp/rdpeudp-handshake-fail.zeek @@ -4,7 +4,6 @@ @load base/protocols/rdp @load base/protocols/conn -@load base/frameworks/dpd event rdpeudp_syn(c: connection) { diff --git a/testing/btest/scripts/base/protocols/rdp/rdpeudp-handshake-success.zeek b/testing/btest/scripts/base/protocols/rdp/rdpeudp-handshake-success.zeek index 5cbd8a91a8..a48ca061f7 100644 --- a/testing/btest/scripts/base/protocols/rdp/rdpeudp-handshake-success.zeek +++ b/testing/btest/scripts/base/protocols/rdp/rdpeudp-handshake-success.zeek @@ -4,7 +4,6 @@ @load base/protocols/rdp @load base/protocols/conn -@load base/frameworks/dpd event rdpeudp_syn(c: connection) { diff --git a/testing/btest/scripts/base/protocols/rdp/rdpeudp2-handshake-success.zeek b/testing/btest/scripts/base/protocols/rdp/rdpeudp2-handshake-success.zeek index 1faba20c55..e862b812a9 100644 --- a/testing/btest/scripts/base/protocols/rdp/rdpeudp2-handshake-success.zeek +++ b/testing/btest/scripts/base/protocols/rdp/rdpeudp2-handshake-success.zeek @@ -4,7 +4,6 @@ @load base/protocols/rdp @load base/protocols/conn -@load base/frameworks/dpd event rdpeudp_syn(c: connection) { diff --git a/testing/btest/scripts/base/protocols/ssl/dtls-stun-dpd.test b/testing/btest/scripts/base/protocols/ssl/dtls-stun-dpd.test index 4e31697647..cd6e559704 100644 --- a/testing/btest/scripts/base/protocols/ssl/dtls-stun-dpd.test +++ b/testing/btest/scripts/base/protocols/ssl/dtls-stun-dpd.test @@ -5,7 +5,6 @@ # @TEST-EXEC: btest-diff .stdout @load base/protocols/ssl -@load base/frameworks/dpd redef SSL::log_include_client_certificate_subject_issuer = T; redef SSL::log_include_server_certificate_subject_issuer = T; diff --git a/testing/btest/scripts/base/protocols/ssl/tls1_1.test b/testing/btest/scripts/base/protocols/ssl/tls1_1.test index 9b88906f1e..85d8f2de6a 100644 --- a/testing/btest/scripts/base/protocols/ssl/tls1_1.test +++ b/testing/btest/scripts/base/protocols/ssl/tls1_1.test @@ -7,4 +7,3 @@ @load base/protocols/ssl @load base/files/x509 -@load base/frameworks/dpd diff --git a/testing/btest/scripts/base/protocols/xmpp/starttls.test b/testing/btest/scripts/base/protocols/xmpp/starttls.test index 7cc4717e31..9c21747431 100644 --- a/testing/btest/scripts/base/protocols/xmpp/starttls.test +++ b/testing/btest/scripts/base/protocols/xmpp/starttls.test @@ -4,6 +4,5 @@ # @TEST-EXEC: btest-diff x509.log @load base/protocols/conn -@load base/frameworks/dpd @load base/protocols/ssl @load base/protocols/xmpp diff --git a/testing/btest/scripts/policy/protocols/conn/known-services-multi.zeek b/testing/btest/scripts/policy/protocols/conn/known-services-multi.zeek index e24293fb66..2ec82b6f7e 100644 --- a/testing/btest/scripts/policy/protocols/conn/known-services-multi.zeek +++ b/testing/btest/scripts/policy/protocols/conn/known-services-multi.zeek @@ -6,5 +6,4 @@ @load base/protocols/ssh @load base/protocols/ssl -@load base/frameworks/dpd @load protocols/conn/known-services diff --git a/testing/btest/scripts/policy/protocols/conn/speculative-service.zeek b/testing/btest/scripts/policy/protocols/conn/speculative-service.zeek index 51fd6d7984..5672d4fceb 100644 --- a/testing/btest/scripts/policy/protocols/conn/speculative-service.zeek +++ b/testing/btest/scripts/policy/protocols/conn/speculative-service.zeek @@ -11,5 +11,4 @@ @load base/protocols/conn @load base/protocols/dns @load base/protocols/http -@load base/frameworks/dpd @load protocols/conn/speculative-service diff --git a/testing/btest/signatures/eval-condition.zeek b/testing/btest/signatures/eval-condition.zeek index e614c71fc8..fc95a10700 100644 --- a/testing/btest/signatures/eval-condition.zeek +++ b/testing/btest/signatures/eval-condition.zeek @@ -3,7 +3,6 @@ @load base/protocols/conn @load base/protocols/ftp -@load base/frameworks/dpd @load-sigs blah.sig @TEST-START-FILE blah.sig