From 90c3ac7191f00118bd2ff48659a54326dc63907c Mon Sep 17 00:00:00 2001
From: Johan Danielsson <joda@pdc.kth.se>
Date: Mon, 19 Jun 2000 15:19:23 +0000
Subject: [PATCH] support for distinguished value integers

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@8396 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 lib/asn1/gen.c        |  16 +-
 lib/asn1/gen_decode.c | 414 +++++++++++++++++++++---------------------
 lib/asn1/gen_encode.c | 292 ++++++++++++++---------------
 lib/asn1/gen_length.c | 169 +++++++++--------
 4 files changed, 457 insertions(+), 434 deletions(-)

diff --git a/lib/asn1/gen.c b/lib/asn1/gen.c
index 8efc08dc6..76043c6f2 100644
--- a/lib/asn1/gen.c
+++ b/lib/asn1/gen.c
@@ -227,7 +227,21 @@ define_type (int level, char *name, Type *t, int typedefp)
 	break;
     case TInteger:
 	space(level);
-	fprintf (headerfile, "int %s;\n", name);
+        if(t->members == NULL) {
+            fprintf (headerfile, "int %s;\n", name);
+        } else {
+            Member *m;
+            int tag = -1;
+            fprintf (headerfile, "enum %s {\n", typedefp ? name : "");
+	    for (m = t->members; m && m->val != tag; m = m->next) {
+                if(tag == -1)
+                    tag = m->val;
+                space (level + 1);
+                fprintf(headerfile, "%s = %d%s\n", m->gen_name, m->val, 
+                        m->next->val == tag ? "" : ",");
+            }
+            fprintf (headerfile, "} %s;\n", name);
+        }
 	break;
     case TUInteger:
 	space(level);
