Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/topic/awelzel/smb1-avoid-dialect-index-error'

Browse source 
* origin/topic/awelzel/smb1-avoid-dialect-index-error:
  smb1: Ensure existence of dialect_index in offered dialects
This commit is contained in:
Tim Wojtulewicz 2022-11-16 14:51:35 -07:00
commit 6055a85b3c
3 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,3 +1,7 @@
5.2.0-dev.322 | 2022-11-16 14:51:35 -0700
* smb1: Ensure existence of dialect_index in offered dialects (Arne Welzel, Corelight)
5.2.0-dev.320 | 2022-11-16 14:50:58 -0700 5.2.0-dev.320 | 2022-11-16 14:50:58 -0700
* ssh: Test for c$ssh$analyzer_id existence (Arne Welzel, Corelight) * ssh: Test for c$ssh$analyzer_id existence (Arne Welzel, Corelight)

2
VERSION
View file

@ -1 +1 @@
5.2.0-dev.320 5.2.0-dev.322

5
scripts/base/protocols/smb/smb1-main.zeek
View file

@ -89,9 +89,10 @@ event smb1_negotiate_response(c: connection, hdr: SMB1::Header, response: SMB1::
{ {
if ( c$smb_state$current_cmd?$smb1_offered_dialects ) if ( c$smb_state$current_cmd?$smb1_offered_dialects )
{ {
if ( response?$ntlm ) local offered_dialects = c$smb_state$current_cmd$smb1_offered_dialects;
if ( response?$ntlm && response$ntlm$dialect_index < |offered_dialects| )
{ {
c$smb_state$current_cmd$argument = c$smb_state$current_cmd$smb1_offered_dialects[response$ntlm$dialect_index]; c$smb_state$current_cmd$argument = offered_dialects[response$ntlm$dialect_index];
} }
delete c$smb_state$current_cmd$smb1_offered_dialects; delete c$smb_state$current_cmd$smb1_offered_dialects;