From 92e5a4b7e56f52bd803081b7dc3d7f23b19b7a91 Mon Sep 17 00:00:00 2001
From: Nicolas Williams <nico@twosigma.com>
Date: Tue, 23 Nov 2021 17:59:17 -0600
Subject: [PATCH] Revert "asn1: use roken for generated source files"

This reverts commit e27e056b45ff1be8a25a8d810c69fbbe904f70d2.

e27e056b45ff1be8a25a8d810c69fbbe904f70d2 was needed mainly for ENOTSUP.
ENOTSUP is not available in older C run-times.

Also, lib/roken has wrappers for the CRT allocator, but we don't need
those in lib/asn1 because all the functions generated by the compiler
effectively encapsulate the corresponding DLL's CRT's allocator.

This will be followed by a change to not use ENOTSUP.
---
 lib/asn1/gen.c | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/lib/asn1/gen.c b/lib/asn1/gen.c
index 77a00f5d0..39ea9d037 100644
--- a/lib/asn1/gen.c
+++ b/lib/asn1/gen.c
@@ -177,9 +177,9 @@ init_generate (const char *filename, const char *base)
 	     "#ifndef __%s_h__\n"
 	     "#define __%s_h__\n\n", headerbase, headerbase);
     fprintf (headerfile,
-	     "#include <config.h>\n"
-	     "#include <roken.h>\n"
-	     "#include <stddef.h>\n");
+	     "#include <stddef.h>\n"
+	     "#include <stdint.h>\n"
+	     "#include <time.h>\n\n");
     fprintf (headerfile,
 	     "#ifndef __asn1_common_definitions__\n"
 	     "#define __asn1_common_definitions__\n\n");
@@ -307,8 +307,12 @@ init_generate (const char *filename, const char *base)
     fprintf (templatefile,
 	     "/* Generated from %s */\n"
 	     "/* Do not edit */\n\n"
-	     "#include <config.h>\n"
-	     "#include <roken.h>\n"
+	     "#include <stdio.h>\n"
+	     "#include <stdlib.h>\n"
+	     "#include <time.h>\n"
+	     "#include <string.h>\n"
+	     "#include <errno.h>\n"
+	     "#include <limits.h>\n"
 	     "#include <asn1_err.h>\n"
 	     "#include <%s>\n",
 	     filename,
@@ -407,8 +411,12 @@ generate_header_of_codefile(const char *name)
 	     "/* Generated from %s */\n"
 	     "/* Do not edit */\n\n"
 	     "#define  ASN1_LIB\n\n"
-	     "#include <config.h>\n"
-	     "#include <roken.h>\n"
+	     "#include <stdio.h>\n"
+	     "#include <stdlib.h>\n"
+	     "#include <time.h>\n"
+	     "#include <string.h>\n"
+	     "#include <errno.h>\n"
+	     "#include <limits.h>\n"
 	     "#include <%s>\n",
 	     orig_filename,
 	     type_file_string);