diff --git a/lib/asn1/gen_decode.c b/lib/asn1/gen_decode.c
index 5fd416bf3..3c36b4077 100644
--- a/lib/asn1/gen_decode.c
+++ b/lib/asn1/gen_decode.c
@@ -48,218 +48,227 @@ decode_primitive (const char *typename, const char *name)
 static void
 decode_type (const char *name, const Type *t)
 {
-  switch (t->type) {
-  case TType:
+    switch (t->type) {
+    case TType:
 #if 0
-    decode_type (name, t->symbol->type);
+	decode_type (name, t->symbol->type);
 #endif
-    fprintf (codefile,
-	     "e = decode_%s(p, len, %s, &l);\n"
-	     "FORW;\n",
-	     t->symbol->gen_name, name);
-    break;
-  case TInteger:
-    decode_primitive ("integer", name);
-    break;
-  case TUInteger:
-    decode_primitive ("unsigned", name);
-    break;
-  case TOctetString:
-    decode_primitive ("octet_string", name);
-    break;
-  case TBitString: {
-    Member *m;
-    int tag = -1;
-    int pos;
-
-    fprintf (codefile,
-	     "e = der_match_tag_and_length (p, len, UNIV, PRIM, UT_BitString,"
-	     "&reallen, &l);\n"
-	     "FORW;\n"
-	     "if(len < reallen)\n"
-	     "return ASN1_OVERRUN;\n"
-	     "p++;\n"
-	     "len--;\n"
-	     "reallen--;\n"
-	     "ret++;\n");
-    pos = 0;
-    for (m = t->members; m && tag != m->val; m = m->next) {
-      while (m->val / 8 > pos / 8) {
 	fprintf (codefile,
-		 "p++; len--; reallen--; ret++;\n");
-	pos += 8;
-      }
-      fprintf (codefile,
-	       "%s->%s = (*p >> %d) & 1;\n",
-	       name, m->gen_name, 7 - m->val % 8);
-      if (tag == -1)
-	tag = m->val;
+		 "e = decode_%s(p, len, %s, &l);\n"
+		 "FORW;\n",
+		 t->symbol->gen_name, name);
+	break;
+    case TInteger:
+	if(t->members == NULL)
+	    decode_primitive ("integer", name);
+	else {
+	    char *s;
+	    asprintf(&s, "(int*)%s", name);
+	    if(s == NULL)
+		return ENOMEM;
+	    decode_primitive ("integer", s);
+	    free(s);
+	}
+	break;
+    case TUInteger:
+	decode_primitive ("unsigned", name);
+	break;
+    case TOctetString:
+	decode_primitive ("octet_string", name);
+	break;
+    case TBitString: {
+	Member *m;
+	int tag = -1;
+	int pos;
+
+	fprintf (codefile,
+		 "e = der_match_tag_and_length (p, len, UNIV, PRIM, UT_BitString,"
+		 "&reallen, &l);\n"
+		 "FORW;\n"
+		 "if(len < reallen)\n"
+		 "return ASN1_OVERRUN;\n"
+		 "p++;\n"
+		 "len--;\n"
+		 "reallen--;\n"
+		 "ret++;\n");
+	pos = 0;
+	for (m = t->members; m && tag != m->val; m = m->next) {
+	    while (m->val / 8 > pos / 8) {
+		fprintf (codefile,
+			 "p++; len--; reallen--; ret++;\n");
+		pos += 8;
+	    }
+	    fprintf (codefile,
+		     "%s->%s = (*p >> %d) & 1;\n",
+		     name, m->gen_name, 7 - m->val % 8);
+	    if (tag == -1)
+		tag = m->val;
+	}
+	fprintf (codefile,
+		 "p += reallen; len -= reallen; ret += reallen;\n");
+	break;
     }
-    fprintf (codefile,
-	     "p += reallen; len -= reallen; ret += reallen;\n");
-    break;
-  }
-  case TSequence: {
-    Member *m;
-    int tag = -1;
+    case TSequence: {
+	Member *m;
+	int tag = -1;
 
-    if (t->members == NULL)
-      break;
+	if (t->members == NULL)
+	    break;
 
-    fprintf (codefile,
-	     "e = der_match_tag_and_length (p, len, UNIV, CONS, UT_Sequence,"
-	     "&reallen, &l);\n"
-	     "FORW;\n"
-	     "{\n"
-	     "int dce_fix;\n"
-	     "if((dce_fix = fix_dce(reallen, &len)) < 0)\n"
-	     "return ASN1_BAD_FORMAT;\n");
+	fprintf (codefile,
+		 "e = der_match_tag_and_length (p, len, UNIV, CONS, UT_Sequence,"
+		 "&reallen, &l);\n"
+		 "FORW;\n"
+		 "{\n"
+		 "int dce_fix;\n"
+		 "if((dce_fix = fix_dce(reallen, &len)) < 0)\n"
+		 "return ASN1_BAD_FORMAT;\n");
 
-    for (m = t->members; m && tag != m->val; m = m->next) {
-      char *s;
+	for (m = t->members; m && tag != m->val; m = m->next) {
+	    char *s;
 
-      asprintf (&s, "%s(%s)->%s", m->optional ? "" : "&", name, m->gen_name);
-      if (0 && m->type->type == TType){
-	  if(m->optional)
-	      fprintf (codefile,
-		       "%s = malloc(sizeof(*%s));\n", s, s);
-	  fprintf (codefile, 
-		   "e = decode_seq_%s(p, len, %d, %d, %s, &l);\n",
-		   m->type->symbol->gen_name,
-		   m->val, 
-		   m->optional,
-		   s);
-	  if(m->optional)
-	      fprintf (codefile, 
-		       "if (e == ASN1_MISSING_FIELD) {\n"
-		       "free(%s);\n"
-		       "%s = NULL;\n"
-		       "e = l = 0;\n"
-		       "}\n",
-		       s, s);
+	    asprintf (&s, "%s(%s)->%s", m->optional ? "" : "&", name, m->gen_name);
+	    if (0 && m->type->type == TType){
+		if(m->optional)
+		    fprintf (codefile,
+			     "%s = malloc(sizeof(*%s));\n", s, s);
+		fprintf (codefile, 
+			 "e = decode_seq_%s(p, len, %d, %d, %s, &l);\n",
+			 m->type->symbol->gen_name,
+			 m->val, 
+			 m->optional,
+			 s);
+		if(m->optional)
+		    fprintf (codefile, 
+			     "if (e == ASN1_MISSING_FIELD) {\n"
+			     "free(%s);\n"
+			     "%s = NULL;\n"
+			     "e = l = 0;\n"
+			     "}\n",
+			     s, s);
 	  
-	  fprintf (codefile, "FORW;\n");
+		fprintf (codefile, "FORW;\n");
 	  
-      }else{
-	  fprintf (codefile, "{\n"
-		   "size_t newlen, oldlen;\n\n"
-		   "e = der_match_tag (p, len, CONTEXT, CONS, %d, &l);\n",
-		   m->val);
-	  fprintf (codefile,
-		   "if (e)\n");
-	  if(m->optional)
-	      /* XXX should look at e */
-	      fprintf (codefile,
-		       "%s = NULL;\n", s);
-	  else
-	      fprintf (codefile,
-		       "return e;\n");
-	  fprintf (codefile, 
-		   "else {\n");
-	  fprintf (codefile,
-		   "p += l;\n"
-		   "len -= l;\n"
-		   "ret += l;\n"
-		   "e = der_get_length (p, len, &newlen, &l);\n"
-		   "FORW;\n"
-		   "{\n"
+	    }else{
+		fprintf (codefile, "{\n"
+			 "size_t newlen, oldlen;\n\n"
+			 "e = der_match_tag (p, len, CONTEXT, CONS, %d, &l);\n",
+			 m->val);
+		fprintf (codefile,
+			 "if (e)\n");
+		if(m->optional)
+		    /* XXX should look at e */
+		    fprintf (codefile,
+			     "%s = NULL;\n", s);
+		else
+		    fprintf (codefile,
+			     "return e;\n");
+		fprintf (codefile, 
+			 "else {\n");
+		fprintf (codefile,
+			 "p += l;\n"
+			 "len -= l;\n"
+			 "ret += l;\n"
+			 "e = der_get_length (p, len, &newlen, &l);\n"
+			 "FORW;\n"
+			 "{\n"
 	       
-		   "int dce_fix;\n"
-		   "oldlen = len;\n"
-		   "if((dce_fix = fix_dce(newlen, &len)) < 0)"
-		   "return ASN1_BAD_FORMAT;\n");
-	  if (m->optional)
-	      fprintf (codefile,
-		       "%s = malloc(sizeof(*%s));\n",
-		       s, s);
-	  decode_type (s, m->type);
-	  fprintf (codefile,
-		   "if(dce_fix){\n"
-		   "e = der_match_tag_and_length (p, len, "
-		   "(Der_class)0, (Der_type)0, 0, &reallen, &l);\n"
-		   "FORW;\n"
-		   "}else \n"
-		   "len = oldlen - newlen;\n"
-		   "}\n"
-		   "}\n");
-	  fprintf (codefile,
-		   "}\n");
-      }
-      if (tag == -1)
-	tag = m->val;
-      free (s);
+			 "int dce_fix;\n"
+			 "oldlen = len;\n"
+			 "if((dce_fix = fix_dce(newlen, &len)) < 0)"
+			 "return ASN1_BAD_FORMAT;\n");
+		if (m->optional)
+		    fprintf (codefile,
+			     "%s = malloc(sizeof(*%s));\n",
+			     s, s);
+		decode_type (s, m->type);
+		fprintf (codefile,
+			 "if(dce_fix){\n"
+			 "e = der_match_tag_and_length (p, len, "
+			 "(Der_class)0, (Der_type)0, 0, &reallen, &l);\n"
+			 "FORW;\n"
+			 "}else \n"
+			 "len = oldlen - newlen;\n"
+			 "}\n"
+			 "}\n");
+		fprintf (codefile,
+			 "}\n");
+	    }
+	    if (tag == -1)
+		tag = m->val;
+	    free (s);
+	}
+	fprintf(codefile,
+		"if(dce_fix){\n"
+		"e = der_match_tag_and_length (p, len, "
+		"(Der_class)0, (Der_type)0, 0, &reallen, &l);\n"
+		"FORW;\n"
+		"}\n"
+		"}\n");
+
+	break;
     }
-    fprintf(codefile,
-	    "if(dce_fix){\n"
-	    "e = der_match_tag_and_length (p, len, "
-	    "(Der_class)0, (Der_type)0, 0, &reallen, &l);\n"
-	    "FORW;\n"
-	    "}\n"
-	    "}\n");
+    case TSequenceOf: {
+	char *n;
 
-    break;
-  }
-  case TSequenceOf: {
-    char *n;
+	fprintf (codefile,
+		 "e = der_match_tag_and_length (p, len, UNIV, CONS, UT_Sequence,"
+		 "&reallen, &l);\n"
+		 "FORW;\n"
+		 "if(len < reallen)\n"
+		 "return ASN1_OVERRUN;\n"
+		 "len = reallen;\n");
 
-    fprintf (codefile,
-	     "e = der_match_tag_and_length (p, len, UNIV, CONS, UT_Sequence,"
-	     "&reallen, &l);\n"
-	     "FORW;\n"
-	     "if(len < reallen)\n"
-	     "return ASN1_OVERRUN;\n"
-	     "len = reallen;\n");
+	fprintf (codefile,
+		 "{\n"
+		 "size_t origlen = len;\n"
+		 "int oldret = ret;\n"
+		 "ret = 0;\n"
+		 "(%s)->len = 0;\n"
+		 "(%s)->val = NULL;\n"
+		 "while(ret < origlen) {\n"
+		 "(%s)->len++;\n"
+		 "(%s)->val = realloc((%s)->val, sizeof(*((%s)->val)) * (%s)->len);\n",
+		 name, name, name, name, name, name, name);
+	asprintf (&n, "&(%s)->val[(%s)->len-1]", name, name);
+	decode_type (n, t->subtype);
+	fprintf (codefile, 
+		 "len = origlen - ret;\n"
+		 "}\n"
+		 "ret += oldret;\n"
+		 "}\n");
+	free (n);
+	break;
+    }
+    case TGeneralizedTime:
+	decode_primitive ("generalized_time", name);
+	break;
+    case TGeneralString:
+	decode_primitive ("general_string", name);
+	break;
+    case TApplication:
+	fprintf (codefile,
+		 "e = der_match_tag_and_length (p, len, APPL, CONS, %d, "
+		 "&reallen, &l);\n"
+		 "FORW;\n"
+		 "{\n"
+		 "int dce_fix;\n"
+		 "if((dce_fix = fix_dce(reallen, &len)) < 0)\n"
+		 "return ASN1_BAD_FORMAT;\n", 
+		 t->application);
+	decode_type (name, t->subtype);
+	fprintf(codefile,
+		"if(dce_fix){\n"
+		"e = der_match_tag_and_length (p, len, "
+		"(Der_class)0, (Der_type)0, 0, &reallen, &l);\n"
+		"FORW;\n"
+		"}\n"
+		"}\n");
 
-    fprintf (codefile,
-	     "{\n"
-	     "size_t origlen = len;\n"
-	     "int oldret = ret;\n"
-	     "ret = 0;\n"
-	     "(%s)->len = 0;\n"
-	     "(%s)->val = NULL;\n"
-	     "while(ret < origlen) {\n"
-	     "(%s)->len++;\n"
-	     "(%s)->val = realloc((%s)->val, sizeof(*((%s)->val)) * (%s)->len);\n",
-	     name, name, name, name, name, name, name);
-    asprintf (&n, "&(%s)->val[(%s)->len-1]", name, name);
-    decode_type (n, t->subtype);
-    fprintf (codefile, 
-	     "len = origlen - ret;\n"
-	     "}\n"
-	     "ret += oldret;\n"
-	     "}\n");
-    free (n);
-    break;
-  }
-  case TGeneralizedTime:
-    decode_primitive ("generalized_time", name);
-    break;
-  case TGeneralString:
-    decode_primitive ("general_string", name);
-    break;
-  case TApplication:
-    fprintf (codefile,
-	     "e = der_match_tag_and_length (p, len, APPL, CONS, %d, "
-	     "&reallen, &l);\n"
-	     "FORW;\n"
-	     "{\n"
-	     "int dce_fix;\n"
-	     "if((dce_fix = fix_dce(reallen, &len)) < 0)\n"
-	     "return ASN1_BAD_FORMAT;\n", 
-	     t->application);
-    decode_type (name, t->subtype);
-    fprintf(codefile,
-	    "if(dce_fix){\n"
-	    "e = der_match_tag_and_length (p, len, "
-	    "(Der_class)0, (Der_type)0, 0, &reallen, &l);\n"
-	    "FORW;\n"
-	    "}\n"
-	    "}\n");
-
-    break;
-  default :
-    abort ();
-  }
+	break;
+    default :
+	abort ();
+    }
 }
 
 void
@@ -285,20 +294,10 @@ generate_type_decode (const Symbol *s)
 
   switch (s->type->type) {
   case TInteger:
-    fprintf (codefile, "return decode_integer (p, len, data, size);\n");
-    break;
   case TUInteger:
-    fprintf (codefile, "return decode_unsigned (p, len, data, size);\n");
-    break;
   case TOctetString:
-    fprintf (codefile, "return decode_octet_string (p, len, data, size);\n");
-    break;
   case TGeneralizedTime:
-    fprintf (codefile, "return decode_generalized_time (p, len, data, size);\n");
-    break;
   case TGeneralString:
-    fprintf (codefile, "return decode_general_string (p, len, data, size);\n");
-    break;
   case TBitString:
   case TSequence:
   case TSequenceOf:
@@ -309,6 +308,7 @@ generate_type_decode (const Symbol *s)
 	     "size_t l;\n"
 	     "int i, e;\n\n");
     fprintf(codefile, "i = 0;\n"); /* hack to avoid `unused variable' */
+    fprintf(codefile, "reallen = 0;\n"); /* hack to avoid `unused variable' */
 
     decode_type ("data", s->type);
     fprintf (codefile, 
diff --git a/lib/asn1/gen_encode.c b/lib/asn1/gen_encode.c
index 4455def88..1c65bfc8d 100644
--- a/lib/asn1/gen_encode.c
+++ b/lib/asn1/gen_encode.c
@@ -48,157 +48,166 @@ encode_primitive (const char *typename, const char *name)
 static void
 encode_type (const char *name, const Type *t)
 {
-  switch (t->type) {
-  case TType:
+    switch (t->type) {
+    case TType:
 #if 0
-    encode_type (name, t->symbol->type);
+	encode_type (name, t->symbol->type);
 #endif
-    fprintf (codefile,
-	     "e = encode_%s(p, len, %s, &l);\n"
-	     "BACK;\n",
-	     t->symbol->gen_name, name);
-    break;
-  case TInteger:
-    encode_primitive ("integer", name);
-    break;
-  case TUInteger:
-    encode_primitive ("unsigned", name);
-    break;
-  case TOctetString:
-    encode_primitive ("octet_string", name);
-    break;
-  case TBitString: {
-    Member *m;
-    int pos;
-    int rest;
-    int tag = -1;
-
-    if (t->members == NULL)
-      break;
-
-    fprintf (codefile, "{\n"
-	     "unsigned char c = 0;\n");
-    pos = t->members->prev->val;
-    /* fix for buggy MIT (and OSF?) code */
-    if (pos > 31)
-	abort ();
-    /*
-     * It seems that if we do not always set pos to 31 here, the MIT
-     * code will do the wrong thing.
-     *
-     * I hate ASN.1 (and DER), but I hate it even more when everybody
-     * has to screw it up differently.
-     */
-    pos = 31;
-    rest = 7 - (pos % 8);
-
-    for (m = t->members->prev; m && tag != m->val; m = m->prev) {
-      while (m->val / 8 < pos / 8) {
 	fprintf (codefile,
-		 "*p-- = c; len--; ret++;\n"
-		 "c = 0;\n");
-	pos -= 8;
-      }
-      fprintf (codefile,
-	       "if(%s->%s) c |= 1<<%d;\n", name, m->gen_name,
-	       7 - m->val % 8);
+		 "e = encode_%s(p, len, %s, &l);\n"
+		 "BACK;\n",
+		 t->symbol->gen_name, name);
+	break;
+    case TInteger:
+	if(t->members == NULL)
+	    encode_primitive ("integer", name);
+	else {
+	    char *s;
+	    asprintf(&s, "(const int*)%s", name);
+	    if(s == NULL)
+		errx(1, "out of memory");
+	    encode_primitive ("integer", s);
+	    free(s);
+	}
+	break;
+    case TUInteger:
+	encode_primitive ("unsigned", name);
+	break;
+    case TOctetString:
+	encode_primitive ("octet_string", name);
+	break;
+    case TBitString: {
+	Member *m;
+	int pos;
+	int rest;
+	int tag = -1;
 
-      if (tag == -1)
-	tag = m->val;
+	if (t->members == NULL)
+	    break;
+
+	fprintf (codefile, "{\n"
+		 "unsigned char c = 0;\n");
+	pos = t->members->prev->val;
+	/* fix for buggy MIT (and OSF?) code */
+	if (pos > 31)
+	    abort ();
+	/*
+	 * It seems that if we do not always set pos to 31 here, the MIT
+	 * code will do the wrong thing.
+	 *
+	 * I hate ASN.1 (and DER), but I hate it even more when everybody
+	 * has to screw it up differently.
+	 */
+	pos = 31;
+	rest = 7 - (pos % 8);
+
+	for (m = t->members->prev; m && tag != m->val; m = m->prev) {
+	    while (m->val / 8 < pos / 8) {
+		fprintf (codefile,
+			 "*p-- = c; len--; ret++;\n"
+			 "c = 0;\n");
+		pos -= 8;
+	    }
+	    fprintf (codefile,
+		     "if(%s->%s) c |= 1<<%d;\n", name, m->gen_name,
+		     7 - m->val % 8);
+
+	    if (tag == -1)
+		tag = m->val;
+	}
+
+	fprintf (codefile, 
+		 "*p-- = c;\n"
+		 "*p-- = %d;\n"
+		 "len -= 2;\n"
+		 "ret += 2;\n"
+		 "}\n\n"
+		 "e = der_put_length_and_tag (p, len, ret, UNIV, PRIM,"
+		 "UT_BitString, &l);\n"
+		 "BACK;\n",
+		 rest);
+	break;
     }
+    case TSequence: {
+	Member *m;
+	int tag = -1;
 
-    fprintf (codefile, 
-	     "*p-- = c;\n"
-	     "*p-- = %d;\n"
-	     "len -= 2;\n"
-	     "ret += 2;\n"
-	     "}\n\n"
-	     "e = der_put_length_and_tag (p, len, ret, UNIV, PRIM,"
-	     "UT_BitString, &l);\n"
-	     "BACK;\n",
-	     rest);
-    break;
-  }
-  case TSequence: {
-    Member *m;
-    int tag = -1;
+	if (t->members == NULL)
+	    break;
 
-    if (t->members == NULL)
-      break;
+	for (m = t->members->prev; m && tag != m->val; m = m->prev) {
+	    char *s;
 
-    for (m = t->members->prev; m && tag != m->val; m = m->prev) {
-      char *s;
-
-      asprintf (&s, "%s(%s)->%s", m->optional ? "" : "&", name, m->gen_name);
-      if (m->optional)
+	    asprintf (&s, "%s(%s)->%s", m->optional ? "" : "&", name, m->gen_name);
+	    if (m->optional)
+		fprintf (codefile,
+			 "if(%s)\n",
+			 s);
+#if 1
+	    fprintf (codefile, "{\n"
+		     "int oldret = ret;\n"
+		     "ret = 0;\n");
+#endif
+	    encode_type (s, m->type);
+	    fprintf (codefile,
+		     "e = der_put_length_and_tag (p, len, ret, CONTEXT, CONS, "
+		     "%d, &l);\n"
+		     "BACK;\n",
+		     m->val);
+#if 1
+	    fprintf (codefile,
+		     "ret += oldret;\n"
+		     "}\n");
+#endif
+	    if (tag == -1)
+		tag = m->val;
+	    free (s);
+	}
 	fprintf (codefile,
-		 "if(%s)\n",
-		 s);
-#if 1
-      fprintf (codefile, "{\n"
-	       "int oldret = ret;\n"
-	       "ret = 0;\n");
-#endif
-      encode_type (s, m->type);
-      fprintf (codefile,
-	       "e = der_put_length_and_tag (p, len, ret, CONTEXT, CONS, "
-	       "%d, &l);\n"
-	       "BACK;\n",
-	       m->val);
-#if 1
-      fprintf (codefile,
-	       "ret += oldret;\n"
-	       "}\n");
-#endif
-      if (tag == -1)
-	tag = m->val;
-      free (s);
+		 "e = der_put_length_and_tag (p, len, ret, UNIV, CONS, UT_Sequence, &l);\n"
+		 "BACK;\n");
+	break;
     }
-    fprintf (codefile,
-	     "e = der_put_length_and_tag (p, len, ret, UNIV, CONS, UT_Sequence, &l);\n"
-	     "BACK;\n");
-    break;
-  }
-  case TSequenceOf: {
-    char *n;
+    case TSequenceOf: {
+	char *n;
 
-    fprintf (codefile,
-	     "for(i = (%s)->len - 1; i >= 0; --i) {\n"
+	fprintf (codefile,
+		 "for(i = (%s)->len - 1; i >= 0; --i) {\n"
 #if 1
-	     "int oldret = ret;\n"
-	     "ret = 0;\n",
+		 "int oldret = ret;\n"
+		 "ret = 0;\n",
 #else
-	     ,
+		 ,
 #endif
-	     name);
-    asprintf (&n, "&(%s)->val[i]", name);
-    encode_type (n, t->subtype);
-    fprintf (codefile,
+		 name);
+	asprintf (&n, "&(%s)->val[i]", name);
+	encode_type (n, t->subtype);
+	fprintf (codefile,
 #if 1
-	     "ret += oldret;\n"
+		 "ret += oldret;\n"
 #endif
-	     "}\n"
-	     "e = der_put_length_and_tag (p, len, ret, UNIV, CONS, UT_Sequence, &l);\n"
-	     "BACK;\n");
-    free (n);
-    break;
-  }
-  case TGeneralizedTime:
-    encode_primitive ("generalized_time", name);
-    break;
-  case TGeneralString:
-    encode_primitive ("general_string", name);
-    break;
-  case TApplication:
-    encode_type (name, t->subtype);
-    fprintf (codefile,
-	     "e = der_put_length_and_tag (p, len, ret, APPL, CONS, %d, &l);\n"
-	     "BACK;\n",
-	     t->application);
-    break;
-  default:
-    abort ();
-  }
+		 "}\n"
+		 "e = der_put_length_and_tag (p, len, ret, UNIV, CONS, UT_Sequence, &l);\n"
+		 "BACK;\n");
+	free (n);
+	break;
+    }
+    case TGeneralizedTime:
+	encode_primitive ("generalized_time", name);
+	break;
+    case TGeneralString:
+	encode_primitive ("general_string", name);
+	break;
+    case TApplication:
+	encode_type (name, t->subtype);
+	fprintf (codefile,
+		 "e = der_put_length_and_tag (p, len, ret, APPL, CONS, %d, &l);\n"
+		 "BACK;\n",
+		 t->application);
+	break;
+    default:
+	abort ();
+    }
 }
 
 void
@@ -220,20 +229,10 @@ generate_type_encode (const Symbol *s)
 
   switch (s->type->type) {
   case TInteger:
-    fprintf (codefile, "return encode_integer (p, len, data, size);\n");
-    break;
   case TUInteger:
-    fprintf (codefile, "return encode_unsigned (p, len, data, size);\n");
-    break;
   case TOctetString:
-    fprintf (codefile, "return encode_octet_string (p, len, data, size);\n");
-    break;
   case TGeneralizedTime:
-    fprintf (codefile, "return encode_generalized_time (p, len, data, size);\n");
-    break;
   case TGeneralString:
-    fprintf (codefile, "return encode_general_string (p, len, data, size);\n");
-    break;
   case TBitString:
   case TSequence:
   case TSequenceOf:
@@ -245,7 +244,8 @@ generate_type_encode (const Symbol *s)
 	     "int i, e;\n\n");
     fprintf(codefile, "i = 0;\n"); /* hack to avoid `unused variable' */
     
-    encode_type ("data", s->type);
+      encode_type("data", s->type);
+
     fprintf (codefile, "*size = ret;\n"
 	     "return 0;\n");
     break;
diff --git a/lib/asn1/gen_length.c b/lib/asn1/gen_length.c
index 6acdec12c..c71cb5413 100644
--- a/lib/asn1/gen_length.c
+++ b/lib/asn1/gen_length.c
@@ -46,94 +46,103 @@ length_primitive (const char *typename,
 static void
 length_type (const char *name, const Type *t, const char *variable)
 {
-  switch (t->type) {
-  case TType:
+    switch (t->type) {
+    case TType:
 #if 0
-      length_type (name, t->symbol->type);
+	length_type (name, t->symbol->type);
 #endif
-      fprintf (codefile, "%s += length_%s(%s);\n",
-	       variable, t->symbol->gen_name, name);
-      break;
-  case TInteger:
-      length_primitive ("integer", name, variable);
-      break;
-  case TUInteger:
-      length_primitive ("unsigned", name, variable);
-      break;
-  case TOctetString:
-      length_primitive ("octet_string", name, variable);
-      break;
-  case TBitString: {
-      /*
-       * XXX - Hope this is correct
-       * look at TBitString case in `encode_type'
-       */
-      fprintf (codefile, "%s += 7;\n", variable);
-      break;
-  }
-  case TSequence: {
-      Member *m;
-      int tag = -1;
+	fprintf (codefile, "%s += length_%s(%s);\n",
+		 variable, t->symbol->gen_name, name);
+	break;
+    case TInteger:
+        if(t->members == NULL)
+            length_primitive ("integer", name, variable);
+        else {
+            char *s;
+            asprintf(&s, "(const int*)%s", name);
+            if(s == NULL)
+                return ENOMEM;
+            length_primitive ("integer", s, variable);
+            free(s);
+        }
+	break;
+    case TUInteger:
+	length_primitive ("unsigned", name, variable);
+	break;
+    case TOctetString:
+	length_primitive ("octet_string", name, variable);
+	break;
+    case TBitString: {
+	/*
+	 * XXX - Hope this is correct
+	 * look at TBitString case in `encode_type'
+	 */
+	fprintf (codefile, "%s += 7;\n", variable);
+	break;
+    }
+    case TSequence: {
+	Member *m;
+	int tag = -1;
 
-      if (t->members == NULL)
-	  break;
+	if (t->members == NULL)
+	    break;
       
-      for (m = t->members; m && tag != m->val; m = m->next) {
-	  char *s;
+	for (m = t->members; m && tag != m->val; m = m->next) {
+	    char *s;
 
-	  asprintf (&s, "%s(%s)->%s",
-		    m->optional ? "" : "&", name, m->gen_name);
-	  if (m->optional)
-	      fprintf (codefile, "if(%s)", s);
-	  fprintf (codefile, "{\n"
-		   "int oldret = %s;\n"
-		   "%s = 0;\n", variable, variable);
-	  length_type (s, m->type, "ret");
-	  fprintf (codefile, "%s += 1 + length_len(%s) + oldret;\n",
-		   variable, variable);
-	  fprintf (codefile, "}\n");
-	  if (tag == -1)
-	      tag = m->val;
-	  free (s);
-      }
-      fprintf (codefile,
-	       "%s += 1 + length_len(%s);\n", variable, variable);
-      break;
-  }
-  case TSequenceOf: {
-      char *n;
+	    asprintf (&s, "%s(%s)->%s",
+		      m->optional ? "" : "&", name, m->gen_name);
+	    if (m->optional)
+		fprintf (codefile, "if(%s)", s);
+	    fprintf (codefile, "{\n"
+		     "int oldret = %s;\n"
+		     "%s = 0;\n", variable, variable);
+	    length_type (s, m->type, "ret");
+	    fprintf (codefile, "%s += 1 + length_len(%s) + oldret;\n",
+		     variable, variable);
+	    fprintf (codefile, "}\n");
+	    if (tag == -1)
+		tag = m->val;
+	    free (s);
+	}
+	fprintf (codefile,
+		 "%s += 1 + length_len(%s);\n", variable, variable);
+	break;
+    }
+    case TSequenceOf: {
+	char *n;
 
-      fprintf (codefile,
-	       "{\n"
-	       "int oldret = %s;\n"
-	       "int i;\n"
-	       "%s = 0;\n",
-	       variable, variable);
+	fprintf (codefile,
+		 "{\n"
+		 "int oldret = %s;\n"
+		 "int i;\n"
+		 "%s = 0;\n",
+		 variable, variable);
 
-      fprintf (codefile, "for(i = (%s)->len - 1; i >= 0; --i){\n", name);
-      asprintf (&n, "&(%s)->val[i]", name);
-      length_type(n, t->subtype, variable);
-      fprintf (codefile, "}\n");
+	fprintf (codefile, "for(i = (%s)->len - 1; i >= 0; --i){\n", name);
+	asprintf (&n, "&(%s)->val[i]", name);
+	length_type(n, t->subtype, variable);
+	fprintf (codefile, "}\n");
 
-      fprintf (codefile,
-	       "%s += 1 + length_len(%s) + oldret;\n"
-	       "}\n", variable, variable);
-      free(n);
-      break;
-  }
-  case TGeneralizedTime:
-      length_primitive ("generalized_time", name, variable);
-      break;
-  case TGeneralString:
-      length_primitive ("general_string", name, variable);
-      break;
-  case TApplication:
-      length_type (name, t->subtype, variable);
-      fprintf (codefile, "ret += 1 + length_len (ret);\n");
-      break;
-  default :
-      abort ();
-  }
+	fprintf (codefile,
+		 "%s += 1 + length_len(%s) + oldret;\n"
+		 "}\n", variable, variable);
+	free(n);
+	break;
+    }
+    case TGeneralizedTime:
+	length_primitive ("generalized_time", name, variable);
+	break;
+    case TGeneralString:
+	length_primitive ("general_string", name, variable);
+	break;
+    case TApplication:
+	length_type (name, t->subtype, variable);
+	fprintf (codefile, "ret += 1 + length_len (ret);\n");
+	break;
+    default :
+	abort ();
+    }
 }
 
 void