From 731d6e6df8fda3b43f015d57d2bc7a3ab1349b6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= <lha@kth.se>
Date: Sun, 13 Jan 2008 10:25:50 +0000
Subject: [PATCH] REVERT: add and use der_{malloc,free}

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@22429 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 lib/asn1/asn1-common.h |  4 ++--
 lib/asn1/der.c         | 12 ------------
 lib/asn1/gen.c         |  4 ++--
 lib/asn1/gen_encode.c  |  2 +-
 4 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/lib/asn1/asn1-common.h b/lib/asn1/asn1-common.h
index 6603a5c3e..4c6af8b45 100644
--- a/lib/asn1/asn1-common.h
+++ b/lib/asn1/asn1-common.h
@@ -50,14 +50,14 @@ typedef struct heim_octet_string heim_any_set;
 #define ASN1_MALLOC_ENCODE(T, B, BL, S, L, R)                  \
   do {                                                         \
     (BL) = length_##T((S));                                    \
-    (B) = der_malloc((BL));                                    \
+    (B) = malloc((BL));                                        \
     if((B) == NULL) {                                          \
       (R) = ENOMEM;                                            \
     } else {                                                   \
       (R) = encode_##T(((unsigned char*)(B)) + (BL) - 1, (BL), \
                        (S), (L));                              \
       if((R) != 0) {                                           \
-        der_free((B));                                         \
+        free((B));                                             \
         (B) = NULL;                                            \
       }                                                        \
     }                                                          \
diff --git a/lib/asn1/der.c b/lib/asn1/der.c
index 85e3a83b8..159d358fc 100644
--- a/lib/asn1/der.c
+++ b/lib/asn1/der.c
@@ -140,15 +140,3 @@ der_get_tag_num(const char *name)
 {
     return get_type(name, tag_names, SIZEOF_ARRAY(tag_names));
 }
-
-void
-der_free(void *ptr)
-{
-    free(ptr);
-}
-
-void *
-der_malloc(size_t size)
-{
-    return malloc(size);
-}
diff --git a/lib/asn1/gen.c b/lib/asn1/gen.c
index 27c76e345..cd79dd071 100644
--- a/lib/asn1/gen.c
+++ b/lib/asn1/gen.c
@@ -154,14 +154,14 @@ init_generate (const char *filename, const char *base)
     fputs("#define ASN1_MALLOC_ENCODE(T, B, BL, S, L, R)                  \\\n"
 	  "  do {                                                         \\\n"
 	  "    (BL) = length_##T((S));                                    \\\n"
-	  "    (B) = der_malloc((BL));                                    \\\n"
+	  "    (B) = malloc((BL));                                        \\\n"
 	  "    if((B) == NULL) {                                          \\\n"
 	  "      (R) = ENOMEM;                                            \\\n"
 	  "    } else {                                                   \\\n"
 	  "      (R) = encode_##T(((unsigned char*)(B)) + (BL) - 1, (BL), \\\n"
 	  "                       (S), (L));                              \\\n"
 	  "      if((R) != 0) {                                           \\\n"
-	  "        der_free((B));                                         \\\n"
+	  "        free((B));                                             \\\n"
 	  "        (B) = NULL;                                            \\\n"
 	  "      }                                                        \\\n"
 	  "    }                                                          \\\n"
diff --git a/lib/asn1/gen_encode.c b/lib/asn1/gen_encode.c
index 2b3edbe8c..bf26a965a 100644
--- a/lib/asn1/gen_encode.c
+++ b/lib/asn1/gen_encode.c
@@ -316,7 +316,7 @@ encode_type (const char *name, const Type *t, const char *tmpstr)
 		"if(eret) {\n"
 		"i--;\n"
 		"while (i >= 0) {\n"
-		"der_free(val[i].data);\n"
+		"free(val[i].data);\n"
 		"i--;\n"
 		"}\n"
 		"free(val);\n"