support for distinguished value integers
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@8396 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -227,7 +227,21 @@ define_type (int level, char *name, Type *t, int typedefp)
|
|||||||
break;
|
break;
|
||||||
case TInteger:
|
case TInteger:
|
||||||
space(level);
|
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;
|
break;
|
||||||
case TUInteger:
|
case TUInteger:
|
||||||
space(level);
|
space(level);
|
||||||
|
@@ -48,218 +48,227 @@ decode_primitive (const char *typename, const char *name)
|
|||||||
static void
|
static void
|
||||||
decode_type (const char *name, const Type *t)
|
decode_type (const char *name, const Type *t)
|
||||||
{
|
{
|
||||||
switch (t->type) {
|
switch (t->type) {
|
||||||
case TType:
|
case TType:
|
||||||
#if 0
|
#if 0
|
||||||
decode_type (name, t->symbol->type);
|
decode_type (name, t->symbol->type);
|
||||||
#endif
|
#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,
|
fprintf (codefile,
|
||||||
"p++; len--; reallen--; ret++;\n");
|
"e = decode_%s(p, len, %s, &l);\n"
|
||||||
pos += 8;
|
"FORW;\n",
|
||||||
}
|
t->symbol->gen_name, name);
|
||||||
fprintf (codefile,
|
break;
|
||||||
"%s->%s = (*p >> %d) & 1;\n",
|
case TInteger:
|
||||||
name, m->gen_name, 7 - m->val % 8);
|
if(t->members == NULL)
|
||||||
if (tag == -1)
|
decode_primitive ("integer", name);
|
||||||
tag = m->val;
|
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,
|
case TSequence: {
|
||||||
"p += reallen; len -= reallen; ret += reallen;\n");
|
Member *m;
|
||||||
break;
|
int tag = -1;
|
||||||
}
|
|
||||||
case TSequence: {
|
|
||||||
Member *m;
|
|
||||||
int tag = -1;
|
|
||||||
|
|
||||||
if (t->members == NULL)
|
if (t->members == NULL)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
fprintf (codefile,
|
fprintf (codefile,
|
||||||
"e = der_match_tag_and_length (p, len, UNIV, CONS, UT_Sequence,"
|
"e = der_match_tag_and_length (p, len, UNIV, CONS, UT_Sequence,"
|
||||||
"&reallen, &l);\n"
|
"&reallen, &l);\n"
|
||||||
"FORW;\n"
|
"FORW;\n"
|
||||||
"{\n"
|
"{\n"
|
||||||
"int dce_fix;\n"
|
"int dce_fix;\n"
|
||||||
"if((dce_fix = fix_dce(reallen, &len)) < 0)\n"
|
"if((dce_fix = fix_dce(reallen, &len)) < 0)\n"
|
||||||
"return ASN1_BAD_FORMAT;\n");
|
"return ASN1_BAD_FORMAT;\n");
|
||||||
|
|
||||||
for (m = t->members; m && tag != m->val; m = m->next) {
|
for (m = t->members; m && tag != m->val; m = m->next) {
|
||||||
char *s;
|
char *s;
|
||||||
|
|
||||||
asprintf (&s, "%s(%s)->%s", m->optional ? "" : "&", name, m->gen_name);
|
asprintf (&s, "%s(%s)->%s", m->optional ? "" : "&", name, m->gen_name);
|
||||||
if (0 && m->type->type == TType){
|
if (0 && m->type->type == TType){
|
||||||
if(m->optional)
|
if(m->optional)
|
||||||
fprintf (codefile,
|
fprintf (codefile,
|
||||||
"%s = malloc(sizeof(*%s));\n", s, s);
|
"%s = malloc(sizeof(*%s));\n", s, s);
|
||||||
fprintf (codefile,
|
fprintf (codefile,
|
||||||
"e = decode_seq_%s(p, len, %d, %d, %s, &l);\n",
|
"e = decode_seq_%s(p, len, %d, %d, %s, &l);\n",
|
||||||
m->type->symbol->gen_name,
|
m->type->symbol->gen_name,
|
||||||
m->val,
|
m->val,
|
||||||
m->optional,
|
m->optional,
|
||||||
s);
|
s);
|
||||||
if(m->optional)
|
if(m->optional)
|
||||||
fprintf (codefile,
|
fprintf (codefile,
|
||||||
"if (e == ASN1_MISSING_FIELD) {\n"
|
"if (e == ASN1_MISSING_FIELD) {\n"
|
||||||
"free(%s);\n"
|
"free(%s);\n"
|
||||||
"%s = NULL;\n"
|
"%s = NULL;\n"
|
||||||
"e = l = 0;\n"
|
"e = l = 0;\n"
|
||||||
"}\n",
|
"}\n",
|
||||||
s, s);
|
s, s);
|
||||||
|
|
||||||
fprintf (codefile, "FORW;\n");
|
fprintf (codefile, "FORW;\n");
|
||||||
|
|
||||||
}else{
|
}else{
|
||||||
fprintf (codefile, "{\n"
|
fprintf (codefile, "{\n"
|
||||||
"size_t newlen, oldlen;\n\n"
|
"size_t newlen, oldlen;\n\n"
|
||||||
"e = der_match_tag (p, len, CONTEXT, CONS, %d, &l);\n",
|
"e = der_match_tag (p, len, CONTEXT, CONS, %d, &l);\n",
|
||||||
m->val);
|
m->val);
|
||||||
fprintf (codefile,
|
fprintf (codefile,
|
||||||
"if (e)\n");
|
"if (e)\n");
|
||||||
if(m->optional)
|
if(m->optional)
|
||||||
/* XXX should look at e */
|
/* XXX should look at e */
|
||||||
fprintf (codefile,
|
fprintf (codefile,
|
||||||
"%s = NULL;\n", s);
|
"%s = NULL;\n", s);
|
||||||
else
|
else
|
||||||
fprintf (codefile,
|
fprintf (codefile,
|
||||||
"return e;\n");
|
"return e;\n");
|
||||||
fprintf (codefile,
|
fprintf (codefile,
|
||||||
"else {\n");
|
"else {\n");
|
||||||
fprintf (codefile,
|
fprintf (codefile,
|
||||||
"p += l;\n"
|
"p += l;\n"
|
||||||
"len -= l;\n"
|
"len -= l;\n"
|
||||||
"ret += l;\n"
|
"ret += l;\n"
|
||||||
"e = der_get_length (p, len, &newlen, &l);\n"
|
"e = der_get_length (p, len, &newlen, &l);\n"
|
||||||
"FORW;\n"
|
"FORW;\n"
|
||||||
"{\n"
|
"{\n"
|
||||||
|
|
||||||
"int dce_fix;\n"
|
"int dce_fix;\n"
|
||||||
"oldlen = len;\n"
|
"oldlen = len;\n"
|
||||||
"if((dce_fix = fix_dce(newlen, &len)) < 0)"
|
"if((dce_fix = fix_dce(newlen, &len)) < 0)"
|
||||||
"return ASN1_BAD_FORMAT;\n");
|
"return ASN1_BAD_FORMAT;\n");
|
||||||
if (m->optional)
|
if (m->optional)
|
||||||
fprintf (codefile,
|
fprintf (codefile,
|
||||||
"%s = malloc(sizeof(*%s));\n",
|
"%s = malloc(sizeof(*%s));\n",
|
||||||
s, s);
|
s, s);
|
||||||
decode_type (s, m->type);
|
decode_type (s, m->type);
|
||||||
fprintf (codefile,
|
fprintf (codefile,
|
||||||
"if(dce_fix){\n"
|
"if(dce_fix){\n"
|
||||||
"e = der_match_tag_and_length (p, len, "
|
"e = der_match_tag_and_length (p, len, "
|
||||||
"(Der_class)0, (Der_type)0, 0, &reallen, &l);\n"
|
"(Der_class)0, (Der_type)0, 0, &reallen, &l);\n"
|
||||||
"FORW;\n"
|
"FORW;\n"
|
||||||
"}else \n"
|
"}else \n"
|
||||||
"len = oldlen - newlen;\n"
|
"len = oldlen - newlen;\n"
|
||||||
"}\n"
|
"}\n"
|
||||||
"}\n");
|
"}\n");
|
||||||
fprintf (codefile,
|
fprintf (codefile,
|
||||||
"}\n");
|
"}\n");
|
||||||
}
|
}
|
||||||
if (tag == -1)
|
if (tag == -1)
|
||||||
tag = m->val;
|
tag = m->val;
|
||||||
free (s);
|
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,
|
case TSequenceOf: {
|
||||||
"if(dce_fix){\n"
|
char *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,
|
||||||
}
|
"e = der_match_tag_and_length (p, len, UNIV, CONS, UT_Sequence,"
|
||||||
case TSequenceOf: {
|
"&reallen, &l);\n"
|
||||||
char *n;
|
"FORW;\n"
|
||||||
|
"if(len < reallen)\n"
|
||||||
|
"return ASN1_OVERRUN;\n"
|
||||||
|
"len = reallen;\n");
|
||||||
|
|
||||||
fprintf (codefile,
|
fprintf (codefile,
|
||||||
"e = der_match_tag_and_length (p, len, UNIV, CONS, UT_Sequence,"
|
"{\n"
|
||||||
"&reallen, &l);\n"
|
"size_t origlen = len;\n"
|
||||||
"FORW;\n"
|
"int oldret = ret;\n"
|
||||||
"if(len < reallen)\n"
|
"ret = 0;\n"
|
||||||
"return ASN1_OVERRUN;\n"
|
"(%s)->len = 0;\n"
|
||||||
"len = reallen;\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,
|
break;
|
||||||
"{\n"
|
default :
|
||||||
"size_t origlen = len;\n"
|
abort ();
|
||||||
"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 ();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
@@ -285,20 +294,10 @@ generate_type_decode (const Symbol *s)
|
|||||||
|
|
||||||
switch (s->type->type) {
|
switch (s->type->type) {
|
||||||
case TInteger:
|
case TInteger:
|
||||||
fprintf (codefile, "return decode_integer (p, len, data, size);\n");
|
|
||||||
break;
|
|
||||||
case TUInteger:
|
case TUInteger:
|
||||||
fprintf (codefile, "return decode_unsigned (p, len, data, size);\n");
|
|
||||||
break;
|
|
||||||
case TOctetString:
|
case TOctetString:
|
||||||
fprintf (codefile, "return decode_octet_string (p, len, data, size);\n");
|
|
||||||
break;
|
|
||||||
case TGeneralizedTime:
|
case TGeneralizedTime:
|
||||||
fprintf (codefile, "return decode_generalized_time (p, len, data, size);\n");
|
|
||||||
break;
|
|
||||||
case TGeneralString:
|
case TGeneralString:
|
||||||
fprintf (codefile, "return decode_general_string (p, len, data, size);\n");
|
|
||||||
break;
|
|
||||||
case TBitString:
|
case TBitString:
|
||||||
case TSequence:
|
case TSequence:
|
||||||
case TSequenceOf:
|
case TSequenceOf:
|
||||||
@@ -309,6 +308,7 @@ generate_type_decode (const Symbol *s)
|
|||||||
"size_t l;\n"
|
"size_t l;\n"
|
||||||
"int i, e;\n\n");
|
"int i, e;\n\n");
|
||||||
fprintf(codefile, "i = 0;\n"); /* hack to avoid `unused variable' */
|
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);
|
decode_type ("data", s->type);
|
||||||
fprintf (codefile,
|
fprintf (codefile,
|
||||||
|
@@ -48,157 +48,166 @@ encode_primitive (const char *typename, const char *name)
|
|||||||
static void
|
static void
|
||||||
encode_type (const char *name, const Type *t)
|
encode_type (const char *name, const Type *t)
|
||||||
{
|
{
|
||||||
switch (t->type) {
|
switch (t->type) {
|
||||||
case TType:
|
case TType:
|
||||||
#if 0
|
#if 0
|
||||||
encode_type (name, t->symbol->type);
|
encode_type (name, t->symbol->type);
|
||||||
#endif
|
#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,
|
fprintf (codefile,
|
||||||
"*p-- = c; len--; ret++;\n"
|
"e = encode_%s(p, len, %s, &l);\n"
|
||||||
"c = 0;\n");
|
"BACK;\n",
|
||||||
pos -= 8;
|
t->symbol->gen_name, name);
|
||||||
}
|
break;
|
||||||
fprintf (codefile,
|
case TInteger:
|
||||||
"if(%s->%s) c |= 1<<%d;\n", name, m->gen_name,
|
if(t->members == NULL)
|
||||||
7 - m->val % 8);
|
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)
|
if (t->members == NULL)
|
||||||
tag = m->val;
|
break;
|
||||||
}
|
|
||||||
|
|
||||||
fprintf (codefile,
|
fprintf (codefile, "{\n"
|
||||||
"*p-- = c;\n"
|
"unsigned char c = 0;\n");
|
||||||
"*p-- = %d;\n"
|
pos = t->members->prev->val;
|
||||||
"len -= 2;\n"
|
/* fix for buggy MIT (and OSF?) code */
|
||||||
"ret += 2;\n"
|
if (pos > 31)
|
||||||
"}\n\n"
|
abort ();
|
||||||
"e = der_put_length_and_tag (p, len, ret, UNIV, PRIM,"
|
/*
|
||||||
"UT_BitString, &l);\n"
|
* It seems that if we do not always set pos to 31 here, the MIT
|
||||||
"BACK;\n",
|
* code will do the wrong thing.
|
||||||
rest);
|
*
|
||||||
break;
|
* I hate ASN.1 (and DER), but I hate it even more when everybody
|
||||||
}
|
* has to screw it up differently.
|
||||||
case TSequence: {
|
*/
|
||||||
Member *m;
|
pos = 31;
|
||||||
int tag = -1;
|
rest = 7 - (pos % 8);
|
||||||
|
|
||||||
if (t->members == NULL)
|
for (m = t->members->prev; m && tag != m->val; m = m->prev) {
|
||||||
break;
|
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);
|
||||||
|
|
||||||
for (m = t->members->prev; m && tag != m->val; m = m->prev) {
|
if (tag == -1)
|
||||||
char *s;
|
tag = m->val;
|
||||||
|
}
|
||||||
|
|
||||||
asprintf (&s, "%s(%s)->%s", m->optional ? "" : "&", name, m->gen_name);
|
|
||||||
if (m->optional)
|
|
||||||
fprintf (codefile,
|
fprintf (codefile,
|
||||||
"if(%s)\n",
|
"*p-- = c;\n"
|
||||||
s);
|
"*p-- = %d;\n"
|
||||||
#if 1
|
"len -= 2;\n"
|
||||||
fprintf (codefile, "{\n"
|
"ret += 2;\n"
|
||||||
"int oldret = ret;\n"
|
"}\n\n"
|
||||||
"ret = 0;\n");
|
"e = der_put_length_and_tag (p, len, ret, UNIV, PRIM,"
|
||||||
#endif
|
"UT_BitString, &l);\n"
|
||||||
encode_type (s, m->type);
|
"BACK;\n",
|
||||||
fprintf (codefile,
|
rest);
|
||||||
"e = der_put_length_and_tag (p, len, ret, CONTEXT, CONS, "
|
break;
|
||||||
"%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,
|
case TSequence: {
|
||||||
"e = der_put_length_and_tag (p, len, ret, UNIV, CONS, UT_Sequence, &l);\n"
|
Member *m;
|
||||||
"BACK;\n");
|
int tag = -1;
|
||||||
break;
|
|
||||||
}
|
|
||||||
case TSequenceOf: {
|
|
||||||
char *n;
|
|
||||||
|
|
||||||
fprintf (codefile,
|
if (t->members == NULL)
|
||||||
"for(i = (%s)->len - 1; i >= 0; --i) {\n"
|
break;
|
||||||
|
|
||||||
|
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)
|
||||||
|
fprintf (codefile,
|
||||||
|
"if(%s)\n",
|
||||||
|
s);
|
||||||
#if 1
|
#if 1
|
||||||
"int oldret = ret;\n"
|
fprintf (codefile, "{\n"
|
||||||
"ret = 0;\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,
|
||||||
|
"e = der_put_length_and_tag (p, len, ret, UNIV, CONS, UT_Sequence, &l);\n"
|
||||||
|
"BACK;\n");
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case TSequenceOf: {
|
||||||
|
char *n;
|
||||||
|
|
||||||
|
fprintf (codefile,
|
||||||
|
"for(i = (%s)->len - 1; i >= 0; --i) {\n"
|
||||||
|
#if 1
|
||||||
|
"int oldret = ret;\n"
|
||||||
|
"ret = 0;\n",
|
||||||
#else
|
#else
|
||||||
,
|
,
|
||||||
#endif
|
#endif
|
||||||
name);
|
name);
|
||||||
asprintf (&n, "&(%s)->val[i]", name);
|
asprintf (&n, "&(%s)->val[i]", name);
|
||||||
encode_type (n, t->subtype);
|
encode_type (n, t->subtype);
|
||||||
fprintf (codefile,
|
fprintf (codefile,
|
||||||
#if 1
|
#if 1
|
||||||
"ret += oldret;\n"
|
"ret += oldret;\n"
|
||||||
#endif
|
#endif
|
||||||
"}\n"
|
"}\n"
|
||||||
"e = der_put_length_and_tag (p, len, ret, UNIV, CONS, UT_Sequence, &l);\n"
|
"e = der_put_length_and_tag (p, len, ret, UNIV, CONS, UT_Sequence, &l);\n"
|
||||||
"BACK;\n");
|
"BACK;\n");
|
||||||
free (n);
|
free (n);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case TGeneralizedTime:
|
case TGeneralizedTime:
|
||||||
encode_primitive ("generalized_time", name);
|
encode_primitive ("generalized_time", name);
|
||||||
break;
|
break;
|
||||||
case TGeneralString:
|
case TGeneralString:
|
||||||
encode_primitive ("general_string", name);
|
encode_primitive ("general_string", name);
|
||||||
break;
|
break;
|
||||||
case TApplication:
|
case TApplication:
|
||||||
encode_type (name, t->subtype);
|
encode_type (name, t->subtype);
|
||||||
fprintf (codefile,
|
fprintf (codefile,
|
||||||
"e = der_put_length_and_tag (p, len, ret, APPL, CONS, %d, &l);\n"
|
"e = der_put_length_and_tag (p, len, ret, APPL, CONS, %d, &l);\n"
|
||||||
"BACK;\n",
|
"BACK;\n",
|
||||||
t->application);
|
t->application);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
abort ();
|
abort ();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
@@ -220,20 +229,10 @@ generate_type_encode (const Symbol *s)
|
|||||||
|
|
||||||
switch (s->type->type) {
|
switch (s->type->type) {
|
||||||
case TInteger:
|
case TInteger:
|
||||||
fprintf (codefile, "return encode_integer (p, len, data, size);\n");
|
|
||||||
break;
|
|
||||||
case TUInteger:
|
case TUInteger:
|
||||||
fprintf (codefile, "return encode_unsigned (p, len, data, size);\n");
|
|
||||||
break;
|
|
||||||
case TOctetString:
|
case TOctetString:
|
||||||
fprintf (codefile, "return encode_octet_string (p, len, data, size);\n");
|
|
||||||
break;
|
|
||||||
case TGeneralizedTime:
|
case TGeneralizedTime:
|
||||||
fprintf (codefile, "return encode_generalized_time (p, len, data, size);\n");
|
|
||||||
break;
|
|
||||||
case TGeneralString:
|
case TGeneralString:
|
||||||
fprintf (codefile, "return encode_general_string (p, len, data, size);\n");
|
|
||||||
break;
|
|
||||||
case TBitString:
|
case TBitString:
|
||||||
case TSequence:
|
case TSequence:
|
||||||
case TSequenceOf:
|
case TSequenceOf:
|
||||||
@@ -245,7 +244,8 @@ generate_type_encode (const Symbol *s)
|
|||||||
"int i, e;\n\n");
|
"int i, e;\n\n");
|
||||||
fprintf(codefile, "i = 0;\n"); /* hack to avoid `unused variable' */
|
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"
|
fprintf (codefile, "*size = ret;\n"
|
||||||
"return 0;\n");
|
"return 0;\n");
|
||||||
break;
|
break;
|
||||||
|
@@ -46,94 +46,103 @@ length_primitive (const char *typename,
|
|||||||
static void
|
static void
|
||||||
length_type (const char *name, const Type *t, const char *variable)
|
length_type (const char *name, const Type *t, const char *variable)
|
||||||
{
|
{
|
||||||
switch (t->type) {
|
switch (t->type) {
|
||||||
case TType:
|
case TType:
|
||||||
#if 0
|
#if 0
|
||||||
length_type (name, t->symbol->type);
|
length_type (name, t->symbol->type);
|
||||||
#endif
|
#endif
|
||||||
fprintf (codefile, "%s += length_%s(%s);\n",
|
fprintf (codefile, "%s += length_%s(%s);\n",
|
||||||
variable, t->symbol->gen_name, name);
|
variable, t->symbol->gen_name, name);
|
||||||
break;
|
break;
|
||||||
case TInteger:
|
case TInteger:
|
||||||
length_primitive ("integer", name, variable);
|
if(t->members == NULL)
|
||||||
break;
|
length_primitive ("integer", name, variable);
|
||||||
case TUInteger:
|
else {
|
||||||
length_primitive ("unsigned", name, variable);
|
char *s;
|
||||||
break;
|
asprintf(&s, "(const int*)%s", name);
|
||||||
case TOctetString:
|
if(s == NULL)
|
||||||
length_primitive ("octet_string", name, variable);
|
return ENOMEM;
|
||||||
break;
|
length_primitive ("integer", s, variable);
|
||||||
case TBitString: {
|
free(s);
|
||||||
/*
|
}
|
||||||
* XXX - Hope this is correct
|
break;
|
||||||
* look at TBitString case in `encode_type'
|
case TUInteger:
|
||||||
*/
|
length_primitive ("unsigned", name, variable);
|
||||||
fprintf (codefile, "%s += 7;\n", variable);
|
break;
|
||||||
break;
|
case TOctetString:
|
||||||
}
|
length_primitive ("octet_string", name, variable);
|
||||||
case TSequence: {
|
break;
|
||||||
Member *m;
|
case TBitString: {
|
||||||
int tag = -1;
|
/*
|
||||||
|
* 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)
|
if (t->members == NULL)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
for (m = t->members; m && tag != m->val; m = m->next) {
|
for (m = t->members; m && tag != m->val; m = m->next) {
|
||||||
char *s;
|
char *s;
|
||||||
|
|
||||||
asprintf (&s, "%s(%s)->%s",
|
asprintf (&s, "%s(%s)->%s",
|
||||||
m->optional ? "" : "&", name, m->gen_name);
|
m->optional ? "" : "&", name, m->gen_name);
|
||||||
if (m->optional)
|
if (m->optional)
|
||||||
fprintf (codefile, "if(%s)", s);
|
fprintf (codefile, "if(%s)", s);
|
||||||
fprintf (codefile, "{\n"
|
fprintf (codefile, "{\n"
|
||||||
"int oldret = %s;\n"
|
"int oldret = %s;\n"
|
||||||
"%s = 0;\n", variable, variable);
|
"%s = 0;\n", variable, variable);
|
||||||
length_type (s, m->type, "ret");
|
length_type (s, m->type, "ret");
|
||||||
fprintf (codefile, "%s += 1 + length_len(%s) + oldret;\n",
|
fprintf (codefile, "%s += 1 + length_len(%s) + oldret;\n",
|
||||||
variable, variable);
|
variable, variable);
|
||||||
fprintf (codefile, "}\n");
|
fprintf (codefile, "}\n");
|
||||||
if (tag == -1)
|
if (tag == -1)
|
||||||
tag = m->val;
|
tag = m->val;
|
||||||
free (s);
|
free (s);
|
||||||
}
|
}
|
||||||
fprintf (codefile,
|
fprintf (codefile,
|
||||||
"%s += 1 + length_len(%s);\n", variable, variable);
|
"%s += 1 + length_len(%s);\n", variable, variable);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case TSequenceOf: {
|
case TSequenceOf: {
|
||||||
char *n;
|
char *n;
|
||||||
|
|
||||||
fprintf (codefile,
|
fprintf (codefile,
|
||||||
"{\n"
|
"{\n"
|
||||||
"int oldret = %s;\n"
|
"int oldret = %s;\n"
|
||||||
"int i;\n"
|
"int i;\n"
|
||||||
"%s = 0;\n",
|
"%s = 0;\n",
|
||||||
variable, variable);
|
variable, variable);
|
||||||
|
|
||||||
fprintf (codefile, "for(i = (%s)->len - 1; i >= 0; --i){\n", name);
|
fprintf (codefile, "for(i = (%s)->len - 1; i >= 0; --i){\n", name);
|
||||||
asprintf (&n, "&(%s)->val[i]", name);
|
asprintf (&n, "&(%s)->val[i]", name);
|
||||||
length_type(n, t->subtype, variable);
|
length_type(n, t->subtype, variable);
|
||||||
fprintf (codefile, "}\n");
|
fprintf (codefile, "}\n");
|
||||||
|
|
||||||
fprintf (codefile,
|
fprintf (codefile,
|
||||||
"%s += 1 + length_len(%s) + oldret;\n"
|
"%s += 1 + length_len(%s) + oldret;\n"
|
||||||
"}\n", variable, variable);
|
"}\n", variable, variable);
|
||||||
free(n);
|
free(n);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case TGeneralizedTime:
|
case TGeneralizedTime:
|
||||||
length_primitive ("generalized_time", name, variable);
|
length_primitive ("generalized_time", name, variable);
|
||||||
break;
|
break;
|
||||||
case TGeneralString:
|
case TGeneralString:
|
||||||
length_primitive ("general_string", name, variable);
|
length_primitive ("general_string", name, variable);
|
||||||
break;
|
break;
|
||||||
case TApplication:
|
case TApplication:
|
||||||
length_type (name, t->subtype, variable);
|
length_type (name, t->subtype, variable);
|
||||||
fprintf (codefile, "ret += 1 + length_len (ret);\n");
|
fprintf (codefile, "ret += 1 + length_len (ret);\n");
|
||||||
break;
|
break;
|
||||||
default :
|
default :
|
||||||
abort ();
|
abort ();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
Reference in New Issue
Block a user