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

prefix Der_class with ASN1_C_ to avoid problems with system headerfiles that pollute the name space

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@15255 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2005-05-29 14:23:01 +00:00
parent 084b3b2d2a
commit 8e78ed6e48
6 changed files with 35 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/asn1/gen_encode.c
View File

@@ -125,7 +125,7 @@ encode_type (const char *name, const Type *t)
"len -= 2;\n"
"ret += 2;\n"
"}\n\n"
"e = der_put_length_and_tag (p, len, ret, UNIV, PRIM,"
"e = der_put_length_and_tag (p, len, ret, ASN1_C_UNIV, PRIM,"
"UT_BitString, &l);\n"
"BACK;\n",
rest);
@@ -157,7 +157,7 @@ encode_type (const char *name, const Type *t)
#endif
encode_type (s, m->type);
fprintf (codefile,
"e = der_put_length_and_tag (p, len, ret, CONTEXT, CONS, "
"e = der_put_length_and_tag (p, len, ret, ASN1_C_CONTEXT, CONS, "
"%d, &l);\n"
"BACK;\n",
m->val);
@@ -171,7 +171,7 @@ encode_type (const char *name, const Type *t)
free (s);
}
fprintf (codefile,
"e = der_put_length_and_tag (p, len, ret, UNIV, CONS, UT_Sequence, &l);\n"
"e = der_put_length_and_tag (p, len, ret, ASN1_C_UNIV, CONS, UT_Sequence, &l);\n"
"BACK;\n");
break;
}
@@ -194,7 +194,7 @@ encode_type (const char *name, const Type *t)
"ret += oldret;\n"
#endif
"}\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, ASN1_C_UNIV, CONS, UT_Sequence, &l);\n"
"BACK;\n");
free (n);
break;
@@ -216,7 +216,7 @@ encode_type (const char *name, const Type *t)
case TApplication:
encode_type (name, t->subtype);
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, ASN1_C_APPL, CONS, %d, &l);\n"
"BACK;\n",
t->application);
break;