]> git.ipfire.org Git - thirdparty/suricata.git/commitdiff
dnp3: use base64 macro in gen script
authorPhilippe Antoine <contact@catenacyber.fr>
Thu, 8 Jul 2021 12:57:56 +0000 (14:57 +0200)
committerJeff Lucovsky <jeff@lucovsky.org>
Fri, 17 Sep 2021 17:34:32 +0000 (13:34 -0400)
As is done already in C
cf commit ea0936199d142fc52ec69baf7984cbdd92dd4705

(cherry picked from commit 5ec9688f03eb611b8ec3108a4f20db2baf87b225)

scripts/dnp3-gen/dnp3-gen.py

index 7aa434a0e35ff6f2c68c6a82ac8e39020fd33f3c..19076e7799716aa7abc5b74b9f7b6b4e7030539d 100755 (executable)
@@ -175,7 +175,7 @@ void OutputJsonDNP3SetItem(json_t *js, DNP3Object *object,
             json_object_set_new(js, "{{field.name}}",
                 json_real(data->{{field.name}}));
 {% elif field.type == "bytearray" %}
-            unsigned long {{field.name}}_b64_len = data->{{field.len_field}} * 2;
+            unsigned long {{field.name}}_b64_len = BASE64_BUFFER_SIZE(data->{{field.len_field}});
             uint8_t {{field.name}}_b64[{{field.name}}_b64_len];
             Base64Encode(data->{{field.name}}, data->{{field.len_field}},
                 {{field.name}}_b64, &{{field.name}}_b64_len);