From b8641f300d2790dd833629932194f671b8460527 Mon Sep 17 00:00:00 2001
From: Victor Julien <victor@inliniac.net>
Date: Tue, 25 May 2010 14:10:37 +0200
Subject: [PATCH] Rename asn1 files, fix an invalid free, fix improper init of
 vars in one unittest.

---
 src/Makefile.am                           |  2 +-
 src/decode.h                              |  1 -
 src/detect-asn1.c                         | 21 +++++++++++----------
 src/suricata.c                            |  2 +-
 src/{decode-asn1.c => util-decode-asn1.c} |  4 ++--
 src/{decode-asn1.h => util-decode-asn1.h} |  2 +-
 6 files changed, 16 insertions(+), 16 deletions(-)
 rename src/{decode-asn1.c => util-decode-asn1.c} (99%)
 rename src/{decode-asn1.h => util-decode-asn1.h} (99%)

diff --git a/src/Makefile.am b/src/Makefile.am
index 2f1b7c7fd0..77b7ce994e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,7 +27,6 @@ decode-icmpv4.c decode-icmpv4.h \
 decode-icmpv6.c decode-icmpv6.h \
 decode-tcp.c decode-tcp.h \
 decode-udp.c decode-udp.h \
-decode-asn1.c decode-asn1.h \
 flow.c flow.h \
 flow-queue.c flow-queue.h \
 flow-hash.c flow-hash.h \
@@ -160,6 +159,7 @@ util-strlcpyu.c \
 util-cuda.c util-cuda.h \
 util-cuda-handlers.c util-cuda-handlers.h \
 util-privs.c util-privs.h \
+util-decode-asn1.c util-decode-asn1.h \
 tm-modules.c tm-modules.h \
 tm-queues.c tm-queues.h \
 tm-queuehandlers.c tm-queuehandlers.h \
diff --git a/src/decode.h b/src/decode.h
index efce18bc43..7f81408e5d 100644
--- a/src/decode.h
+++ b/src/decode.h
@@ -54,7 +54,6 @@
 #include "decode-udp.h"
 #include "decode-raw.h"
 #include "decode-vlan.h"
-#include "decode-asn1.h"
 
 #include "detect-reference.h"
 
diff --git a/src/detect-asn1.c b/src/detect-asn1.c
index c883e5fbcf..f4ed79b106 100644
--- a/src/detect-asn1.c
+++ b/src/detect-asn1.c
@@ -37,7 +37,7 @@
 #include "util-unittest-helper.h"
 #include "util-byte.h"
 #include "util-debug.h"
-#include "decode-asn1.h"
+#include "util-decode-asn1.h"
 
 /* delimiters for functions/arguments */
 const char *ASN_DELIM = " \t,\n";
@@ -75,7 +75,7 @@ void DetectAsn1Register(void) {
  *           checks that we want to perform, and the lenght of oversize check
  * \retval 1 if any of the options match, 0 if not
  */
-uint8_t DetectAsn1Checks(Asn1Node *node, DetectAsn1Data *ad) {
+static uint8_t DetectAsn1Checks(Asn1Node *node, DetectAsn1Data *ad) {
 
     /* oversize_length will check if a node has a length greater than
      * the user supplied length */
@@ -258,11 +258,12 @@ DetectAsn1Data *DetectAsn1Parse(char *asn1str) {
         tok = strtok(NULL, ASN_DELIM);
     }
 
-    fd = SCMalloc(sizeof(fd));
+    fd = SCMalloc(sizeof(DetectAsn1Data));
     if (fd == NULL) {
         SCLogError(SC_ERR_MEM_ALLOC, "Error allocating DetectAsn1Data");
         exit(EXIT_FAILURE);
     }
+    memset(fd, 0x00, sizeof(DetectAsn1Data));
 
     fd->flags = flags;
     fd->oversize_length = ov_len;    /* Length argument if needed */
@@ -333,10 +334,11 @@ int DetectAsn1TestParse01(void) {
     DetectAsn1Data *ad = NULL;
 
     ad = DetectAsn1Parse(str);
-    if (ad != NULL && ad->oversize_length == 1024
-        && (ad->flags & ASN1_OVERSIZE_LEN)) {
+    if (ad != NULL) {
+        if (ad->oversize_length == 1024 && (ad->flags & ASN1_OVERSIZE_LEN)) {
+            result = 1;
+        }
         DetectAsn1Free(ad);
-        result = 1;
     }
 
     return result;
@@ -1162,7 +1164,7 @@ end:
  */
 int DetectAsn1TestReal03(void) {
     int result = 0;
-    uint8_t buf[261];
+    uint8_t buf[261] = "";
     /* universal class, primitive type, tag_num = 9 (Data type Real) */
     buf[0] = '\x09';
     /* length, definite form, 2 octets */
@@ -1183,7 +1185,7 @@ int DetectAsn1TestReal03(void) {
 
     uint16_t buflen2 = 5;
 
-    Packet *p[2];
+    Packet *p[2] = { NULL, NULL };
 
     p[0] = UTHBuildPacket((uint8_t *)buf, buflen, IPPROTO_TCP);
     p[1] = UTHBuildPacket((uint8_t *)buf2, buflen2, IPPROTO_TCP);
@@ -1205,8 +1207,7 @@ int DetectAsn1TestReal03(void) {
 
     uint32_t sid[3] = {1, 2, 3};
 
-    uint32_t results[2][3] = {
-                              {1, 0, 0},
+    uint32_t results[2][3] = {{1, 0, 0},
                               {0, 1, 0}};
 
     result = UTHGenericTest(p, 2, sigs, sid, (uint32_t *) results, 3);
diff --git a/src/suricata.c b/src/suricata.c
index 43887509c1..9cb23e8bf1 100644
--- a/src/suricata.c
+++ b/src/suricata.c
@@ -115,7 +115,7 @@
 #include "runmodes.h"
 
 #include "util-cuda.h"
-
+#include "util-decode-asn1.h"
 #include "util-debug.h"
 #include "util-error.h"
 #include "detect-engine-siggroup.h"
diff --git a/src/decode-asn1.c b/src/util-decode-asn1.c
similarity index 99%
rename from src/decode-asn1.c
rename to src/util-decode-asn1.c
index 94b8cc06e8..694a20fabc 100644
--- a/src/decode-asn1.c
+++ b/src/util-decode-asn1.c
@@ -16,7 +16,7 @@
  */
 
 /**
- * \file decode-asn1.c
+ * \file
  *
  * \author Pablo Rincon Crespo <pablo.rincon.crespo@gmail.com>
  *
@@ -30,7 +30,7 @@
 #include "util-unittest.h"
 #include "util-print.h"
 
-#include "decode-asn1.h"
+#include "util-decode-asn1.h"
 
 
 /**
diff --git a/src/decode-asn1.h b/src/util-decode-asn1.h
similarity index 99%
rename from src/decode-asn1.h
rename to src/util-decode-asn1.h
index b7b8fcdba6..435253259a 100644
--- a/src/decode-asn1.h
+++ b/src/util-decode-asn1.h
@@ -16,7 +16,7 @@
  */
 
 /**
- * \file decode-asn1.h
+ * \file
  *
  * \author Pablo Rincon Crespo <pablo.rincon.crespo@gmail.com>
  *