Merge remote-tracking branch 'origin/topic/bbannier/spicy-1.9'

zeek · Sep 25, 2023 · 43cd332 · 43cd332
2 parents fea4cff + 69c1d9c
commit 43cd332
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/analyzer/CMakeLists.txt b/analyzer/CMakeLists.txt
@@ -1,5 +1,5 @@
 spicy_add_analyzer(
     NAME LDAP
     PACKAGE_NAME spicy-ldap
-    SOURCES ldap.spicy ldap.evt ldap_zeek.spicy
+    SOURCES ldap.spicy ldap.evt ldap_zeek.spicy asn1.spicy
     SCRIPTS __load__.zeek main.zeek dpd.sig)
diff --git a/analyzer/asn1.spicy b/analyzer/asn1.spicy
@@ -88,12 +88,21 @@ type LengthType = unit {
 };
 
 type ASN1Tag = unit {
+@if SPICY_VERSION >= 10900
+ : bitfield(8) {
+    type_: 0..4 &convert=ASN1Type($$);
+    constructed: 5 &convert=cast<bool>($$);
+    class: 6..7 &convert=ASN1Class($$);
+  };
+
+@else
+  # Version before spicy-1.9 do not support lifting
+  # anonymous bitfields into parent unit.
   var type_: ASN1Type;
   var class: ASN1Class;
   var constructed: bool;
 
-  # TODO(bbannier): Use an anonymous bitfield here once zeek/spicy#1533 is fixed.
-  bits: bitfield(8) {
+  : bitfield(8) {
     num: 0..4;
     constructed: 5;
     class: 6..7;
@@ -102,6 +111,7 @@ type ASN1Tag = unit {
     self.class = ASN1Class($$.class);
     self.constructed = cast<bool>($$.constructed);
   }
+@endif
 };
 
 #- ASN.1 bit string -----------------------------------------------------------