Merge remote-tracking branch 'origin/topic/arne.welzel/ldap-asn1-fixes'

* origin/topic/arne.welzel/ldap-asn1-fixes: performance improvements for the LDAP ASN.1 analyzer
zeek · Oct 18, 2023 · 9dc0535 · 9dc0535
2 parents 4d4792b + 2bef110
commit 9dc0535
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/analyzer/asn1.spicy b/analyzer/asn1.spicy
@@ -186,28 +186,29 @@ type ASN1ObjectIdentifierNibble = unit {
 } &convert=self.data;
 
 type ASN1ObjectIdentifier = unit(len: uint64) {
-  var oid: vector<uint64>;
+  var oidbytes: bytes;
   var temp: uint64;
   var oidstring: string;
 
   : uint8 if ( len >= 1 ) {
     self.temp = $$ / 40;
-    self.oid.push_back( self.temp );
-    self.oidstring = "%d" % (self.temp);
+    self.oidbytes += ("%d" % (self.temp)).encode();
     self.temp = $$ % 40;
-    self.oid.push_back( self.temp );
-    self.oidstring = self.oidstring + ".%d" % (self.temp);
+    self.oidbytes += (".%d" % (self.temp)).encode();
     self.temp = 0;
   }
 
   sublist: ASN1ObjectIdentifierNibble[len - 1] foreach {
     self.temp = ( self.temp<<7 ) | $$.num;
     if ( $$.more != 1 ) {
-      self.oid.push_back(self.temp);
-      self.oidstring = self.oidstring + ".%d" % (self.temp);
+      self.oidbytes += (".%d" % (self.temp)).encode();
       self.temp = 0;
     }
   }
+
+  on %done {
+    self.oidstring = self.oidbytes.decode();
+  }
 };