more explicit ANY support

4 files changed, 149 insertions, 4 deletions

diff --git a/tests/42-real-life-OK.asn1.-PR b/tests/42-real-life-OK.asn1.-PR
index 63b696d6..4cdd0392 100644
--- a/tests/42-real-life-OK.asn1.-PR
+++ b/tests/42-real-life-OK.asn1.-PR
@@ -209,7 +209,7 @@ memb_vparts_2_constraint(asn1_TYPE_descriptor_t *td, const void *sptr,
 
 static asn1_TYPE_member_t asn1_MBR_vparts[] = {
 	{ ATF_NOFLAGS, 0, 0,
-		.tag = -1 /* Ambiguous tag (CHOICE|ANY?) */,
+		.tag = -1 /* Ambiguous tag (CHOICE?) */,
 		.tag_mode = 0,
 		.type = (void *)&asn1_DEF_VariablePart,
 		.memb_constraints = 0,	/* Defer to actual type */
diff --git a/tests/43-recursion-OK.asn1.-P b/tests/43-recursion-OK.asn1.-P
index 3ff74e4b..c89e881f 100644
--- a/tests/43-recursion-OK.asn1.-P
+++ b/tests/43-recursion-OK.asn1.-P
@@ -218,7 +218,7 @@ typedef struct Choice_1 {
 
 static asn1_TYPE_member_t asn1_MBR_or[] = {
 	{ ATF_NOFLAGS, 0, 0,
-		.tag = -1 /* Ambiguous tag (CHOICE|ANY?) */,
+		.tag = -1 /* Ambiguous tag (CHOICE?) */,
 		.tag_mode = 0,
 		.type = (void *)&asn1_DEF_Choice_1,
 		.memb_constraints = 0,	/* Defer to actual type */
diff --git a/tests/44-choice-in-sequence-OK.asn1.-P b/tests/44-choice-in-sequence-OK.asn1.-P
index 3c6c1523..413ff00d 100644
--- a/tests/44-choice-in-sequence-OK.asn1.-P
+++ b/tests/44-choice-in-sequence-OK.asn1.-P
@@ -178,7 +178,7 @@ static asn1_TYPE_member_t asn1_MBR_b[] = {
 		.name = "d"
 		},
 	{ ATF_NOFLAGS, 0, offsetof(struct b, choice.e),
-		.tag = -1 /* Ambiguous tag (CHOICE|ANY?) */,
+		.tag = -1 /* Ambiguous tag (CHOICE?) */,
 		.tag_mode = 0,
 		.type = (void *)&asn1_DEF_e,
 		.memb_constraints = 0,	/* Defer to actual type */
@@ -235,7 +235,7 @@ static asn1_TYPE_member_t asn1_MBR_T[] = {
 		.name = "a"
 		},
 	{ ATF_NOFLAGS, 0, offsetof(struct T, b),
-		.tag = -1 /* Ambiguous tag (CHOICE|ANY?) */,
+		.tag = -1 /* Ambiguous tag (CHOICE?) */,
 		.tag_mode = 0,
 		.type = (void *)&asn1_DEF_b,
 		.memb_constraints = 0,	/* Defer to actual type */
diff --git a/tests/60-any-OK.asn1.-P b/tests/60-any-OK.asn1.-P
new file mode 100644
index 00000000..96098a58
--- /dev/null
+++ b/tests/60-any-OK.asn1.-P
@@ -0,0 +1,145 @@
+
+/*** <<< INCLUDES [T1] >>> ***/
+
+#include <INTEGER.h>
+#include <ANY.h>
+#include <constr_SEQUENCE.h>
+
+/*** <<< DEPS [T1] >>> ***/
+
+extern asn1_TYPE_descriptor_t asn1_DEF_T1;
+
+/*** <<< TYPE-DECLS [T1] >>> ***/
+
+
+typedef struct T1 {
+	INTEGER_t	 i;
+	ANY_t	 any;
+	
+	/* Context for parsing across buffer boundaries */
+	ber_dec_ctx_t _ber_dec_ctx;
+} T1_t;
+
+/*** <<< STAT-DEFS [T1] >>> ***/
+
+static asn1_TYPE_member_t asn1_MBR_T1[] = {
+	{ ATF_NOFLAGS, 0, offsetof(struct T1, i),
+		.tag = (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)),
+		.tag_mode = 0,
+		.type = (void *)&asn1_DEF_INTEGER,
+		.memb_constraints = 0,	/* Defer to actual type */
+		.name = "i"
+		},
+	{ ATF_OPEN_TYPE | ATF_NOFLAGS, 0, offsetof(struct T1, any),
+		.tag = -1 /* Ambiguous tag (ANY?) */,
+		.tag_mode = 0,
+		.type = (void *)&asn1_DEF_ANY,
+		.memb_constraints = 0,	/* Defer to actual type */
+		.name = "any"
+		},
+};
+static ber_tlv_tag_t asn1_DEF_T1_tags[] = {
+	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static asn1_TYPE_tag2member_t asn1_DEF_T1_tag2el[] = {
+    { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 }, /* i at 15 */
+};
+static asn1_SEQUENCE_specifics_t asn1_DEF_T1_specs = {
+	sizeof(struct T1),
+	offsetof(struct T1, _ber_dec_ctx),
+	asn1_DEF_T1_tag2el,
+	1,	/* Count of tags in the map */
+	-1,	/* Start extensions */
+	-1	/* Stop extensions */
+};
+asn1_TYPE_descriptor_t asn1_DEF_T1 = {
+	"T1",
+	SEQUENCE_constraint,
+	SEQUENCE_decode_ber,
+	SEQUENCE_encode_der,
+	SEQUENCE_print,
+	SEQUENCE_free,
+	0,	/* Use generic outmost tag fetcher */
+	asn1_DEF_T1_tags,
+	sizeof(asn1_DEF_T1_tags)
+		/sizeof(asn1_DEF_T1_tags[0]), /* 1 */
+	1,	/* Tags to skip */
+	1,	/* Whether CONSTRUCTED */
+	asn1_MBR_T1,
+	2,	/* Elements count */
+	&asn1_DEF_T1_specs	/* Additional specs */
+};
+
+
+/*** <<< INCLUDES [T2] >>> ***/
+
+#include <INTEGER.h>
+#include <ANY.h>
+#include <constr_SEQUENCE.h>
+
+/*** <<< DEPS [T2] >>> ***/
+
+extern asn1_TYPE_descriptor_t asn1_DEF_T2;
+
+/*** <<< TYPE-DECLS [T2] >>> ***/
+
+
+typedef struct T2 {
+	INTEGER_t	 i;
+	ANY_t	*any	/* OPTIONAL */;
+	
+	/* Context for parsing across buffer boundaries */
+	ber_dec_ctx_t _ber_dec_ctx;
+} T2_t;
+
+/*** <<< STAT-DEFS [T2] >>> ***/
+
+static asn1_TYPE_member_t asn1_MBR_T2[] = {
+	{ ATF_NOFLAGS, 0, offsetof(struct T2, i),
+		.tag = (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)),
+		.tag_mode = 0,
+		.type = (void *)&asn1_DEF_INTEGER,
+		.memb_constraints = 0,	/* Defer to actual type */
+		.name = "i"
+		},
+	{ ATF_POINTER, 1, offsetof(struct T2, any),
+		.tag = (ASN_TAG_CLASS_CONTEXT | (0 << 2)),
+		.tag_mode = +1,	/* EXPLICIT tag at current level */
+		.type = (void *)&asn1_DEF_ANY,
+		.memb_constraints = 0,	/* Defer to actual type */
+		.name = "any"
+		},
+};
+static ber_tlv_tag_t asn1_DEF_T2_tags[] = {
+	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static asn1_TYPE_tag2member_t asn1_DEF_T2_tag2el[] = {
+    { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 }, /* i at 20 */
+    { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 1, 0, 0 }, /* any at 21 */
+};
+static asn1_SEQUENCE_specifics_t asn1_DEF_T2_specs = {
+	sizeof(struct T2),
+	offsetof(struct T2, _ber_dec_ctx),
+	asn1_DEF_T2_tag2el,
+	2,	/* Count of tags in the map */
+	-1,	/* Start extensions */
+	-1	/* Stop extensions */
+};
+asn1_TYPE_descriptor_t asn1_DEF_T2 = {
+	"T2",
+	SEQUENCE_constraint,
+	SEQUENCE_decode_ber,
+	SEQUENCE_encode_der,
+	SEQUENCE_print,
+	SEQUENCE_free,
+	0,	/* Use generic outmost tag fetcher */
+	asn1_DEF_T2_tags,
+	sizeof(asn1_DEF_T2_tags)
+		/sizeof(asn1_DEF_T2_tags[0]), /* 1 */
+	1,	/* Tags to skip */
+	1,	/* Whether CONSTRUCTED */
+	asn1_MBR_T2,
+	2,	/* Elements count */
+	&asn1_DEF_T2_specs	/* Additional specs */
+};
+