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

Merge remote-tracking branch 'origin/topic/awelzel/ldap-fix-uint8-shift'

Browse source 
* origin/topic/awelzel/ldap-fix-uint8-shift:
  ldap: Promote uint8 to uint64 before shifting
This commit is contained in:
Arne Welzel 2024-08-07 14:10:54 +02:00
commit 97fa7cdc0a
3 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CHANGES
View file

@ -1,3 +1,9 @@
7.1.0-dev.109 | 2024-08-07 14:10:54 +0200
* ldap: Promote uint8 to uint64 before shifting (Arne Welzel, Corelight)
Relates to zeek/spicy#1829
7.1.0-dev.107 | 2024-08-07 11:43:15 +0200
* ci/ubuntu-24.04: Use ccache 4.10.2 (Arne Welzel, Corelight)

2
VERSION
View file

@ -1 +1 @@
7.1.0-dev.107
7.1.0-dev.109

2
src/analyzer/protocol/ldap/ldap.spicy
View file

@ -196,7 +196,7 @@ type MaybeEncrypted = unit(ctx: Ctx&) {
# If so, switch into KRB mode assuming that's what is being used and
# have a chance seeing some more plaintext LDAP in non-sealed tokens.
rem: uint8[3] if ( ctx.messageMode == MessageMode::ENCRYPTED && (|self.mech| == 0 || self.mech.starts_with(b"GSS")) ) {
self.saslLen = (self.first << 24) + ($$[0] << 16) + ($$[1] << 8) + $$[2];
self.saslLen = (uint64(self.first) << 24) + (uint64($$[0]) << 16) + (uint64($$[1]) << 8) + uint64($$[2]);
}
: uint16 if ( self.saslLen >= 2 ) {