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

check for "tagless ANY OPTIONAL"

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@16671 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-01-31 09:42:31 +00:00
parent 7f71106edc
commit 3ec55439c0
2 changed files with 31 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
lib/asn1/check-gen.c
View File

@@ -614,6 +614,13 @@ cmp_TESTAlloc (void *a, void *b)
IF_OPT_COMPARE(aa,ab,tagless) { IF_OPT_COMPARE(aa,ab,tagless) {
COMPARE_INTEGER(aa,ab,tagless->ai); COMPARE_INTEGER(aa,ab,tagless->ai);
} }
COMPARE_INTEGER(aa,ab,three);
IF_OPT_COMPARE(aa,ab,tagless2) {
COMPARE_OPT_OCTECT_STRING(aa, ab, tagless2);
}
return 0; return 0;
} }
@@ -628,6 +635,12 @@ UNIV CONS Sequence 12
UNIV CONS Sequence 5 UNIV CONS Sequence 5
CONTEXT CONS 1 3 CONTEXT CONS 1 3
UNIV PRIM Integer 1 03 UNIV PRIM Integer 1 03
UNIV CONS Sequence 8
CONTEXT CONS 1 3
UNIV PRIM Integer 1 04
UNIV PRIM Integer 1 05
*/ */
static int static int
@@ -639,11 +652,15 @@ test_taglessalloc (void)
"alloc 1" }, "alloc 1" },
{ NULL, 7, { NULL, 7,
"\x30\x05\xa1\x03\x02\x01\x03", "\x30\x05\xa1\x03\x02\x01\x03",
"alloc 2" } "alloc 2" },
{ NULL, 10,
"\x30\x08\xa1\x03\x02\x01\x04\x02\x01\x05",
"alloc 3" }
}; };
int ret = 0, ntests = sizeof(tests) / sizeof(*tests); int ret = 0, ntests = sizeof(tests) / sizeof(*tests);
TESTAlloc c1, c2; TESTAlloc c1, c2, c3;
heim_any any3;
memset(&c1, 0, sizeof(c1)); memset(&c1, 0, sizeof(c1));
c1.tagless = ecalloc(1, sizeof(*c1.tagless)); c1.tagless = ecalloc(1, sizeof(*c1.tagless));
@@ -656,6 +673,14 @@ test_taglessalloc (void)
c2.three = 3; c2.three = 3;
tests[1].val = &c2; tests[1].val = &c2;
memset(&c3, 0, sizeof(c3));
c3.tagless = NULL;
c3.three = 4;
c3.tagless2 = &any3;
any3.data = "\x02\x01\x05";
any3.length = 3;
tests[2].val = &c3;
ret += generic_test (tests, ntests, sizeof(TESTAlloc), ret += generic_test (tests, ntests, sizeof(TESTAlloc),
(generic_encode)encode_TESTAlloc, (generic_encode)encode_TESTAlloc,
(generic_length)length_TESTAlloc, (generic_length)length_TESTAlloc,

5
lib/asn1/test.asn1
View File

@@ -4,6 +4,8 @@ TEST DEFINITIONS ::=
BEGIN BEGIN
IMPORTS heim_any FROM heim;
TESTLargeTag ::= SEQUENCE { TESTLargeTag ::= SEQUENCE {
foo[127] INTEGER (-2147483648..2147483647) foo[127] INTEGER (-2147483648..2147483647)
} }
@@ -51,7 +53,8 @@ TESTAllocInner ::= SEQUENCE {
TESTAlloc ::= SEQUENCE { TESTAlloc ::= SEQUENCE {
tagless TESTAllocInner OPTIONAL, tagless TESTAllocInner OPTIONAL,
three [1] INTEGER (-2147483648..2147483647) three [1] INTEGER (-2147483648..2147483647),
tagless2 heim_any OPTIONAL
} }