From 5af997b32b228d89e9de30f38c0e6b0562c2bd78 Mon Sep 17 00:00:00 2001 From: Jon Siwek Date: Wed, 22 Apr 2015 14:02:51 -0500 Subject: [PATCH] Add missing .pac dependencies for some binpac analyzer targets. --- src/analyzer/protocol/dce-rpc/CMakeLists.txt | 2 +- src/analyzer/protocol/krb/CMakeLists.txt | 16 ++++++++++++++-- src/analyzer/protocol/rdp/CMakeLists.txt | 2 +- src/analyzer/protocol/snmp/CMakeLists.txt | 2 +- src/analyzer/protocol/ssh/CMakeLists.txt | 2 +- src/analyzer/protocol/ssl/CMakeLists.txt | 12 ++++++++++-- 6 files changed, 28 insertions(+), 8 deletions(-) diff --git a/src/analyzer/protocol/dce-rpc/CMakeLists.txt b/src/analyzer/protocol/dce-rpc/CMakeLists.txt index d9baa08acf..8ccbf094d4 100644 --- a/src/analyzer/protocol/dce-rpc/CMakeLists.txt +++ b/src/analyzer/protocol/dce-rpc/CMakeLists.txt @@ -6,7 +6,7 @@ include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DI bro_plugin_begin(Bro DCE_RPC) bro_plugin_cc(DCE_RPC.cc Plugin.cc) bro_plugin_bif(events.bif) -bro_plugin_pac(dce_rpc.pac dce_rpc-protocol.pac dce_rpc-analyzer.pac) +bro_plugin_pac(dce_rpc.pac dce_rpc-protocol.pac dce_rpc-analyzer.pac epmapper.pac) bro_plugin_pac(dce_rpc_simple.pac dce_rpc-protocol.pac epmapper.pac) bro_plugin_end() diff --git a/src/analyzer/protocol/krb/CMakeLists.txt b/src/analyzer/protocol/krb/CMakeLists.txt index 554dbc3172..ce8e32859d 100644 --- a/src/analyzer/protocol/krb/CMakeLists.txt +++ b/src/analyzer/protocol/krb/CMakeLists.txt @@ -9,6 +9,18 @@ bro_plugin_cc(KRB.cc) bro_plugin_cc(KRB_TCP.cc) bro_plugin_bif(types.bif) bro_plugin_bif(events.bif) -bro_plugin_pac(krb.pac krb-protocol.pac krb-analyzer.pac) -bro_plugin_pac(krb_TCP.pac krb-protocol.pac krb-analyzer.pac) +bro_plugin_pac(krb.pac krb-protocol.pac krb-analyzer.pac +krb-asn1.pac +krb-defs.pac +krb-types.pac +krb-padata.pac +../asn1/asn1.pac +) +bro_plugin_pac(krb_TCP.pac krb-protocol.pac krb-analyzer.pac +krb-asn1.pac +krb-defs.pac +krb-types.pac +krb-padata.pac +../asn1/asn1.pac +) bro_plugin_end() diff --git a/src/analyzer/protocol/rdp/CMakeLists.txt b/src/analyzer/protocol/rdp/CMakeLists.txt index f48012c010..c94afaa052 100644 --- a/src/analyzer/protocol/rdp/CMakeLists.txt +++ b/src/analyzer/protocol/rdp/CMakeLists.txt @@ -6,5 +6,5 @@ bro_plugin_begin(Bro RDP) bro_plugin_cc(RDP.cc Plugin.cc) bro_plugin_bif(events.bif) bro_plugin_bif(types.bif) - bro_plugin_pac(rdp.pac rdp-analyzer.pac rdp-protocol.pac) + bro_plugin_pac(rdp.pac rdp-analyzer.pac rdp-protocol.pac ../asn1/asn1.pac) bro_plugin_end() diff --git a/src/analyzer/protocol/snmp/CMakeLists.txt b/src/analyzer/protocol/snmp/CMakeLists.txt index 7f1ffe2ed6..43cbf45ac4 100644 --- a/src/analyzer/protocol/snmp/CMakeLists.txt +++ b/src/analyzer/protocol/snmp/CMakeLists.txt @@ -7,5 +7,5 @@ bro_plugin_begin(Bro SNMP) bro_plugin_cc(SNMP.cc Plugin.cc) bro_plugin_bif(types.bif) bro_plugin_bif(events.bif) -bro_plugin_pac(snmp.pac snmp-protocol.pac snmp-analyzer.pac) +bro_plugin_pac(snmp.pac snmp-protocol.pac snmp-analyzer.pac ../asn1/asn1.pac) bro_plugin_end() diff --git a/src/analyzer/protocol/ssh/CMakeLists.txt b/src/analyzer/protocol/ssh/CMakeLists.txt index 3f82b9561b..b7d8b50b4a 100644 --- a/src/analyzer/protocol/ssh/CMakeLists.txt +++ b/src/analyzer/protocol/ssh/CMakeLists.txt @@ -7,5 +7,5 @@ bro_plugin_begin(Bro SSH) bro_plugin_cc(SSH.cc Plugin.cc) bro_plugin_bif(types.bif) bro_plugin_bif(events.bif) - bro_plugin_pac(ssh.pac ssh-analyzer.pac ssh-protocol.pac) + bro_plugin_pac(ssh.pac ssh-analyzer.pac ssh-protocol.pac consts.pac) bro_plugin_end() diff --git a/src/analyzer/protocol/ssl/CMakeLists.txt b/src/analyzer/protocol/ssl/CMakeLists.txt index 7f4efdece1..0b94946e4d 100644 --- a/src/analyzer/protocol/ssl/CMakeLists.txt +++ b/src/analyzer/protocol/ssl/CMakeLists.txt @@ -6,7 +6,15 @@ include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DI bro_plugin_begin(Bro SSL) bro_plugin_cc(SSL.cc DTLS.cc Plugin.cc) bro_plugin_bif(events.bif) -bro_plugin_pac(tls-handshake.pac tls-handshake-protocol.pac tls-handshake-analyzer.pac ssl-defs.pac) -bro_plugin_pac(ssl.pac ssl-dtls-analyzer.pac ssl-analyzer.pac ssl-dtls-protocol.pac ssl-protocol.pac ssl-defs.pac) +bro_plugin_pac(tls-handshake.pac tls-handshake-protocol.pac tls-handshake-analyzer.pac ssl-defs.pac +proc-client-hello.pac +proc-server-hello.pac +proc-certificate.pac +) +bro_plugin_pac(ssl.pac ssl-dtls-analyzer.pac ssl-analyzer.pac ssl-dtls-protocol.pac ssl-protocol.pac ssl-defs.pac +proc-client-hello.pac +proc-server-hello.pac +proc-certificate.pac +) bro_plugin_pac(dtls.pac ssl-dtls-analyzer.pac dtls-analyzer.pac ssl-dtls-protocol.pac dtls-protocol.pac ssl-defs.pac) bro_plugin_end()