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

support for distinguished value integers

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@8396 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
2000-06-19 15:19:23 +00:00
parent 6963cfa860
commit 90c3ac7191
4 changed files with 457 additions and 434 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/asn1/gen.c
View File

@@ -227,7 +227,21 @@ define_type (int level, char *name, Type *t, int typedefp)
break;
case TInteger:
space(level);
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);

20
lib/asn1/gen_decode.c
View File

@@ -59,7 +59,16 @@ decode_type (const char *name, const Type *t)
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);
@@ -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,

22
lib/asn1/gen_encode.c
View File

@@ -59,7 +59,16 @@ encode_type (const char *name, const Type *t)
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);
@@ -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;

9
lib/asn1/gen_length.c
View File

@@ -55,7 +55,16 @@ length_type (const char *name, const Type *t, const char *variable)
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);