oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Now all decode_* and encode_* functions now take a final size_t*

Browse Source 
argument, that they return the size in. Return values are zero for
success, and anything else (such as some ASN1_* constant) for error.


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@1951 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
1997-07-01 23:52:30 +00:00
parent ae8c2b0909
commit 372881f5ef
14 changed files with 624 additions and 477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

175
lib/asn1/gen_decode.c
View File

@@ -6,7 +6,7 @@ static void
decode_primitive (char *typename, char *name)
{
fprintf (codefile,
"l = decode_%s(p, len, %s);\n"
"e = decode_%s(p, len, %s, &l);\n"
"FORW;\n",
typename,
name);
@@ -21,7 +21,7 @@ decode_type (char *name, Type *t)
decode_type (name, t->symbol->type);
#endif
fprintf (codefile,
"l = decode_%s(p, len, %s);\n"
"e = decode_%s(p, len, %s, &l);\n"
"FORW;\n",
t->symbol->gen_name, name);
break;
@@ -37,11 +37,11 @@ decode_type (char *name, Type *t)
int pos;
fprintf (codefile,
"l = der_match_tag_and_length (p, len, UNIV, PRIM, UT_BitString,"
"&reallen);\n"
"e = der_match_tag_and_length (p, len, UNIV, PRIM, UT_BitString,"
"&reallen, &l);\n"
"FORW;\n"
"if(len < reallen)\n"
"return -1;\n"
"return ASN1_OVERRUN;\n"
"p++;\n"
"len--;\n"
"reallen--;\n"
@@ -71,35 +71,67 @@ decode_type (char *name, Type *t)
break;
fprintf (codefile,
"l = der_match_tag_and_length (p, len, UNIV, CONS, UT_Sequence,"
"&reallen);\n"
"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 -1;\n");
"return ASN1_BAD_FORMAT;\n");
for (m = t->members; m && tag != m->val; m = m->next) {
char *s = malloc(2 + strlen(name) + 1 + strlen(m->gen_name) + 3);
sprintf (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");
}else{
fprintf (codefile, "{\n"
"int newlen, oldlen;\n\n"
"l = der_match_tag (p, len, CONTEXT, CONS, %d);\n",
"size_t newlen, oldlen;\n\n"
"e = der_match_tag (p, len, CONTEXT, CONS, %d, &l);\n",
m->val);
fprintf (codefile,
"if(l >= 0) {\n"
"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"
"l = der_get_length (p, len, &newlen);\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 -1;\n");
"return ASN1_BAD_FORMAT;\n");
if (m->optional)
fprintf (codefile,
"%s = malloc(sizeof(*%s));\n",
@@ -107,30 +139,23 @@ decode_type (char *name, Type *t)
decode_type (s, m->type);
fprintf (codefile,
"if(dce_fix){\n"
"l = der_match_tag_and_length (p, len, 0, 0, 0, &reallen);\n"
"e = der_match_tag_and_length (p, len, 0, 0, 0, "
"&reallen, &l);\n"
"FORW;\n"
"}else \n"
"len = oldlen - newlen;\n"
"}\n"
"}\n"
"else {\n");
if(m->optional)
fprintf (codefile,
"%s = NULL;\n"
"}\n", s);
else
fprintf (codefile,
"return l;\n"
"}\n");
"}\n");
fprintf (codefile,
"}\n");
}
if (tag == -1)
tag = m->val;
free (s);
}
fprintf(codefile,
"if(dce_fix){\n"
"l = der_match_tag_and_length (p, len, 0, 0, 0, &reallen);\n"
"e = der_match_tag_and_length (p, len, 0, 0, 0, &reallen, &l);\n"
"FORW;\n"
"}\n"
"}\n");
@@ -141,11 +166,11 @@ decode_type (char *name, Type *t)
char *n = malloc(2*strlen(name) + 20);
fprintf (codefile,
"l = der_match_tag_and_length (p, len, UNIV, CONS, UT_Sequence,"
"&reallen);\n"
"e = der_match_tag_and_length (p, len, UNIV, CONS, UT_Sequence,"
"&reallen, &l);\n"
"FORW;\n"
"if(len < reallen)\n"
"return -1;\n"
"return ASN1_OVERRUN;\n"
"len = reallen;\n");
fprintf (codefile,
@@ -170,17 +195,18 @@ decode_type (char *name, Type *t)
break;
case TApplication:
fprintf (codefile,
"l = der_match_tag_and_length (p, len, APPL, CONS, %d, &reallen);\n"
"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 -1;\n",
"return ASN1_BAD_FORMAT;\n",
t->application);
decode_type (name, t->subtype);
fprintf(codefile,
"if(dce_fix){\n"
"l = der_match_tag_and_length (p, len, 0, 0, 0, &reallen);\n"
"e = der_match_tag_and_length (p, len, 0, 0, 0, &reallen, &l);\n"
"FORW;\n"
"}\n"
"}\n");
@@ -195,34 +221,33 @@ void
generate_type_decode (Symbol *s)
{
fprintf (headerfile,
"int decode_%s(unsigned char *, int, %s *);\n",
"int decode_%s(unsigned char *, size_t, %s *, size_t *);\n",
s->gen_name, s->gen_name);
fprintf (codefile, "#define FORW "
"if(l < 0)"
"return l;"
"p += l;"
"len -= l;"
"if(e) return e; "
"p += l; "
"len -= l; "
"ret += l\n\n");
fprintf (codefile, "int\n"
"decode_%s(unsigned char *p, int len, %s *data)\n"
"decode_%s(unsigned char *p, size_t len, %s *data, size_t *size)\n"
"{\n",
s->gen_name, s->gen_name);
switch (s->type->type) {
case TInteger:
fprintf (codefile, "return decode_integer (p, len, data);\n");
fprintf (codefile, "return decode_integer (p, len, data, size);\n");
break;
case TOctetString:
fprintf (codefile, "return decode_octet_string (p, len, data);\n");
fprintf (codefile, "return decode_octet_string (p, len, data, size);\n");
break;
case TGeneralizedTime:
fprintf (codefile, "return decode_generalized_time (p, len, data);\n");
fprintf (codefile, "return decode_generalized_time (p, len, data, size);\n");
break;
case TGeneralString:
fprintf (codefile, "return decode_general_string (p, len, data);\n");
fprintf (codefile, "return decode_general_string (p, len, data, size);\n");
break;
case TBitString:
case TSequence:
@@ -230,11 +255,14 @@ generate_type_decode (Symbol *s)
case TApplication:
case TType:
fprintf (codefile,
"int ret = 0, reallen;\n"
"int l, i;\n\n");
"size_t ret = 0, reallen;\n"
"size_t l;\n"
"int e, i;\n\n");
decode_type ("data", s->type);
fprintf (codefile, "return ret;\n");
fprintf (codefile,
"*size = ret;\n"
"return 0;\n");
break;
default:
abort ();
@@ -242,6 +270,65 @@ generate_type_decode (Symbol *s)
fprintf (codefile, "}\n\n");
}
void
generate_seq_type_decode (Symbol *s)
{
fprintf (headerfile,
"int decode_seq_%s(unsigned char *, size_t, int, int, "
"%s *, size_t *);\n",
s->gen_name, s->gen_name);
fprintf (codefile, "int\n"
"decode_seq_%s(unsigned char *p, size_t len, int tag, "
"int optional, %s *data, size_t *size)\n"
"{\n",
s->gen_name, s->gen_name);
fprintf (codefile,
"size_t newlen, oldlen;\n"
"size_t l, ret = 0;\n"
"int e;\n"
"int dce_fix;\n");
fprintf (codefile,
"e = der_match_tag(p, len, CONTEXT, CONS, tag, &l);\n"
"if (e)\n"
"return e;\n");
fprintf (codefile,
"p += l;\n"
"len -= l;\n"
"ret += l;\n"
"e = der_get_length(p, len, &newlen, &l);\n"
"if (e)\n"
"return e;\n"
"p += l;\n"
"len -= l;\n"
"ret += l;\n"
"oldlen = len;\n"
"if ((dce_fix = fix_dce(newlen, &len)) < 0)\n"
"return ASN1_BAD_FORMAT;\n"
"e = decode_%s(p, len, data, &l);\n"
"if (e)\n"
"return e;\n"
"p += l;\n"
"len -= l;\n"
"ret += l;\n"
"if (dce_fix) {\n"
"size_t reallen;\n\n"
"e = der_match_tag_and_length(p, len, 0, 0, 0, &reallen, &l);\n"
"if (e)\n"
"return e;\n"
"ret += l;\n"
"}\n",
s->gen_name);
fprintf (codefile,
"*size = ret;\n"
"return 0;\n");
fprintf (codefile, "}\n\n");
}
#if 0
static void
generate_type_decode (Symbol *s)