diff --git a/VERSION b/VERSION index d2296d4057..906a28a08d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5.2.0-dev.220 +5.2.0-dev.230 diff --git a/src/analyzer/protocol/dhcp/dhcp-options.pac b/src/analyzer/protocol/dhcp/dhcp-options.pac index 632c4059ea..810bb0a6e8 100644 --- a/src/analyzer/protocol/dhcp/dhcp-options.pac +++ b/src/analyzer/protocol/dhcp/dhcp-options.pac @@ -463,10 +463,10 @@ refine flow DHCP_Flow += { function process_par_req_list_option(v: OptionValue): bool %{ auto params = zeek::make_intrusive(zeek::id::index_vec); - int num_parms = ${v.par_req_list}->size(); + int num_params = ${v.par_req_list}->size(); vector* plist = ${v.par_req_list}; - for ( int i = 0; i < num_parms; ++i ) + for ( int i = 0; i < num_params; ++i ) { uint8 param = (*plist)[i]; params->Assign(i, zeek::val_mgr->Count(param)); diff --git a/src/analyzer/protocol/dnp3/dnp3-objects.pac b/src/analyzer/protocol/dnp3/dnp3-objects.pac index af0cf7b81b..18af5e4be1 100644 --- a/src/analyzer/protocol/dnp3/dnp3-objects.pac +++ b/src/analyzer/protocol/dnp3/dnp3-objects.pac @@ -317,7 +317,7 @@ type Request_Data_Object(function_code: uint8, qualifier_field: uint8, object_ty 0x7801 -> challenge: AuthChallenge(prefix.prefix_value); 0x7802 -> reply: AuthReply(prefix.prefix_value); 0x7803 -> aggrRequest: AuthAggrRequest(prefix.prefix_value); - 0x7804 -> seesionKeyRequest: uint16; + 0x7804 -> sessionKeyRequest: uint16; 0x7805 -> status: AuthSessionKeyStatus(prefix.prefix_value); 0x7806 -> keyChange: AuthSessionKeyChange(prefix.prefix_value); 0x7807 -> error: AuthError(prefix.prefix_value); @@ -598,7 +598,7 @@ type Response_Data_Object(function_code: uint8, qualifier_field: uint8, object_t 0x7801 -> challenge: AuthChallenge(prefix.prefix_value); 0x7802 -> reply: AuthReply(prefix.prefix_value); 0x7803 -> aggrRequest: AuthAggrRequest(prefix.prefix_value); - 0x7804 -> seesionKeyRequest: uint16; + 0x7804 -> sessionKeyRequest: uint16; 0x7805 -> status: AuthSessionKeyStatus(prefix.prefix_value); 0x7806 -> keyChange: AuthSessionKeyChange(prefix.prefix_value); 0x7807 -> error: AuthError(prefix.prefix_value); @@ -1295,7 +1295,7 @@ type File_Spec_Str = record { type Dev_Store = record { overflow: uint8; obj_group: uint8; - variatiion: uint8; + variation: uint8; } &byteorder = littleendian; # device profile g82 @@ -1386,7 +1386,7 @@ type StatusEle = record { # g101v3 type BCD_Large = record { value_low: uint32; - vlaue_high: uint32; + value_high: uint32; } &byteorder = littleendian; # authentication g120 diff --git a/src/analyzer/protocol/dnp3/dnp3-protocol.pac b/src/analyzer/protocol/dnp3/dnp3-protocol.pac index c0bd39b663..8db4e3c379 100644 --- a/src/analyzer/protocol/dnp3/dnp3-protocol.pac +++ b/src/analyzer/protocol/dnp3/dnp3-protocol.pac @@ -20,7 +20,7 @@ type DNP3_Request = record { addin_header: Header_Block; ## added by Hui Lin in Zeek code app_header: DNP3_Application_Request_Header; data: case ( app_header.function_code ) of { - CONFIRM -> none_coonfirm: empty; + CONFIRM -> none_confirm: empty; READ -> read_requests: Request_Objects(app_header.function_code)[]; WRITE -> write_requests: Request_Objects(app_header.function_code)[]; SELECT -> select_requests: Request_Objects(app_header.function_code)[]; diff --git a/src/analyzer/protocol/smb/smb-mailslot.pac b/src/analyzer/protocol/smb/smb-mailslot.pac index 9bbcdeed5f..43d2430b26 100644 --- a/src/analyzer/protocol/smb/smb-mailslot.pac +++ b/src/analyzer/protocol/smb/smb-mailslot.pac @@ -1,6 +1,6 @@ enum SMB_MailSlot_opcode { HOST_ANNOUNCEMENT = 1, - ANNOUCEMENT_REQUEST = 2, + ANNOUNCEMENT_REQUEST = 2, REQUEST_ELECTION = 8, GET_BACKUP_LIST_REQUEST = 9, GET_BACKUP_LIST_RESPONSE = 10, @@ -20,7 +20,7 @@ type SMB_MailSlot_message( unicode: bool, byte_count: uint16 ) = record { type SMB_MailSlot_command(unicode: bool, code: uint8, byte_count: uint16 ) = case code of { HOST_ANNOUNCEMENT -> announce : SMB_MailSlot_host_announcement(unicode); - ANNOUCEMENT_REQUEST -> announce_req : SMB_MailSlot_announcement_request(unicode); + ANNOUNCEMENT_REQUEST -> announce_req : SMB_MailSlot_announcement_request(unicode); REQUEST_ELECTION -> election_req : SMB_MailSlot_request_election(unicode); GET_BACKUP_LIST_REQUEST -> get_backup_req : SMB_MailSlot_get_backup_list_request(unicode); GET_BACKUP_LIST_RESPONSE -> get_backup_resp : SMB_MailSlot_get_backup_list_response(unicode); diff --git a/src/analyzer/protocol/smb/smb1-protocol.pac b/src/analyzer/protocol/smb/smb1-protocol.pac index 1ea508d0dd..f98233ffcd 100644 --- a/src/analyzer/protocol/smb/smb1-protocol.pac +++ b/src/analyzer/protocol/smb/smb1-protocol.pac @@ -135,8 +135,8 @@ type SMB_Message(header: SMB_Header, offset: uint16, command: uint8, is_orig: bo }; type SMB_andx_command(header: SMB_Header, is_orig: bool, offset: uint16, command: uint8) = case command of { - 0xff -> no_futher_commands : empty; - default -> message : SMB_Message(header, offset, command, is_orig); + 0xff -> no_further_commands : empty; + default -> message : SMB_Message(header, offset, command, is_orig); }; type SMB_Message_Request(header: SMB_Header, offset: uint16, command: uint8, is_orig: bool) = case command of { diff --git a/src/analyzer/protocol/smb/smb2-com-negotiate.pac b/src/analyzer/protocol/smb/smb2-com-negotiate.pac index d9c1a5dde4..c8c584053c 100644 --- a/src/analyzer/protocol/smb/smb2-com-negotiate.pac +++ b/src/analyzer/protocol/smb/smb2-com-negotiate.pac @@ -2,7 +2,7 @@ enum smb3_capabilities { SMB2_GLOBAL_CAP_DFS = 0x00, SMB2_GLOBAL_CAP_LEASING = 0x02, SMB2_GLOBAL_CAP_LARGE_MTU = 0x04, - SMB2_GLOBAL_CAP_MULTI_CHANNE = 0x08, + SMB2_GLOBAL_CAP_MULTI_CHANNEL = 0x08, SMB2_GLOBAL_CAP_PERSISTENT_HANDLES = 0x10, SMB2_GLOBAL_CAP_DIRECTORY_LEASING = 0x20, SMB2_GLOBAL_CAP_ENCRYPTION = 0x40, diff --git a/src/analyzer/protocol/snmp/snmp-analyzer.pac b/src/analyzer/protocol/snmp/snmp-analyzer.pac index 334c4242e9..9ba78073c0 100644 --- a/src/analyzer/protocol/snmp/snmp-analyzer.pac +++ b/src/analyzer/protocol/snmp/snmp-analyzer.pac @@ -194,7 +194,7 @@ zeek::RecordValPtr build_bulk_pdu(const GetBulkRequestPDU* pdu) auto rv = zeek::make_intrusive(zeek::BifType::Record::SNMP::BulkPDU); rv->Assign(0, asn1_integer_to_val(pdu->request_id(), zeek::TYPE_INT)); rv->Assign(1, asn1_integer_to_val(pdu->non_repeaters(), zeek::TYPE_COUNT)); - rv->Assign(2, asn1_integer_to_val(pdu->max_repititions(), zeek::TYPE_COUNT)); + rv->Assign(2, asn1_integer_to_val(pdu->max_repetitions(), zeek::TYPE_COUNT)); rv->Assign(3, build_bindings(pdu->var_bindings())); return rv; } diff --git a/src/analyzer/protocol/snmp/snmp-protocol.pac b/src/analyzer/protocol/snmp/snmp-protocol.pac index f498271b72..32150c46fd 100644 --- a/src/analyzer/protocol/snmp/snmp-protocol.pac +++ b/src/analyzer/protocol/snmp/snmp-protocol.pac @@ -153,7 +153,7 @@ type TrapPDU(header: Header) = record { type GetBulkRequestPDU(header: Header) = record { request_id: ASN1Integer; non_repeaters: ASN1Integer; - max_repititions: ASN1Integer; + max_repetitions: ASN1Integer; var_bindings: VarBindList; };