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

use new der_match_tag_and_length to parse the UT_EndOfContent tag

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@24189 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2008-12-15 04:30:22 +00:00
parent 26d2cd604d
commit ea193b2f25
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/asn1/gen_decode.c
View File

@@ -504,7 +504,7 @@ decode_type (const char *name, const Type *t, int optional,
fprintf(codefile, fprintf(codefile,
"int dce_fix;\n"); "int dce_fix;\n");
fprintf(codefile, "e = der_match_tag_and_length2(p, len, %s, &%s, %s, " fprintf(codefile, "e = der_match_tag_and_length(p, len, %s, &%s, %s, "
"&%s_datalen, &l);\n", "&%s_datalen, &l);\n",
classname(t->tag.tagclass), classname(t->tag.tagclass),
typestring, typestring,
@@ -553,11 +553,17 @@ decode_type (const char *name, const Type *t, int optional,
fprintf(codefile, fprintf(codefile,
"if(dce_fix){\n" "if(dce_fix){\n"
"len += 2;\n" "len += 2;\n"
"e = der_match_tag_and_length (p, len, " "e = der_match_tag_and_length(p, len, "
"(Der_class)0,(Der_type)0, UT_EndOfContent, " "(Der_class)0, &%s, UT_EndOfContent, "
"&%s_datalen, &l);\n" "&%s_datalen, &l);\n"
"if(e) %s;\np += l; len -= l; ret += l;\n" "if(e) %s;\n"
"} else \n", tmpstr, forwstr); "p += l; len -= l; ret += l;\n"
"if (%s != (Der_type)0) { e = ASN1_BAD_ID; %s; }\n"
"} else \n",
typestring,
tmpstr,
forwstr,
typestring, forwstr);
fprintf(codefile, fprintf(codefile,
"len = %s_oldlen - %s_datalen;\n", "len = %s_oldlen - %s_datalen;\n",
tmpstr, tmpstr); tmpstr, tmpstr);