Commit much improved ASN.1 compiler from joda-choice-branch.
Highlighs for the compiler is support for CHOICE and in general better support for tags. This compiler support most of what is needed for PK-INIT, LDAP, X.509, PKCS-12 and many other protocols. git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@15617 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1997 - 2003 Kungliga Tekniska H<>gskolan
|
||||
* Copyright (c) 1997 - 2005 Kungliga Tekniska H<>gskolan
|
||||
* (Royal Institute of Technology, Stockholm, Sweden).
|
||||
* All rights reserved.
|
||||
*
|
||||
@@ -42,92 +42,136 @@ free_primitive (const char *typename, const char *name)
|
||||
}
|
||||
|
||||
static void
|
||||
free_type (const char *name, const Type *t)
|
||||
free_type (const char *name, const Type *t, int preserve)
|
||||
{
|
||||
switch (t->type) {
|
||||
case TType:
|
||||
switch (t->type) {
|
||||
case TType:
|
||||
#if 0
|
||||
free_type (name, t->symbol->type);
|
||||
free_type (name, t->symbol->type, preserve);
|
||||
#endif
|
||||
fprintf (codefile, "free_%s(%s);\n", t->symbol->gen_name, name);
|
||||
break;
|
||||
case TInteger:
|
||||
case TUInteger:
|
||||
case TBoolean:
|
||||
case TEnumerated :
|
||||
break;
|
||||
case TOctetString:
|
||||
free_primitive ("octet_string", name);
|
||||
break;
|
||||
case TOID :
|
||||
free_primitive ("oid", name);
|
||||
break;
|
||||
case TBitString: {
|
||||
break;
|
||||
}
|
||||
case TSequence: {
|
||||
Member *m;
|
||||
int tag = -1;
|
||||
fprintf (codefile, "free_%s(%s);\n", t->symbol->gen_name, name);
|
||||
break;
|
||||
case TInteger:
|
||||
case TBoolean:
|
||||
case TEnumerated :
|
||||
case TNull:
|
||||
case TGeneralizedTime:
|
||||
case TUTCTime:
|
||||
break;
|
||||
case TBitString:
|
||||
if (ASN1_TAILQ_EMPTY(t->members))
|
||||
free_primitive("bit_string", name);
|
||||
break;
|
||||
case TOctetString:
|
||||
free_primitive ("octet_string", name);
|
||||
break;
|
||||
case TChoice:
|
||||
case TSet:
|
||||
case TSequence: {
|
||||
Member *m, *have_ellipsis = NULL;
|
||||
|
||||
if (t->members == NULL)
|
||||
break;
|
||||
if (t->members == NULL)
|
||||
break;
|
||||
|
||||
if ((t->type == TSequence || t->type == TChoice) && preserve)
|
||||
fprintf(codefile, "free_octet_string(&data->_save);\n");
|
||||
|
||||
if(t->type == TChoice)
|
||||
fprintf(codefile, "switch((%s)->element) {\n", name);
|
||||
|
||||
for (m = t->members; m && tag != m->val; m = m->next) {
|
||||
char *s;
|
||||
ASN1_TAILQ_FOREACH(m, t->members, members) {
|
||||
char *s;
|
||||
|
||||
asprintf (&s, "%s(%s)->%s",
|
||||
m->optional ? "" : "&", name, m->gen_name);
|
||||
if(m->optional)
|
||||
fprintf(codefile, "if(%s) {\n", s);
|
||||
free_type (s, m->type);
|
||||
if(m->optional)
|
||||
fprintf(codefile,
|
||||
"free(%s);\n"
|
||||
"%s = NULL;\n"
|
||||
"}\n", s, s);
|
||||
if (tag == -1)
|
||||
tag = m->val;
|
||||
free (s);
|
||||
}
|
||||
break;
|
||||
}
|
||||
case TSequenceOf: {
|
||||
char *n;
|
||||
if (m->ellipsis){
|
||||
have_ellipsis = m;
|
||||
continue;
|
||||
}
|
||||
|
||||
fprintf (codefile, "while((%s)->len){\n", name);
|
||||
asprintf (&n, "&(%s)->val[(%s)->len-1]", name, name);
|
||||
free_type(n, t->subtype);
|
||||
fprintf(codefile,
|
||||
"(%s)->len--;\n"
|
||||
"}\n",
|
||||
name);
|
||||
fprintf(codefile,
|
||||
"free((%s)->val);\n"
|
||||
"(%s)->val = NULL;\n", name, name);
|
||||
free(n);
|
||||
break;
|
||||
}
|
||||
case TGeneralizedTime:
|
||||
break;
|
||||
case TGeneralString:
|
||||
free_primitive ("general_string", name);
|
||||
break;
|
||||
case TUTF8String:
|
||||
free_primitive ("utf8string", name);
|
||||
break;
|
||||
case TNull:
|
||||
break;
|
||||
case TApplication:
|
||||
free_type (name, t->subtype);
|
||||
break;
|
||||
default :
|
||||
abort ();
|
||||
}
|
||||
if(t->type == TChoice)
|
||||
fprintf(codefile, "case %s:\n", m->label);
|
||||
asprintf (&s, "%s(%s)->%s%s",
|
||||
m->optional ? "" : "&", name,
|
||||
t->type == TChoice ? "u." : "", m->gen_name);
|
||||
if (s == NULL)
|
||||
errx(1, "malloc");
|
||||
if(m->optional)
|
||||
fprintf(codefile, "if(%s) {\n", s);
|
||||
free_type (s, m->type, FALSE);
|
||||
if(m->optional)
|
||||
fprintf(codefile,
|
||||
"free(%s);\n"
|
||||
"%s = NULL;\n"
|
||||
"}\n",s, s);
|
||||
free (s);
|
||||
if(t->type == TChoice)
|
||||
fprintf(codefile, "break;\n");
|
||||
}
|
||||
|
||||
if(t->type == TChoice) {
|
||||
if (have_ellipsis)
|
||||
fprintf(codefile,
|
||||
"case %s:\n"
|
||||
"free_octet_string(&(%s)->u.%s);\n"
|
||||
"break;",
|
||||
have_ellipsis->label,
|
||||
name, have_ellipsis->gen_name);
|
||||
fprintf(codefile, "}\n");
|
||||
}
|
||||
break;
|
||||
}
|
||||
case TSetOf:
|
||||
case TSequenceOf: {
|
||||
char *n;
|
||||
|
||||
fprintf (codefile, "while((%s)->len){\n", name);
|
||||
asprintf (&n, "&(%s)->val[(%s)->len-1]", name, name);
|
||||
if (n == NULL)
|
||||
errx(1, "malloc");
|
||||
free_type(n, t->subtype, FALSE);
|
||||
fprintf(codefile,
|
||||
"(%s)->len--;\n"
|
||||
"}\n",
|
||||
name);
|
||||
fprintf(codefile,
|
||||
"free((%s)->val);\n"
|
||||
"(%s)->val = NULL;\n", name, name);
|
||||
free(n);
|
||||
break;
|
||||
}
|
||||
case TGeneralString:
|
||||
free_primitive ("general_string", name);
|
||||
break;
|
||||
case TUTF8String:
|
||||
free_primitive ("utf8string", name);
|
||||
break;
|
||||
case TPrintableString:
|
||||
free_primitive ("printable_string", name);
|
||||
break;
|
||||
case TIA5String:
|
||||
free_primitive ("ia5_string", name);
|
||||
break;
|
||||
case TBMPString:
|
||||
free_primitive ("bmp_string", name);
|
||||
break;
|
||||
case TUniversalString:
|
||||
free_primitive ("universal_string", name);
|
||||
break;
|
||||
case TTag:
|
||||
free_type (name, t->subtype, preserve);
|
||||
break;
|
||||
case TOID :
|
||||
free_primitive ("oid", name);
|
||||
break;
|
||||
default :
|
||||
abort ();
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
generate_type_free (const Symbol *s)
|
||||
{
|
||||
int preserve = preserve_type(s->name) ? TRUE : FALSE;
|
||||
|
||||
fprintf (headerfile,
|
||||
"void free_%s (%s *);\n",
|
||||
s->gen_name, s->gen_name);
|
||||
@@ -137,7 +181,7 @@ generate_type_free (const Symbol *s)
|
||||
"{\n",
|
||||
s->gen_name, s->gen_name);
|
||||
|
||||
free_type ("data", s->type);
|
||||
free_type ("data", s->type, preserve);
|
||||
fprintf (codefile, "}\n\n");
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user