inner structures tagging fix. see 0.9.5 comment in ChangeLog
diff --git a/tests/44-choice-in-sequence-OK.asn1.-P b/tests/44-choice-in-sequence-OK.asn1.-P
index 107cdb8..5ac269d 100644
--- a/tests/44-choice-in-sequence-OK.asn1.-P
+++ b/tests/44-choice-in-sequence-OK.asn1.-P
@@ -106,8 +106,10 @@
CHOICE_print,
CHOICE_free,
CHOICE_outmost_tag,
- 0, /* No explicit tags (pointer) */
- 0, /* No explicit tags (count) */
+ 0, /* No effective tags (pointer) */
+ 0, /* No effective tags (count) */
+ 0, /* No tags (pointer) */
+ 0, /* No tags (count) */
1, /* Whether CONSTRUCTED */
asn1_MBR_e,
2, /* Elements count */
@@ -152,8 +154,10 @@
CHOICE_print,
CHOICE_free,
CHOICE_outmost_tag,
- 0, /* No explicit tags (pointer) */
- 0, /* No explicit tags (count) */
+ 0, /* No effective tags (pointer) */
+ 0, /* No effective tags (count) */
+ 0, /* No tags (pointer) */
+ 0, /* No tags (count) */
1, /* Whether CONSTRUCTED */
asn1_MBR_h,
2, /* Elements count */
@@ -215,8 +219,10 @@
CHOICE_print,
CHOICE_free,
CHOICE_outmost_tag,
- 0, /* No explicit tags (pointer) */
- 0, /* No explicit tags (count) */
+ 0, /* No effective tags (pointer) */
+ 0, /* No effective tags (count) */
+ 0, /* No tags (pointer) */
+ 0, /* No tags (count) */
1, /* Whether CONSTRUCTED */
asn1_MBR_b,
4, /* Elements count */
@@ -240,7 +246,8 @@
},
};
static ber_tlv_tag_t asn1_DEF_T_tags[] = {
- (ASN_TAG_CLASS_PRIVATE | (1 << 2))
+ (ASN_TAG_CLASS_PRIVATE | (1 << 2)),
+ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
};
static asn1_TYPE_tag2member_t asn1_DEF_T_tag2el[] = {
{ (ASN_TAG_CLASS_PRIVATE | (2 << 2)), 0, 0, 0 }, /* a at 15 */
@@ -268,7 +275,10 @@
0, /* Use generic outmost tag fetcher */
asn1_DEF_T_tags,
sizeof(asn1_DEF_T_tags)
- /sizeof(asn1_DEF_T_tags[0]), /* 1 */
+ /sizeof(asn1_DEF_T_tags[0]) - 1, /* 1 */
+ asn1_DEF_T_tags, /* Same as above */
+ sizeof(asn1_DEF_T_tags)
+ /sizeof(asn1_DEF_T_tags[0]), /* 2 */
1, /* Whether CONSTRUCTED */
asn1_MBR_T,
2, /* Elements count */