From 9560e387841f0431380c2ef028c1ecc8133efd72 Mon Sep 17 00:00:00 2001 From: Vern Paxson Date: Sat, 1 Apr 2023 12:56:54 -0700 Subject: [PATCH] fixed type mismatch for ssl_certificate_request event --- scripts/policy/protocols/ssl/certificate-request-info.zeek | 2 +- src/analyzer/protocol/ssl/events.bif | 2 +- .../btest/scripts/base/protocols/ssl/certificate_request.zeek | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/policy/protocols/ssl/certificate-request-info.zeek b/scripts/policy/protocols/ssl/certificate-request-info.zeek index 0b22e48563..2479df5efa 100644 --- a/scripts/policy/protocols/ssl/certificate-request-info.zeek +++ b/scripts/policy/protocols/ssl/certificate-request-info.zeek @@ -10,7 +10,7 @@ redef record SSL::Info += { requested_client_certificate_authorities: vector of string &optional &log; }; -event ssl_certificate_request(c: connection, is_client: bool, certificate_types: index_vec, supported_signature_algorithms: SSL::SignatureAndHashAlgorithm, certificate_authorities: string_vec) +event ssl_certificate_request(c: connection, is_client: bool, certificate_types: index_vec, supported_signature_algorithms: signature_and_hashalgorithm_vec, certificate_authorities: string_vec) { if ( is_client ) return; diff --git a/src/analyzer/protocol/ssl/events.bif b/src/analyzer/protocol/ssl/events.bif index c7f8beadfe..7749c5c758 100644 --- a/src/analyzer/protocol/ssl/events.bif +++ b/src/analyzer/protocol/ssl/events.bif @@ -708,5 +708,5 @@ event ssl_connection_flipped%(c: connection%); ## ## .. zeek:see:: ssl_handshake_message x509_certificate ssl_server_hello ssl_client_hello ## parse_distinguished_name -event ssl_certificate_request%(c: connection, is_client: bool, certificate_types: index_vec, supported_signature_algorithms: SSL::SignatureAndHashAlgorithm, certificate_authorities: string_vec%); +event ssl_certificate_request%(c: connection, is_client: bool, certificate_types: index_vec, supported_signature_algorithms: signature_and_hashalgorithm_vec, certificate_authorities: string_vec%); diff --git a/testing/btest/scripts/base/protocols/ssl/certificate_request.zeek b/testing/btest/scripts/base/protocols/ssl/certificate_request.zeek index 259eca3ed8..a4b7e7d731 100644 --- a/testing/btest/scripts/base/protocols/ssl/certificate_request.zeek +++ b/testing/btest/scripts/base/protocols/ssl/certificate_request.zeek @@ -9,7 +9,7 @@ @load base/protocols/ssl @load base/protocols/mysql -event ssl_certificate_request(c: connection, is_client: bool, certificate_types: index_vec, supported_signature_algorithms: SSL::SignatureAndHashAlgorithm, certificate_authorities: string_vec) +event ssl_certificate_request(c: connection, is_client: bool, certificate_types: index_vec, supported_signature_algorithms: signature_and_hashalgorithm_vec, certificate_authorities: string_vec) { print certificate_types; print supported_signature_algorithms;