From b33425f16be4b5f52c830969cb9e132194e215e1 Mon Sep 17 00:00:00 2001 From: Lev Walkin Date: Fri, 14 Jul 2017 14:59:52 +0400 Subject: [PATCH] fix OER stubs order --- asn1c/tests/Makefile.am | 1 + libasn1compiler/asn1c_C.c | 81 +++++++++- skeletons/ANY.c | 10 +- skeletons/BIT_STRING.c | 14 +- skeletons/BMPString.c | 14 +- skeletons/BOOLEAN.c | 14 +- skeletons/ENUMERATED.c | 14 +- skeletons/GeneralString.c | 14 +- skeletons/GeneralizedTime.c | 14 +- skeletons/GraphicString.c | 14 +- skeletons/IA5String.c | 14 +- skeletons/INTEGER.c | 14 +- skeletons/ISO646String.c | 14 +- skeletons/NULL.c | 14 +- skeletons/NativeEnumerated.c | 14 +- skeletons/NativeInteger.c | 14 +- skeletons/NativeReal.c | 14 +- skeletons/NumericString.c | 14 +- skeletons/OBJECT_IDENTIFIER.c | 14 +- skeletons/OCTET_STRING.c | 14 +- skeletons/ObjectDescriptor.c | 14 +- skeletons/PrintableString.c | 14 +- skeletons/REAL.c | 14 +- skeletons/RELATIVE-OID.c | 14 +- skeletons/T61String.c | 14 +- skeletons/TeletexString.c | 14 +- skeletons/UTCTime.c | 14 +- skeletons/UTF8String.c | 14 +- skeletons/UniversalString.c | 14 +- skeletons/VideotexString.c | 14 +- skeletons/VisibleString.c | 14 +- skeletons/constr_TYPE.h | 5 +- tests/03-enum-OK.asn1.-Pfwide-types | 25 ++- tests/104-param-1-OK.asn1.-Pfwide-types | 13 +- tests/105-param-2-OK.asn1.-Pfwide-types | 22 ++- tests/106-param-constr-OK.asn1.-P | 11 +- .../108-param-constr-3-OK.asn1.-Pfwide-types | 10 +- tests/110-param-3-OK.asn1.-Pfwide-types | 23 ++- tests/119-per-strings-OK.asn1.-Pgen-PER | 38 ++++- tests/125-bitstring-constraint-OK.asn1.-P | 5 +- tests/126-per-extensions-OK.asn1.-Pgen-PER | 17 +- tests/127-per-long-OK.asn1.-Pgen-PER | 17 +- tests/131-per-empty-OK.asn1.-Pgen-PER | 3 +- tests/134-per-long-OK.asn1.-Pgen-PER | 7 +- tests/19-param-OK.asn1.-Pfwide-types | 25 ++- tests/22-tags-OK.asn1.-Pfwide-types | 11 +- tests/30-set-OK.asn1.-Pfwide-types | 6 +- tests/31-set-of-OK.asn1.-Pfwide-types | 32 +++- tests/32-sequence-of-OK.asn1.-P | 29 +++- .../37-indirect-choice-OK.asn1.-Pfwide-types | 39 ++++- tests/39-sequence-of-OK.asn1.-Pfwide-types | 14 +- tests/42-real-life-OK.asn1.-PR | 51 ++++-- tests/43-recursion-OK.asn1.-Pfwide-types | 34 +++- tests/44-choice-in-sequence-OK.asn1.-P | 22 ++- tests/46-redefine-OK.asn1.-PR | 14 +- tests/47-set-ext-OK.asn1.-Pfwide-types | 16 +- tests/50-constraint-OK.asn1.-Pfwide-types | 149 ++++++++++++++---- tests/50-constraint-OK.asn1.-Pgen-PER | 149 ++++++++++++++---- .../59-choice-extended-OK.asn1.-Pfwide-types | 6 +- tests/60-any-OK.asn1.-Pfwide-types | 15 +- tests/65-multi-tag-OK.asn1.-Pfnative-types | 41 ++++- tests/65-multi-tag-OK.asn1.-Pfwide-types | 41 ++++- tests/66-ref-simple-OK.asn1.-Pfwide-types | 9 +- tests/69-reserved-words-OK.asn1.-Pfwide-types | 10 +- tests/70-xer-test-OK.asn1.-Pfwide-types | 106 ++++++++++--- tests/72-same-names-OK.asn1.-Pfwide-types | 45 ++++-- tests/73-circular-OK.asn1.-Pfwide-types | 40 ++++- tests/84-param-tags-OK.asn1.-Pfwide-types | 26 ++- tests/88-integer-enum-OK.asn1.-Pfwide-types | 5 +- ...-bit-string-enum-OK.asn1.-Pfcompound-names | 4 +- .../89-bit-string-enum-OK.asn1.-Pfwide-types | 4 +- tests/90-cond-int-type-OK.asn1.-P | 90 ++++++++--- tests/90-cond-int-type-OK.asn1.-Pfwide-types | 90 ++++++++--- tests/90-cond-int-type-OK.asn1.-Pgen-PER | 90 ++++++++--- ...1-cond-int-blessSize-OK.asn1.-Pfbless-SIZE | 25 ++- ...-circular-loops-OK.asn1.-Pfindirect-choice | 94 +++++++++-- tests/92-circular-loops-OK.asn1.-Pfwide-types | 94 +++++++++-- tests/93-asn1c-controls-OK.asn1.-Pfwide-types | 20 ++- tests/94-set-optionals-OK.asn1.-P | 13 +- .../95-choice-per-order-OK.asn1.-Pfwide-types | 17 +- tests/95-choice-per-order-OK.asn1.-Pgen-PER | 17 +- tests/98-attribute-class-OK.asn1.-P | 5 +- 82 files changed, 1641 insertions(+), 537 deletions(-) diff --git a/asn1c/tests/Makefile.am b/asn1c/tests/Makefile.am index 9660aaeb..bd6c843b 100644 --- a/asn1c/tests/Makefile.am +++ b/asn1c/tests/Makefile.am @@ -58,6 +58,7 @@ TESTS += check-src/check-92.c if TEST_64BIT TESTS += check-src/check64-134.-gen-PER.c +TESTS += check-src/check64-135.-gen-OER.c endif EXTRA_DIST = \ diff --git a/libasn1compiler/asn1c_C.c b/libasn1compiler/asn1c_C.c index f13563be..4eb239a4 100644 --- a/libasn1compiler/asn1c_C.c +++ b/libasn1compiler/asn1c_C.c @@ -1350,6 +1350,9 @@ asn1c_lang_C_type_SIMPLE_TYPE(arg_t *arg) { OUT("td->all_tags_count = asn_DEF_%s.all_tags_count;\n",type_name); OUT("/* End of these lines */\n"); } + OUT("if(!td->oer_constraints)\n"); + OUT("\ttd->oer_constraints = asn_DEF_%s.oer_constraints;\n", + type_name); OUT("if(!td->per_constraints)\n"); OUT("\ttd->per_constraints = asn_DEF_%s.per_constraints;\n", type_name); @@ -1462,6 +1465,40 @@ asn1c_lang_C_type_SIMPLE_TYPE(arg_t *arg) { OUT("}\n"); OUT("\n"); + if(arg->flags & A1C_GEN_OER) { + p = MKID(expr); + + if(HIDE_INNER_DEFS) OUT("static "); + OUT("asn_dec_rval_t\n"); + OUT("%s", p); + if(HIDE_INNER_DEFS) OUT("_%d", expr->_type_unique_index); + OUT("_decode_oer(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,\n"); + INDENTED( + OUT("\tasn_oer_constraints_t *constraints, void **structure, const void *buffer, size_t size) {\n"); + OUT("%s_%d_inherit_TYPE_descriptor(td);\n", + p, expr->_type_unique_index); + OUT("return td->oer_decoder(opt_codec_ctx, td, constraints, structure, buffer, size);\n"); + ); + OUT("}\n"); + OUT("\n"); + + p = MKID(expr); + if(HIDE_INNER_DEFS) OUT("static "); + OUT("asn_enc_rval_t\n"); + OUT("%s", p); + if(HIDE_INNER_DEFS) OUT("_%d", expr->_type_unique_index); + OUT("_encode_oer(asn_TYPE_descriptor_t *td,\n"); + INDENTED( + OUT("\tasn_oer_constraints_t *constraints,\n"); + OUT("\tvoid *structure, asn_app_consume_bytes_f *cb, void *app_key) {\n"); + OUT("%s_%d_inherit_TYPE_descriptor(td);\n", + p, expr->_type_unique_index); + OUT("return td->uper_encoder(td, constraints, structure, cb, app_key);\n"); + ); + OUT("}\n"); + OUT("\n"); + } + if(arg->flags & A1C_GEN_PER) { p = MKID(expr); @@ -1512,6 +1549,10 @@ asn1c_lang_C_type_SIMPLE_TYPE(arg_t *arg) { OUT("der_type_encoder_f %s_encode_der;\n", p); OUT("xer_type_decoder_f %s_decode_xer;\n", p); OUT("xer_type_encoder_f %s_encode_xer;\n", p); + if(arg->flags & A1C_GEN_OER) { + OUT("oer_type_decoder_f %s_decode_oer;\n", p); + OUT("oer_type_encoder_f %s_encode_oer;\n", p); + } if(arg->flags & A1C_GEN_PER) { OUT("per_type_decoder_f %s_decode_uper;\n", p); OUT("per_type_encoder_f %s_encode_uper;\n", p); @@ -2441,6 +2482,18 @@ emit_member_table(arg_t *arg, asn1p_expr_t *expr) { } else { OUT("0,\t/* Defer constraints checking to the member type */\n"); } + if(C99_MODE) OUT(".oer_constraints = "); + if(arg->flags & A1C_GEN_OER) { + if(expr->constraints) { + OUT("&asn_OER_memb_%s_constr_%d,\n", + MKID(expr), + expr->_type_unique_index); + } else { + OUT("0,\t/* No OER visible constraints */\n"); + } + } else { + OUT("0,\t/* OER is not compiled, use -gen-OER */\n"); + } if(C99_MODE) OUT(".per_constraints = "); if(arg->flags & A1C_GEN_PER) { if(expr->constraints) { @@ -2553,6 +2606,15 @@ emit_type_DEF(arg_t *arg, asn1p_expr_t *expr, enum tvm_compat tv_mode, int tags_ FUNCREF(encode_der); FUNCREF(decode_xer); FUNCREF(encode_xer); + + if(arg->flags & A1C_GEN_OER) { + FUNCREF(decode_oer); + FUNCREF(encode_oer); + } else { + OUT("0, 0,\t/* No OER support, " + "use \"-gen-OER\" to enable */\n"); + } + if(arg->flags & A1C_GEN_PER) { FUNCREF(decode_uper); FUNCREF(encode_uper); @@ -2560,12 +2622,6 @@ emit_type_DEF(arg_t *arg, asn1p_expr_t *expr, enum tvm_compat tv_mode, int tags_ OUT("0, 0,\t/* No PER support, " "use \"-gen-PER\" to enable */\n"); } - if(arg->flags & A1C_GEN_OER) { - OUT("0, 0,\t/* No OER support yet */\n"); - } else { - OUT("0, 0,\t/* No OER support, " - "use \"-gen-OER\" to enable */\n"); - } if(!terminal || terminal->expr_type == ASN_CONSTR_CHOICE) { //if(expr->expr_type == ASN_CONSTR_CHOICE) { @@ -2610,6 +2666,19 @@ emit_type_DEF(arg_t *arg, asn1p_expr_t *expr, enum tvm_compat tv_mode, int tags_ OUT("0,\t/* No tags (count) */\n"); } + if(arg->flags & A1C_GEN_OER) { + if(expr->constraints + || expr->expr_type == ASN_BASIC_ENUMERATED + || expr->expr_type == ASN_CONSTR_CHOICE) { + OUT("&asn_OER_type_%s_constr_%d,\n", + p, expr->_type_unique_index); + } else { + OUT("0,\t/* No OER visible constraints */\n"); + } + } else { + OUT("0,\t/* No OER visible constraints */\n"); + } + if(arg->flags & A1C_GEN_PER) { if(expr->constraints || expr->expr_type == ASN_BASIC_ENUMERATED diff --git a/skeletons/ANY.c b/skeletons/ANY.c index 9c7c561b..30f1e29f 100644 --- a/skeletons/ANY.c +++ b/skeletons/ANY.c @@ -21,11 +21,6 @@ asn_TYPE_descriptor_t asn_DEF_ANY = { OCTET_STRING_encode_der, OCTET_STRING_decode_xer_hex, ANY_encode_xer, -#ifdef ASN_DISABLE_PER_SUPPORT - 0, 0, -#else - 0, 0, -#endif /* ASN_DISABLE_PER_SUPPORT */ #ifdef ASN_DISABLE_OER_SUPPORT 0, 0, @@ -33,6 +28,11 @@ asn_TYPE_descriptor_t asn_DEF_ANY = { 0, 0, #endif /* ASN_DISABLE_OER_SUPPORT */ +#ifdef ASN_DISABLE_PER_SUPPORT + 0, 0, +#else + 0, 0, +#endif /* ASN_DISABLE_PER_SUPPORT */ 0, /* Use generic outmost tag fetcher */ 0, 0, 0, 0, 0, /* No OER visible constraints */ diff --git a/skeletons/BIT_STRING.c b/skeletons/BIT_STRING.c index 4ea94bf0..4aa1548c 100644 --- a/skeletons/BIT_STRING.c +++ b/skeletons/BIT_STRING.c @@ -27,13 +27,6 @@ asn_TYPE_descriptor_t asn_DEF_BIT_STRING = { OCTET_STRING_encode_der, /* Implemented in terms of OCTET STRING */ OCTET_STRING_decode_xer_binary, BIT_STRING_encode_xer, -#ifdef ASN_DISABLE_PER_SUPPORT - 0, - 0, -#else - OCTET_STRING_decode_uper, /* Unaligned PER decoder */ - OCTET_STRING_encode_uper, /* Unaligned PER encoder */ -#endif /* ASN_DISABLE_PER_SUPPORT */ #ifdef ASN_DISABLE_OER_SUPPORT 0, 0, @@ -41,6 +34,13 @@ asn_TYPE_descriptor_t asn_DEF_BIT_STRING = { 0, 0, #endif /* ASN_DISABLE_OER_SUPPORT */ +#ifdef ASN_DISABLE_PER_SUPPORT + 0, + 0, +#else + OCTET_STRING_decode_uper, /* Unaligned PER decoder */ + OCTET_STRING_encode_uper, /* Unaligned PER encoder */ +#endif /* ASN_DISABLE_PER_SUPPORT */ 0, /* Use generic outmost tag fetcher */ asn_DEF_BIT_STRING_tags, sizeof(asn_DEF_BIT_STRING_tags) diff --git a/skeletons/BMPString.c b/skeletons/BMPString.c index 38beddde..482b5e15 100644 --- a/skeletons/BMPString.c +++ b/skeletons/BMPString.c @@ -33,13 +33,6 @@ asn_TYPE_descriptor_t asn_DEF_BMPString = { OCTET_STRING_encode_der, BMPString_decode_xer, /* Convert from UTF-8 */ BMPString_encode_xer, /* Convert to UTF-8 */ -#ifdef ASN_DISABLE_PER_SUPPORT - 0, - 0, -#else - OCTET_STRING_decode_uper, - OCTET_STRING_encode_uper, -#endif /* ASN_DISABLE_PER_SUPPORT */ #ifdef ASN_DISABLE_OER_SUPPORT 0, 0, @@ -47,6 +40,13 @@ asn_TYPE_descriptor_t asn_DEF_BMPString = { 0, 0, #endif /* ASN_DISABLE_OER_SUPPORT */ +#ifdef ASN_DISABLE_PER_SUPPORT + 0, + 0, +#else + OCTET_STRING_decode_uper, + OCTET_STRING_encode_uper, +#endif /* ASN_DISABLE_PER_SUPPORT */ 0, /* Use generic outmost tag fetcher */ asn_DEF_BMPString_tags, sizeof(asn_DEF_BMPString_tags) diff --git a/skeletons/BOOLEAN.c b/skeletons/BOOLEAN.c index 060edca7..9f0c9bf7 100644 --- a/skeletons/BOOLEAN.c +++ b/skeletons/BOOLEAN.c @@ -22,13 +22,6 @@ asn_TYPE_descriptor_t asn_DEF_BOOLEAN = { BOOLEAN_encode_der, BOOLEAN_decode_xer, BOOLEAN_encode_xer, -#ifdef ASN_DISABLE_PER_SUPPORT - 0, - 0, -#else - BOOLEAN_decode_uper, /* Unaligned PER decoder */ - BOOLEAN_encode_uper, /* Unaligned PER encoder */ -#endif /* ASN_DISABLE_PER_SUPPORT */ #ifdef ASN_DISABLE_OER_SUPPORT 0, 0, @@ -36,6 +29,13 @@ asn_TYPE_descriptor_t asn_DEF_BOOLEAN = { 0, 0, #endif /* ASN_DISABLE_OER_SUPPORT */ +#ifdef ASN_DISABLE_PER_SUPPORT + 0, + 0, +#else + BOOLEAN_decode_uper, /* Unaligned PER decoder */ + BOOLEAN_encode_uper, /* Unaligned PER encoder */ +#endif /* ASN_DISABLE_PER_SUPPORT */ 0, /* Use generic outmost tag fetcher */ asn_DEF_BOOLEAN_tags, sizeof(asn_DEF_BOOLEAN_tags) / sizeof(asn_DEF_BOOLEAN_tags[0]), diff --git a/skeletons/ENUMERATED.c b/skeletons/ENUMERATED.c index f093575e..ea89745b 100644 --- a/skeletons/ENUMERATED.c +++ b/skeletons/ENUMERATED.c @@ -24,13 +24,6 @@ asn_TYPE_descriptor_t asn_DEF_ENUMERATED = { INTEGER_encode_der, /* Implemented in terms of INTEGER */ INTEGER_decode_xer, /* This is temporary! */ INTEGER_encode_xer, -#ifdef ASN_DISABLE_PER_SUPPORT - 0, - 0, -#else - ENUMERATED_decode_uper, /* Unaligned PER decoder */ - ENUMERATED_encode_uper, /* Unaligned PER encoder */ -#endif /* ASN_DISABLE_PER_SUPPORT */ #ifdef ASN_DISABLE_OER_SUPPORT 0, 0, @@ -38,6 +31,13 @@ asn_TYPE_descriptor_t asn_DEF_ENUMERATED = { 0, 0, #endif /* ASN_DISABLE_OER_SUPPORT */ +#ifdef ASN_DISABLE_PER_SUPPORT + 0, + 0, +#else + ENUMERATED_decode_uper, /* Unaligned PER decoder */ + ENUMERATED_encode_uper, /* Unaligned PER encoder */ +#endif /* ASN_DISABLE_PER_SUPPORT */ 0, /* Use generic outmost tag fetcher */ asn_DEF_ENUMERATED_tags, sizeof(asn_DEF_ENUMERATED_tags) / sizeof(asn_DEF_ENUMERATED_tags[0]), diff --git a/skeletons/GeneralString.c b/skeletons/GeneralString.c index f3d71999..4d32d6ec 100644 --- a/skeletons/GeneralString.c +++ b/skeletons/GeneralString.c @@ -22,13 +22,6 @@ asn_TYPE_descriptor_t asn_DEF_GeneralString = { OCTET_STRING_encode_der, OCTET_STRING_decode_xer_hex, OCTET_STRING_encode_xer, -#ifdef ASN_DISABLE_PER_SUPPORT - 0, - 0, -#else - OCTET_STRING_decode_uper, /* Implemented in terms of OCTET STRING */ - OCTET_STRING_encode_uper, -#endif /* ASN_DISABLE_PER_SUPPORT */ #ifdef ASN_DISABLE_OER_SUPPORT 0, 0, @@ -36,6 +29,13 @@ asn_TYPE_descriptor_t asn_DEF_GeneralString = { 0, 0, #endif /* ASN_DISABLE_OER_SUPPORT */ +#ifdef ASN_DISABLE_PER_SUPPORT + 0, + 0, +#else + OCTET_STRING_decode_uper, /* Implemented in terms of OCTET STRING */ + OCTET_STRING_encode_uper, +#endif /* ASN_DISABLE_PER_SUPPORT */ 0, /* Use generic outmost tag fetcher */ asn_DEF_GeneralString_tags, sizeof(asn_DEF_GeneralString_tags) diff --git a/skeletons/GeneralizedTime.c b/skeletons/GeneralizedTime.c index bcdd39be..40a2f18f 100644 --- a/skeletons/GeneralizedTime.c +++ b/skeletons/GeneralizedTime.c @@ -181,13 +181,6 @@ asn_TYPE_descriptor_t asn_DEF_GeneralizedTime = { GeneralizedTime_encode_der, OCTET_STRING_decode_xer_utf8, GeneralizedTime_encode_xer, -#ifdef ASN_DISABLE_PER_SUPPORT - 0, - 0, -#else - OCTET_STRING_decode_uper, - OCTET_STRING_encode_uper, -#endif /* ASN_DISABLE_PER_SUPPORT */ #ifdef ASN_DISABLE_OER_SUPPORT 0, 0, @@ -195,6 +188,13 @@ asn_TYPE_descriptor_t asn_DEF_GeneralizedTime = { 0, 0, #endif /* ASN_DISABLE_OER_SUPPORT */ +#ifdef ASN_DISABLE_PER_SUPPORT + 0, + 0, +#else + OCTET_STRING_decode_uper, + OCTET_STRING_encode_uper, +#endif /* ASN_DISABLE_PER_SUPPORT */ 0, /* Use generic outmost tag fetcher */ asn_DEF_GeneralizedTime_tags, sizeof(asn_DEF_GeneralizedTime_tags) diff --git a/skeletons/GraphicString.c b/skeletons/GraphicString.c index 1cec7f79..1e955ed7 100644 --- a/skeletons/GraphicString.c +++ b/skeletons/GraphicString.c @@ -22,13 +22,6 @@ asn_TYPE_descriptor_t asn_DEF_GraphicString = { OCTET_STRING_encode_der, OCTET_STRING_decode_xer_hex, OCTET_STRING_encode_xer, /* Can't expect it to be ASCII/UTF8 */ -#ifdef ASN_DISABLE_PER_SUPPORT - 0, - 0, -#else - OCTET_STRING_decode_uper, /* Implemented in terms of OCTET STRING */ - OCTET_STRING_encode_uper, -#endif /* ASN_DISABLE_PER_SUPPORT */ #ifdef ASN_DISABLE_OER_SUPPORT 0, 0, @@ -36,6 +29,13 @@ asn_TYPE_descriptor_t asn_DEF_GraphicString = { 0, 0, #endif /* ASN_DISABLE_OER_SUPPORT */ +#ifdef ASN_DISABLE_PER_SUPPORT + 0, + 0, +#else + OCTET_STRING_decode_uper, /* Implemented in terms of OCTET STRING */ + OCTET_STRING_encode_uper, +#endif /* ASN_DISABLE_PER_SUPPORT */ 0, /* Use generic outmost tag fetcher */ asn_DEF_GraphicString_tags, sizeof(asn_DEF_GraphicString_tags) diff --git a/skeletons/IA5String.c b/skeletons/IA5String.c index 44784ad9..068c18d4 100644 --- a/skeletons/IA5String.c +++ b/skeletons/IA5String.c @@ -27,13 +27,6 @@ asn_TYPE_descriptor_t asn_DEF_IA5String = { OCTET_STRING_encode_der, OCTET_STRING_decode_xer_utf8, OCTET_STRING_encode_xer_utf8, -#ifdef ASN_DISABLE_PER_SUPPORT - 0, - 0, -#else - OCTET_STRING_decode_uper, - OCTET_STRING_encode_uper, -#endif /* ASN_DISABLE_PER_SUPPORT */ #ifdef ASN_DISABLE_OER_SUPPORT 0, 0, @@ -41,6 +34,13 @@ asn_TYPE_descriptor_t asn_DEF_IA5String = { 0, 0, #endif /* ASN_DISABLE_OER_SUPPORT */ +#ifdef ASN_DISABLE_PER_SUPPORT + 0, + 0, +#else + OCTET_STRING_decode_uper, + OCTET_STRING_encode_uper, +#endif /* ASN_DISABLE_PER_SUPPORT */ 0, /* Use generic outmost tag fetcher */ asn_DEF_IA5String_tags, sizeof(asn_DEF_IA5String_tags) diff --git a/skeletons/INTEGER.c b/skeletons/INTEGER.c index e00c9ca4..00aea439 100644 --- a/skeletons/INTEGER.c +++ b/skeletons/INTEGER.c @@ -24,13 +24,6 @@ asn_TYPE_descriptor_t asn_DEF_INTEGER = { INTEGER_encode_der, INTEGER_decode_xer, INTEGER_encode_xer, -#ifdef ASN_DISABLE_PER_SUPPORT - 0, - 0, -#else - INTEGER_decode_uper, /* Unaligned PER decoder */ - INTEGER_encode_uper, /* Unaligned PER encoder */ -#endif /* ASN_DISABLE_PER_SUPPORT */ #ifdef ASN_DISABLE_OER_SUPPORT 0, 0, @@ -38,6 +31,13 @@ asn_TYPE_descriptor_t asn_DEF_INTEGER = { INTEGER_decode_oer, /* OER decoder */ INTEGER_encode_oer, /* Canonical OER encoder */ #endif /* ASN_DISABLE_OER_SUPPORT */ +#ifdef ASN_DISABLE_PER_SUPPORT + 0, + 0, +#else + INTEGER_decode_uper, /* Unaligned PER decoder */ + INTEGER_encode_uper, /* Unaligned PER encoder */ +#endif /* ASN_DISABLE_PER_SUPPORT */ 0, /* Use generic outmost tag fetcher */ asn_DEF_INTEGER_tags, sizeof(asn_DEF_INTEGER_tags) / sizeof(asn_DEF_INTEGER_tags[0]), diff --git a/skeletons/ISO646String.c b/skeletons/ISO646String.c index 5d30c280..87313ba8 100644 --- a/skeletons/ISO646String.c +++ b/skeletons/ISO646String.c @@ -27,13 +27,6 @@ asn_TYPE_descriptor_t asn_DEF_ISO646String = { OCTET_STRING_encode_der, OCTET_STRING_decode_xer_utf8, OCTET_STRING_encode_xer_utf8, -#ifdef ASN_DISABLE_PER_SUPPORT - 0, - 0, -#else - OCTET_STRING_decode_uper, - OCTET_STRING_encode_uper, -#endif /* ASN_DISABLE_PER_SUPPORT */ #ifdef ASN_DISABLE_OER_SUPPORT 0, 0, @@ -41,6 +34,13 @@ asn_TYPE_descriptor_t asn_DEF_ISO646String = { 0, 0, #endif /* ASN_DISABLE_OER_SUPPORT */ +#ifdef ASN_DISABLE_PER_SUPPORT + 0, + 0, +#else + OCTET_STRING_decode_uper, + OCTET_STRING_encode_uper, +#endif /* ASN_DISABLE_PER_SUPPORT */ 0, /* Use generic outmost tag fetcher */ asn_DEF_ISO646String_tags, sizeof(asn_DEF_ISO646String_tags) diff --git a/skeletons/NULL.c b/skeletons/NULL.c index 03090d1e..2482eb7a 100644 --- a/skeletons/NULL.c +++ b/skeletons/NULL.c @@ -23,13 +23,6 @@ asn_TYPE_descriptor_t asn_DEF_NULL = { NULL_encode_der, /* Special handling of DER encoding */ NULL_decode_xer, NULL_encode_xer, -#ifdef ASN_DISABLE_PER_SUPPORT - 0, - 0, -#else - NULL_decode_uper, /* Unaligned PER decoder */ - NULL_encode_uper, /* Unaligned PER encoder */ -#endif /* ASN_DISABLE_PER_SUPPORT */ #ifdef ASN_DISABLE_OER_SUPPORT 0, 0, @@ -37,6 +30,13 @@ asn_TYPE_descriptor_t asn_DEF_NULL = { 0, 0, #endif /* ASN_DISABLE_OER_SUPPORT */ +#ifdef ASN_DISABLE_PER_SUPPORT + 0, + 0, +#else + NULL_decode_uper, /* Unaligned PER decoder */ + NULL_encode_uper, /* Unaligned PER encoder */ +#endif /* ASN_DISABLE_PER_SUPPORT */ 0, /* Use generic outmost tag fetcher */ asn_DEF_NULL_tags, sizeof(asn_DEF_NULL_tags) / sizeof(asn_DEF_NULL_tags[0]), diff --git a/skeletons/NativeEnumerated.c b/skeletons/NativeEnumerated.c index 3fb91ed2..e9ce38f2 100644 --- a/skeletons/NativeEnumerated.c +++ b/skeletons/NativeEnumerated.c @@ -28,13 +28,6 @@ asn_TYPE_descriptor_t asn_DEF_NativeEnumerated = { NativeInteger_encode_der, NativeInteger_decode_xer, NativeEnumerated_encode_xer, -#ifdef ASN_DISABLE_PER_SUPPORT - 0, - 0, -#else - NativeEnumerated_decode_uper, - NativeEnumerated_encode_uper, -#endif /* ASN_DISABLE_PER_SUPPORT */ #ifdef ASN_DISABLE_OER_SUPPORT 0, 0, @@ -42,6 +35,13 @@ asn_TYPE_descriptor_t asn_DEF_NativeEnumerated = { 0, 0, #endif /* ASN_DISABLE_OER_SUPPORT */ +#ifdef ASN_DISABLE_PER_SUPPORT + 0, + 0, +#else + NativeEnumerated_decode_uper, + NativeEnumerated_encode_uper, +#endif /* ASN_DISABLE_PER_SUPPORT */ 0, /* Use generic outmost tag fetcher */ asn_DEF_NativeEnumerated_tags, sizeof(asn_DEF_NativeEnumerated_tags) / sizeof(asn_DEF_NativeEnumerated_tags[0]), diff --git a/skeletons/NativeInteger.c b/skeletons/NativeInteger.c index fde65579..16c64855 100644 --- a/skeletons/NativeInteger.c +++ b/skeletons/NativeInteger.c @@ -29,13 +29,6 @@ asn_TYPE_descriptor_t asn_DEF_NativeInteger = { NativeInteger_encode_der, NativeInteger_decode_xer, NativeInteger_encode_xer, -#ifdef ASN_DISABLE_PER_SUPPORT - 0, - 0, -#else - NativeInteger_decode_uper, /* Unaligned PER decoder */ - NativeInteger_encode_uper, /* Unaligned PER encoder */ -#endif /* ASN_DISABLE_PER_SUPPORT */ #ifdef ASN_DISABLE_OER_SUPPORT 0, 0, @@ -43,6 +36,13 @@ asn_TYPE_descriptor_t asn_DEF_NativeInteger = { 0, 0, #endif /* ASN_DISABLE_OER_SUPPORT */ +#ifdef ASN_DISABLE_PER_SUPPORT + 0, + 0, +#else + NativeInteger_decode_uper, /* Unaligned PER decoder */ + NativeInteger_encode_uper, /* Unaligned PER encoder */ +#endif /* ASN_DISABLE_PER_SUPPORT */ 0, /* Use generic outmost tag fetcher */ asn_DEF_NativeInteger_tags, sizeof(asn_DEF_NativeInteger_tags) / sizeof(asn_DEF_NativeInteger_tags[0]), diff --git a/skeletons/NativeReal.c b/skeletons/NativeReal.c index 11189541..6297b6b7 100644 --- a/skeletons/NativeReal.c +++ b/skeletons/NativeReal.c @@ -30,13 +30,6 @@ asn_TYPE_descriptor_t asn_DEF_NativeReal = { NativeReal_encode_der, NativeReal_decode_xer, NativeReal_encode_xer, -#ifdef ASN_DISABLE_PER_SUPPORT - 0, - 0, -#else - NativeReal_decode_uper, - NativeReal_encode_uper, -#endif /* ASN_DISABLE_PER_SUPPORT */ #ifdef ASN_DISABLE_OER_SUPPORT 0, 0, @@ -44,6 +37,13 @@ asn_TYPE_descriptor_t asn_DEF_NativeReal = { 0, 0, #endif /* ASN_DISABLE_OER_SUPPORT */ +#ifdef ASN_DISABLE_PER_SUPPORT + 0, + 0, +#else + NativeReal_decode_uper, + NativeReal_encode_uper, +#endif /* ASN_DISABLE_PER_SUPPORT */ 0, /* Use generic outmost tag fetcher */ asn_DEF_NativeReal_tags, sizeof(asn_DEF_NativeReal_tags) / sizeof(asn_DEF_NativeReal_tags[0]), diff --git a/skeletons/NumericString.c b/skeletons/NumericString.c index 84059666..cac26c83 100644 --- a/skeletons/NumericString.c +++ b/skeletons/NumericString.c @@ -47,13 +47,6 @@ asn_TYPE_descriptor_t asn_DEF_NumericString = { OCTET_STRING_encode_der, OCTET_STRING_decode_xer_utf8, OCTET_STRING_encode_xer_utf8, -#ifdef ASN_DISABLE_PER_SUPPORT - 0, - 0, -#else - OCTET_STRING_decode_uper, - OCTET_STRING_encode_uper, -#endif /* ASN_DISABLE_PER_SUPPORT */ #ifdef ASN_DISABLE_OER_SUPPORT 0, 0, @@ -61,6 +54,13 @@ asn_TYPE_descriptor_t asn_DEF_NumericString = { 0, 0, #endif /* ASN_DISABLE_OER_SUPPORT */ +#ifdef ASN_DISABLE_PER_SUPPORT + 0, + 0, +#else + OCTET_STRING_decode_uper, + OCTET_STRING_encode_uper, +#endif /* ASN_DISABLE_PER_SUPPORT */ 0, /* Use generic outmost tag fetcher */ asn_DEF_NumericString_tags, sizeof(asn_DEF_NumericString_tags) diff --git a/skeletons/OBJECT_IDENTIFIER.c b/skeletons/OBJECT_IDENTIFIER.c index 4e865ae9..6e19e0f7 100644 --- a/skeletons/OBJECT_IDENTIFIER.c +++ b/skeletons/OBJECT_IDENTIFIER.c @@ -25,13 +25,6 @@ asn_TYPE_descriptor_t asn_DEF_OBJECT_IDENTIFIER = { der_encode_primitive, OBJECT_IDENTIFIER_decode_xer, OBJECT_IDENTIFIER_encode_xer, -#ifdef ASN_DISABLE_PER_SUPPORT - 0, - 0, -#else - OCTET_STRING_decode_uper, - OCTET_STRING_encode_uper, -#endif /* ASN_DISABLE_PER_SUPPORT */ #ifdef ASN_DISABLE_OER_SUPPORT 0, 0, @@ -39,6 +32,13 @@ asn_TYPE_descriptor_t asn_DEF_OBJECT_IDENTIFIER = { 0, 0, #endif /* ASN_DISABLE_OER_SUPPORT */ +#ifdef ASN_DISABLE_PER_SUPPORT + 0, + 0, +#else + OCTET_STRING_decode_uper, + OCTET_STRING_encode_uper, +#endif /* ASN_DISABLE_PER_SUPPORT */ 0, /* Use generic outmost tag fetcher */ asn_DEF_OBJECT_IDENTIFIER_tags, sizeof(asn_DEF_OBJECT_IDENTIFIER_tags) diff --git a/skeletons/OCTET_STRING.c b/skeletons/OCTET_STRING.c index c5334616..d9a8c8b3 100644 --- a/skeletons/OCTET_STRING.c +++ b/skeletons/OCTET_STRING.c @@ -34,13 +34,6 @@ asn_TYPE_descriptor_t asn_DEF_OCTET_STRING = { OCTET_STRING_encode_der, OCTET_STRING_decode_xer_hex, OCTET_STRING_encode_xer, -#ifdef ASN_DISABLE_PER_SUPPORT - 0, - 0, -#else - OCTET_STRING_decode_uper, /* Unaligned PER decoder */ - OCTET_STRING_encode_uper, /* Unaligned PER encoder */ -#endif /* ASN_DISABLE_PER_SUPPORT */ #ifdef ASN_DISABLE_OER_SUPPORT 0, 0, @@ -48,6 +41,13 @@ asn_TYPE_descriptor_t asn_DEF_OCTET_STRING = { 0, 0, #endif /* ASN_DISABLE_OER_SUPPORT */ +#ifdef ASN_DISABLE_PER_SUPPORT + 0, + 0, +#else + OCTET_STRING_decode_uper, /* Unaligned PER decoder */ + OCTET_STRING_encode_uper, /* Unaligned PER encoder */ +#endif /* ASN_DISABLE_PER_SUPPORT */ 0, /* Use generic outmost tag fetcher */ asn_DEF_OCTET_STRING_tags, sizeof(asn_DEF_OCTET_STRING_tags) diff --git a/skeletons/ObjectDescriptor.c b/skeletons/ObjectDescriptor.c index 478a7c7a..ba539f8e 100644 --- a/skeletons/ObjectDescriptor.c +++ b/skeletons/ObjectDescriptor.c @@ -22,13 +22,6 @@ asn_TYPE_descriptor_t asn_DEF_ObjectDescriptor = { OCTET_STRING_encode_der, OCTET_STRING_decode_xer_utf8, OCTET_STRING_encode_xer_utf8, -#ifdef ASN_DISABLE_PER_SUPPORT - 0, - 0, -#else - OCTET_STRING_decode_uper, - OCTET_STRING_encode_uper, -#endif /* ASN_DISABLE_PER_SUPPORT */ #ifdef ASN_DISABLE_OER_SUPPORT 0, 0, @@ -36,6 +29,13 @@ asn_TYPE_descriptor_t asn_DEF_ObjectDescriptor = { 0, 0, #endif /* ASN_DISABLE_OER_SUPPORT */ +#ifdef ASN_DISABLE_PER_SUPPORT + 0, + 0, +#else + OCTET_STRING_decode_uper, + OCTET_STRING_encode_uper, +#endif /* ASN_DISABLE_PER_SUPPORT */ 0, /* Use generic outmost tag fetcher */ asn_DEF_ObjectDescriptor_tags, sizeof(asn_DEF_ObjectDescriptor_tags) diff --git a/skeletons/PrintableString.c b/skeletons/PrintableString.c index 3360c2df..d3ff0905 100644 --- a/skeletons/PrintableString.c +++ b/skeletons/PrintableString.c @@ -57,13 +57,6 @@ asn_TYPE_descriptor_t asn_DEF_PrintableString = { OCTET_STRING_encode_der, OCTET_STRING_decode_xer_utf8, OCTET_STRING_encode_xer_utf8, -#ifdef ASN_DISABLE_PER_SUPPORT - 0, - 0, -#else - OCTET_STRING_decode_uper, - OCTET_STRING_encode_uper, -#endif /* ASN_DISABLE_PER_SUPPORT */ #ifdef ASN_DISABLE_OER_SUPPORT 0, 0, @@ -71,6 +64,13 @@ asn_TYPE_descriptor_t asn_DEF_PrintableString = { 0, 0, #endif /* ASN_DISABLE_OER_SUPPORT */ +#ifdef ASN_DISABLE_PER_SUPPORT + 0, + 0, +#else + OCTET_STRING_decode_uper, + OCTET_STRING_encode_uper, +#endif /* ASN_DISABLE_PER_SUPPORT */ 0, /* Use generic outmost tag fetcher */ asn_DEF_PrintableString_tags, sizeof(asn_DEF_PrintableString_tags) diff --git a/skeletons/REAL.c b/skeletons/REAL.c index 3a166fe5..12044156 100644 --- a/skeletons/REAL.c +++ b/skeletons/REAL.c @@ -51,13 +51,6 @@ asn_TYPE_descriptor_t asn_DEF_REAL = { der_encode_primitive, REAL_decode_xer, REAL_encode_xer, -#ifdef ASN_DISABLE_PER_SUPPORT - 0, - 0, -#else - REAL_decode_uper, - REAL_encode_uper, -#endif /* ASN_DISABLE_PER_SUPPORT */ #ifdef ASN_DISABLE_OER_SUPPORT 0, 0, @@ -65,6 +58,13 @@ asn_TYPE_descriptor_t asn_DEF_REAL = { 0, 0, #endif /* ASN_DISABLE_OER_SUPPORT */ +#ifdef ASN_DISABLE_PER_SUPPORT + 0, + 0, +#else + REAL_decode_uper, + REAL_encode_uper, +#endif /* ASN_DISABLE_PER_SUPPORT */ 0, /* Use generic outmost tag fetcher */ asn_DEF_REAL_tags, sizeof(asn_DEF_REAL_tags) / sizeof(asn_DEF_REAL_tags[0]), diff --git a/skeletons/RELATIVE-OID.c b/skeletons/RELATIVE-OID.c index 0a2f5348..6fc9eacd 100644 --- a/skeletons/RELATIVE-OID.c +++ b/skeletons/RELATIVE-OID.c @@ -26,13 +26,6 @@ asn_TYPE_descriptor_t asn_DEF_RELATIVE_OID = { der_encode_primitive, RELATIVE_OID_decode_xer, RELATIVE_OID_encode_xer, -#ifdef ASN_DISABLE_PER_SUPPORT - 0, - 0, -#else - OCTET_STRING_decode_uper, - OCTET_STRING_encode_uper, -#endif /* ASN_DISABLE_PER_SUPPORT */ #ifdef ASN_DISABLE_OER_SUPPORT 0, 0, @@ -40,6 +33,13 @@ asn_TYPE_descriptor_t asn_DEF_RELATIVE_OID = { 0, 0, #endif /* ASN_DISABLE_OER_SUPPORT */ +#ifdef ASN_DISABLE_PER_SUPPORT + 0, + 0, +#else + OCTET_STRING_decode_uper, + OCTET_STRING_encode_uper, +#endif /* ASN_DISABLE_PER_SUPPORT */ 0, /* Use generic outmost tag fetcher */ asn_DEF_RELATIVE_OID_tags, sizeof(asn_DEF_RELATIVE_OID_tags) diff --git a/skeletons/T61String.c b/skeletons/T61String.c index 06c0dc6b..43d14795 100644 --- a/skeletons/T61String.c +++ b/skeletons/T61String.c @@ -22,13 +22,6 @@ asn_TYPE_descriptor_t asn_DEF_T61String = { OCTET_STRING_encode_der, OCTET_STRING_decode_xer_hex, OCTET_STRING_encode_xer, -#ifdef ASN_DISABLE_PER_SUPPORT - 0, - 0, -#else - OCTET_STRING_decode_uper, - OCTET_STRING_encode_uper, -#endif /* ASN_DISABLE_PER_SUPPORT */ #ifdef ASN_DISABLE_OER_SUPPORT 0, 0, @@ -36,6 +29,13 @@ asn_TYPE_descriptor_t asn_DEF_T61String = { 0, 0, #endif /* ASN_DISABLE_OER_SUPPORT */ +#ifdef ASN_DISABLE_PER_SUPPORT + 0, + 0, +#else + OCTET_STRING_decode_uper, + OCTET_STRING_encode_uper, +#endif /* ASN_DISABLE_PER_SUPPORT */ 0, /* Use generic outmost tag fetcher */ asn_DEF_T61String_tags, sizeof(asn_DEF_T61String_tags) diff --git a/skeletons/TeletexString.c b/skeletons/TeletexString.c index ad707c8e..bbe859ed 100644 --- a/skeletons/TeletexString.c +++ b/skeletons/TeletexString.c @@ -22,13 +22,6 @@ asn_TYPE_descriptor_t asn_DEF_TeletexString = { OCTET_STRING_encode_der, OCTET_STRING_decode_xer_hex, OCTET_STRING_encode_xer, -#ifdef ASN_DISABLE_PER_SUPPORT - 0, - 0, -#else - OCTET_STRING_decode_uper, - OCTET_STRING_encode_uper, -#endif /* ASN_DISABLE_PER_SUPPORT */ #ifdef ASN_DISABLE_OER_SUPPORT 0, 0, @@ -36,6 +29,13 @@ asn_TYPE_descriptor_t asn_DEF_TeletexString = { 0, 0, #endif /* ASN_DISABLE_OER_SUPPORT */ +#ifdef ASN_DISABLE_PER_SUPPORT + 0, + 0, +#else + OCTET_STRING_decode_uper, + OCTET_STRING_encode_uper, +#endif /* ASN_DISABLE_PER_SUPPORT */ 0, /* Use generic outmost tag fetcher */ asn_DEF_TeletexString_tags, sizeof(asn_DEF_TeletexString_tags) diff --git a/skeletons/UTCTime.c b/skeletons/UTCTime.c index 024c0691..bae698e2 100644 --- a/skeletons/UTCTime.c +++ b/skeletons/UTCTime.c @@ -38,13 +38,6 @@ asn_TYPE_descriptor_t asn_DEF_UTCTime = { OCTET_STRING_encode_der, /* Implemented in terms of OCTET STRING */ OCTET_STRING_decode_xer_utf8, UTCTime_encode_xer, -#ifdef ASN_DISABLE_PER_SUPPORT - 0, - 0, -#else - OCTET_STRING_decode_uper, - OCTET_STRING_encode_uper, -#endif /* ASN_DISABLE_PER_SUPPORT */ #ifdef ASN_DISABLE_OER_SUPPORT 0, 0, @@ -52,6 +45,13 @@ asn_TYPE_descriptor_t asn_DEF_UTCTime = { 0, 0, #endif /* ASN_DISABLE_OER_SUPPORT */ +#ifdef ASN_DISABLE_PER_SUPPORT + 0, + 0, +#else + OCTET_STRING_decode_uper, + OCTET_STRING_encode_uper, +#endif /* ASN_DISABLE_PER_SUPPORT */ 0, /* Use generic outmost tag fetcher */ asn_DEF_UTCTime_tags, sizeof(asn_DEF_UTCTime_tags) diff --git a/skeletons/UTF8String.c b/skeletons/UTF8String.c index 7532864d..9a2ce10a 100644 --- a/skeletons/UTF8String.c +++ b/skeletons/UTF8String.c @@ -23,13 +23,6 @@ asn_TYPE_descriptor_t asn_DEF_UTF8String = { OCTET_STRING_encode_der, OCTET_STRING_decode_xer_utf8, OCTET_STRING_encode_xer_utf8, -#ifdef ASN_DISABLE_PER_SUPPORT - 0, - 0, -#else - OCTET_STRING_decode_uper, - OCTET_STRING_encode_uper, -#endif /* ASN_DISABLE_PER_SUPPORT */ #ifdef ASN_DISABLE_OER_SUPPORT 0, 0, @@ -37,6 +30,13 @@ asn_TYPE_descriptor_t asn_DEF_UTF8String = { 0, 0, #endif /* ASN_DISABLE_OER_SUPPORT */ +#ifdef ASN_DISABLE_PER_SUPPORT + 0, + 0, +#else + OCTET_STRING_decode_uper, + OCTET_STRING_encode_uper, +#endif /* ASN_DISABLE_PER_SUPPORT */ 0, /* Use generic outmost tag fetcher */ asn_DEF_UTF8String_tags, sizeof(asn_DEF_UTF8String_tags) diff --git a/skeletons/UniversalString.c b/skeletons/UniversalString.c index b947810a..ecb31ebe 100644 --- a/skeletons/UniversalString.c +++ b/skeletons/UniversalString.c @@ -33,13 +33,6 @@ asn_TYPE_descriptor_t asn_DEF_UniversalString = { OCTET_STRING_encode_der, UniversalString_decode_xer, /* Convert from UTF-8 */ UniversalString_encode_xer, /* Convert into UTF-8 */ -#ifdef ASN_DISABLE_PER_SUPPORT - 0, - 0, -#else - OCTET_STRING_decode_uper, - OCTET_STRING_encode_uper, -#endif /* ASN_DISABLE_PER_SUPPORT */ #ifdef ASN_DISABLE_OER_SUPPORT 0, 0, @@ -47,6 +40,13 @@ asn_TYPE_descriptor_t asn_DEF_UniversalString = { 0, 0, #endif /* ASN_DISABLE_OER_SUPPORT */ +#ifdef ASN_DISABLE_PER_SUPPORT + 0, + 0, +#else + OCTET_STRING_decode_uper, + OCTET_STRING_encode_uper, +#endif /* ASN_DISABLE_PER_SUPPORT */ 0, /* Use generic outmost tag fetcher */ asn_DEF_UniversalString_tags, sizeof(asn_DEF_UniversalString_tags) diff --git a/skeletons/VideotexString.c b/skeletons/VideotexString.c index 760fb06b..c9c99490 100644 --- a/skeletons/VideotexString.c +++ b/skeletons/VideotexString.c @@ -22,13 +22,6 @@ asn_TYPE_descriptor_t asn_DEF_VideotexString = { OCTET_STRING_encode_der, OCTET_STRING_decode_xer_hex, OCTET_STRING_encode_xer, -#ifdef ASN_DISABLE_PER_SUPPORT - 0, - 0, -#else - OCTET_STRING_decode_uper, /* Implemented in terms of OCTET STRING */ - OCTET_STRING_encode_uper, -#endif /* ASN_DISABLE_PER_SUPPORT */ #ifdef ASN_DISABLE_OER_SUPPORT 0, 0, @@ -36,6 +29,13 @@ asn_TYPE_descriptor_t asn_DEF_VideotexString = { 0, 0, #endif /* ASN_DISABLE_OER_SUPPORT */ +#ifdef ASN_DISABLE_PER_SUPPORT + 0, + 0, +#else + OCTET_STRING_decode_uper, /* Implemented in terms of OCTET STRING */ + OCTET_STRING_encode_uper, +#endif /* ASN_DISABLE_PER_SUPPORT */ 0, /* Use generic outmost tag fetcher */ asn_DEF_VideotexString_tags, sizeof(asn_DEF_VideotexString_tags) diff --git a/skeletons/VisibleString.c b/skeletons/VisibleString.c index 0411b056..4b8c4cf4 100644 --- a/skeletons/VisibleString.c +++ b/skeletons/VisibleString.c @@ -27,13 +27,6 @@ asn_TYPE_descriptor_t asn_DEF_VisibleString = { OCTET_STRING_encode_der, OCTET_STRING_decode_xer_utf8, OCTET_STRING_encode_xer_utf8, -#ifdef ASN_DISABLE_PER_SUPPORT - 0, - 0, -#else - OCTET_STRING_decode_uper, - OCTET_STRING_encode_uper, -#endif /* ASN_DISABLE_PER_SUPPORT */ #ifdef ASN_DISABLE_OER_SUPPORT 0, 0, @@ -41,6 +34,13 @@ asn_TYPE_descriptor_t asn_DEF_VisibleString = { 0, 0, #endif /* ASN_DISABLE_OER_SUPPORT */ +#ifdef ASN_DISABLE_PER_SUPPORT + 0, + 0, +#else + OCTET_STRING_decode_uper, + OCTET_STRING_encode_uper, +#endif /* ASN_DISABLE_PER_SUPPORT */ 0, /* Use generic outmost tag fetcher */ asn_DEF_VisibleString_tags, sizeof(asn_DEF_VisibleString_tags) diff --git a/skeletons/constr_TYPE.h b/skeletons/constr_TYPE.h index 19ab7cee..b1d4a1a9 100644 --- a/skeletons/constr_TYPE.h +++ b/skeletons/constr_TYPE.h @@ -99,10 +99,10 @@ typedef struct asn_TYPE_descriptor_s { der_type_encoder_f *der_encoder; /* Canonical DER encoder */ xer_type_decoder_f *xer_decoder; /* Generic XER decoder */ xer_type_encoder_f *xer_encoder; /* [Canonical] XER encoder */ - per_type_decoder_f *uper_decoder; /* Unaligned PER decoder */ - per_type_encoder_f *uper_encoder; /* Unaligned PER encoder */ oer_type_decoder_f *oer_decoder; /* Generic OER decoder */ oer_type_encoder_f *oer_encoder; /* Canonical OER encoder */ + per_type_decoder_f *uper_decoder; /* Unaligned PER decoder */ + per_type_encoder_f *uper_encoder; /* Unaligned PER encoder */ /*********************************************************************** * Internally useful members. Not to be used by applications directly. * @@ -150,6 +150,7 @@ typedef struct asn_TYPE_member_s { int tag_mode; /* IMPLICIT/no/EXPLICIT tag at current level */ asn_TYPE_descriptor_t *type; /* Member type descriptor */ asn_constr_check_f *memb_constraints; /* Constraints validator */ + asn_oer_constraints_t *oer_constraints; /* OER compiled constraints */ asn_per_constraints_t *per_constraints; /* PER compiled constraints */ int (*default_value)(int setval, void **sptr); /* DEFAULT */ const char *name; /* ASN.1 identifier of the element */ diff --git a/tests/03-enum-OK.asn1.-Pfwide-types b/tests/03-enum-OK.asn1.-Pfwide-types index 7150662b..b525b54e 100644 --- a/tests/03-enum-OK.asn1.-Pfwide-types +++ b/tests/03-enum-OK.asn1.-Pfwide-types @@ -57,6 +57,8 @@ Enum1_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_ENUMERATED.uper_encoder; td->oer_decoder = asn_DEF_ENUMERATED.oer_decoder; td->oer_encoder = asn_DEF_ENUMERATED.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_ENUMERATED.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_ENUMERATED.per_constraints; td->elements = asn_DEF_ENUMERATED.elements; @@ -147,8 +149,8 @@ asn_TYPE_descriptor_t asn_DEF_Enum1 = { Enum1_encode_der, Enum1_decode_xer, Enum1_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Enum1_tags_1, sizeof(asn_DEF_Enum1_tags_1) @@ -156,6 +158,7 @@ asn_TYPE_descriptor_t asn_DEF_Enum1 = { asn_DEF_Enum1_tags_1, /* Same as above */ sizeof(asn_DEF_Enum1_tags_1) /sizeof(asn_DEF_Enum1_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* Defined elsewhere */ &asn_SPC_Enum1_specs_1 /* Additional specs */ @@ -223,6 +226,8 @@ Enum2_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_ENUMERATED.uper_encoder; td->oer_decoder = asn_DEF_ENUMERATED.oer_decoder; td->oer_encoder = asn_DEF_ENUMERATED.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_ENUMERATED.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_ENUMERATED.per_constraints; td->elements = asn_DEF_ENUMERATED.elements; @@ -319,8 +324,8 @@ asn_TYPE_descriptor_t asn_DEF_Enum2 = { Enum2_encode_der, Enum2_decode_xer, Enum2_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Enum2_tags_1, sizeof(asn_DEF_Enum2_tags_1) @@ -328,6 +333,7 @@ asn_TYPE_descriptor_t asn_DEF_Enum2 = { asn_DEF_Enum2_tags_1, /* Same as above */ sizeof(asn_DEF_Enum2_tags_1) /sizeof(asn_DEF_Enum2_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* Defined elsewhere */ &asn_SPC_Enum2_specs_1 /* Additional specs */ @@ -391,6 +397,8 @@ Enum3_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_ENUMERATED.uper_encoder; td->oer_decoder = asn_DEF_ENUMERATED.oer_decoder; td->oer_encoder = asn_DEF_ENUMERATED.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_ENUMERATED.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_ENUMERATED.per_constraints; td->elements = asn_DEF_ENUMERATED.elements; @@ -479,8 +487,8 @@ asn_TYPE_descriptor_t asn_DEF_Enum3 = { Enum3_encode_der, Enum3_decode_xer, Enum3_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Enum3_tags_1, sizeof(asn_DEF_Enum3_tags_1) @@ -488,6 +496,7 @@ asn_TYPE_descriptor_t asn_DEF_Enum3 = { asn_DEF_Enum3_tags_1, /* Same as above */ sizeof(asn_DEF_Enum3_tags_1) /sizeof(asn_DEF_Enum3_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* Defined elsewhere */ &asn_SPC_Enum3_specs_1 /* Additional specs */ @@ -552,6 +561,8 @@ Enum4_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_ENUMERATED.uper_encoder; td->oer_decoder = asn_DEF_ENUMERATED.oer_decoder; td->oer_encoder = asn_DEF_ENUMERATED.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_ENUMERATED.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_ENUMERATED.per_constraints; td->elements = asn_DEF_ENUMERATED.elements; @@ -642,8 +653,8 @@ asn_TYPE_descriptor_t asn_DEF_Enum4 = { Enum4_encode_der, Enum4_decode_xer, Enum4_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Enum4_tags_1, sizeof(asn_DEF_Enum4_tags_1) @@ -651,6 +662,7 @@ asn_TYPE_descriptor_t asn_DEF_Enum4 = { asn_DEF_Enum4_tags_1, /* Same as above */ sizeof(asn_DEF_Enum4_tags_1) /sizeof(asn_DEF_Enum4_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* Defined elsewhere */ &asn_SPC_Enum4_specs_1 /* Additional specs */ @@ -714,6 +726,8 @@ Enum5_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_ENUMERATED.uper_encoder; td->oer_decoder = asn_DEF_ENUMERATED.oer_decoder; td->oer_encoder = asn_DEF_ENUMERATED.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_ENUMERATED.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_ENUMERATED.per_constraints; td->elements = asn_DEF_ENUMERATED.elements; @@ -802,8 +816,8 @@ asn_TYPE_descriptor_t asn_DEF_Enum5 = { Enum5_encode_der, Enum5_decode_xer, Enum5_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Enum5_tags_1, sizeof(asn_DEF_Enum5_tags_1) @@ -811,6 +825,7 @@ asn_TYPE_descriptor_t asn_DEF_Enum5 = { asn_DEF_Enum5_tags_1, /* Same as above */ sizeof(asn_DEF_Enum5_tags_1) /sizeof(asn_DEF_Enum5_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* Defined elsewhere */ &asn_SPC_Enum5_specs_1 /* Additional specs */ diff --git a/tests/104-param-1-OK.asn1.-Pfwide-types b/tests/104-param-1-OK.asn1.-Pfwide-types index f9947caa..1b9d60cc 100644 --- a/tests/104-param-1-OK.asn1.-Pfwide-types +++ b/tests/104-param-1-OK.asn1.-Pfwide-types @@ -34,6 +34,7 @@ static asn_TYPE_member_t asn_MBR_Collection_16P0_1[] = { .tag_mode = 0, .type = &asn_DEF_REAL, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "" @@ -57,8 +58,8 @@ asn_TYPE_descriptor_t asn_DEF_Collection_16P0 = { SET_OF_encode_der, SET_OF_decode_xer, SET_OF_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Collection_16P0_tags_1, sizeof(asn_DEF_Collection_16P0_tags_1) @@ -66,6 +67,7 @@ asn_TYPE_descriptor_t asn_DEF_Collection_16P0 = { asn_DEF_Collection_16P0_tags_1, /* Same as above */ sizeof(asn_DEF_Collection_16P0_tags_1) /sizeof(asn_DEF_Collection_16P0_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_Collection_16P0_1, 1, /* Single element */ @@ -78,6 +80,7 @@ static asn_TYPE_member_t asn_MBR_Collection_16P1_3[] = { .tag_mode = 0, .type = &asn_DEF_IA5String, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "" @@ -101,8 +104,8 @@ asn_TYPE_descriptor_t asn_DEF_Collection_16P1 = { SET_OF_encode_der, SET_OF_decode_xer, SET_OF_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Collection_16P1_tags_3, sizeof(asn_DEF_Collection_16P1_tags_3) @@ -110,6 +113,7 @@ asn_TYPE_descriptor_t asn_DEF_Collection_16P1 = { asn_DEF_Collection_16P1_tags_3, /* Same as above */ sizeof(asn_DEF_Collection_16P1_tags_3) /sizeof(asn_DEF_Collection_16P1_tags_3[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_Collection_16P1_3, 1, /* Single element */ @@ -144,6 +148,7 @@ static asn_TYPE_member_t asn_MBR_Bunch_1[] = { .tag_mode = 0, .type = &asn_DEF_Collection_16P0, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "field-REAL" @@ -153,6 +158,7 @@ static asn_TYPE_member_t asn_MBR_Bunch_1[] = { .tag_mode = 0, .type = &asn_DEF_Collection_16P1, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "field-IA5String" @@ -184,8 +190,8 @@ asn_TYPE_descriptor_t asn_DEF_Bunch = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Bunch_tags_1, sizeof(asn_DEF_Bunch_tags_1) @@ -193,6 +199,7 @@ asn_TYPE_descriptor_t asn_DEF_Bunch = { asn_DEF_Bunch_tags_1, /* Same as above */ sizeof(asn_DEF_Bunch_tags_1) /sizeof(asn_DEF_Bunch_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_Bunch_1, 2, /* Elements count */ diff --git a/tests/105-param-2-OK.asn1.-Pfwide-types b/tests/105-param-2-OK.asn1.-Pfwide-types index aa9a5ff7..4a6f9950 100644 --- a/tests/105-param-2-OK.asn1.-Pfwide-types +++ b/tests/105-param-2-OK.asn1.-Pfwide-types @@ -53,6 +53,7 @@ static asn_TYPE_member_t asn_MBR_SIGNED_16P0_1[] = { .tag_mode = 0, .type = &asn_DEF_REAL, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "signed" @@ -83,8 +84,8 @@ asn_TYPE_descriptor_t asn_DEF_SIGNED_16P0 = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_SIGNED_16P0_tags_1, sizeof(asn_DEF_SIGNED_16P0_tags_1) @@ -92,6 +93,7 @@ asn_TYPE_descriptor_t asn_DEF_SIGNED_16P0 = { asn_DEF_SIGNED_16P0_tags_1, /* Same as above */ sizeof(asn_DEF_SIGNED_16P0_tags_1) /sizeof(asn_DEF_SIGNED_16P0_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_SIGNED_16P0_1, 1, /* Elements count */ @@ -104,6 +106,7 @@ static asn_TYPE_member_t asn_MBR_signed_4[] = { .tag_mode = 0, .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "a" @@ -140,8 +143,8 @@ asn_TYPE_descriptor_t asn_DEF_signed_4 = { SET_encode_der, SET_decode_xer, SET_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_signed_tags_4, sizeof(asn_DEF_signed_tags_4) @@ -149,6 +152,7 @@ asn_TYPE_descriptor_t asn_DEF_signed_4 = { asn_DEF_signed_tags_4, /* Same as above */ sizeof(asn_DEF_signed_tags_4) /sizeof(asn_DEF_signed_tags_4[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_signed_4, 1, /* Elements count */ @@ -161,6 +165,7 @@ static asn_TYPE_member_t asn_MBR_SIGNED_16P1_3[] = { .tag_mode = 0, .type = &asn_DEF_signed_4, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "signed" @@ -191,8 +196,8 @@ asn_TYPE_descriptor_t asn_DEF_SIGNED_16P1 = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_SIGNED_16P1_tags_3, sizeof(asn_DEF_SIGNED_16P1_tags_3) @@ -200,6 +205,7 @@ asn_TYPE_descriptor_t asn_DEF_SIGNED_16P1 = { asn_DEF_SIGNED_16P1_tags_3, /* Same as above */ sizeof(asn_DEF_SIGNED_16P1_tags_3) /sizeof(asn_DEF_SIGNED_16P1_tags_3[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_SIGNED_16P1_3, 1, /* Elements count */ @@ -253,6 +259,8 @@ SignedREAL_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_SIGNED_16P0.uper_encoder; td->oer_decoder = asn_DEF_SIGNED_16P0.oer_decoder; td->oer_encoder = asn_DEF_SIGNED_16P0.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_SIGNED_16P0.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_SIGNED_16P0.per_constraints; td->elements = asn_DEF_SIGNED_16P0.elements; @@ -320,8 +328,8 @@ asn_TYPE_descriptor_t asn_DEF_SignedREAL = { SignedREAL_encode_der, SignedREAL_decode_xer, SignedREAL_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_SignedREAL_tags_1, sizeof(asn_DEF_SignedREAL_tags_1) @@ -329,6 +337,7 @@ asn_TYPE_descriptor_t asn_DEF_SignedREAL = { asn_DEF_SignedREAL_tags_1, /* Same as above */ sizeof(asn_DEF_SignedREAL_tags_1) /sizeof(asn_DEF_SignedREAL_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* Defined elsewhere */ 0 /* No specifics */ @@ -381,6 +390,8 @@ SignedSET_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_SIGNED_16P1.uper_encoder; td->oer_decoder = asn_DEF_SIGNED_16P1.oer_decoder; td->oer_encoder = asn_DEF_SIGNED_16P1.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_SIGNED_16P1.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_SIGNED_16P1.per_constraints; td->elements = asn_DEF_SIGNED_16P1.elements; @@ -448,8 +459,8 @@ asn_TYPE_descriptor_t asn_DEF_SignedSET = { SignedSET_encode_der, SignedSET_decode_xer, SignedSET_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_SignedSET_tags_1, sizeof(asn_DEF_SignedSET_tags_1) @@ -457,6 +468,7 @@ asn_TYPE_descriptor_t asn_DEF_SignedSET = { asn_DEF_SignedSET_tags_1, /* Same as above */ sizeof(asn_DEF_SignedSET_tags_1) /sizeof(asn_DEF_SignedSET_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* Defined elsewhere */ 0 /* No specifics */ diff --git a/tests/106-param-constr-OK.asn1.-P b/tests/106-param-constr-OK.asn1.-P index e1a703d8..89d20386 100644 --- a/tests/106-param-constr-OK.asn1.-P +++ b/tests/106-param-constr-OK.asn1.-P @@ -123,6 +123,7 @@ static asn_TYPE_member_t asn_MBR_Narrow_15P0_1[] = { .tag_mode = 0, .type = &asn_DEF_NativeInteger, .memb_constraints = memb_narrow1_constraint_1, + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = asn_DFL_2_set_3, /* DEFAULT 3 */ .name = "narrow1" @@ -132,6 +133,7 @@ static asn_TYPE_member_t asn_MBR_Narrow_15P0_1[] = { .tag_mode = +1, /* EXPLICIT tag at current level */ .type = &asn_DEF_NativeInteger, .memb_constraints = memb_narrow2_constraint_1, + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "narrow2" @@ -141,6 +143,7 @@ static asn_TYPE_member_t asn_MBR_Narrow_15P0_1[] = { .tag_mode = +1, /* EXPLICIT tag at current level */ .type = &asn_DEF_NativeInteger, .memb_constraints = memb_narrow3_constraint_1, + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "narrow3" @@ -173,8 +176,8 @@ asn_TYPE_descriptor_t asn_DEF_Narrow_15P0 = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Narrow_15P0_tags_1, sizeof(asn_DEF_Narrow_15P0_tags_1) @@ -182,6 +185,7 @@ asn_TYPE_descriptor_t asn_DEF_Narrow_15P0 = { asn_DEF_Narrow_15P0_tags_1, /* Same as above */ sizeof(asn_DEF_Narrow_15P0_tags_1) /sizeof(asn_DEF_Narrow_15P0_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_Narrow_15P0_1, 3, /* Elements count */ @@ -235,6 +239,8 @@ NarrowInteger_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_Narrow_15P0.uper_encoder; td->oer_decoder = asn_DEF_Narrow_15P0.oer_decoder; td->oer_encoder = asn_DEF_Narrow_15P0.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_Narrow_15P0.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_Narrow_15P0.per_constraints; td->elements = asn_DEF_Narrow_15P0.elements; @@ -302,8 +308,8 @@ asn_TYPE_descriptor_t asn_DEF_NarrowInteger = { NarrowInteger_encode_der, NarrowInteger_decode_xer, NarrowInteger_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_NarrowInteger_tags_1, sizeof(asn_DEF_NarrowInteger_tags_1) @@ -311,6 +317,7 @@ asn_TYPE_descriptor_t asn_DEF_NarrowInteger = { asn_DEF_NarrowInteger_tags_1, /* Same as above */ sizeof(asn_DEF_NarrowInteger_tags_1) /sizeof(asn_DEF_NarrowInteger_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* Defined elsewhere */ 0 /* No specifics */ diff --git a/tests/108-param-constr-3-OK.asn1.-Pfwide-types b/tests/108-param-constr-3-OK.asn1.-Pfwide-types index 6242725a..ca9ce532 100644 --- a/tests/108-param-constr-3-OK.asn1.-Pfwide-types +++ b/tests/108-param-constr-3-OK.asn1.-Pfwide-types @@ -68,6 +68,8 @@ MinMax_16P0_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_INTEGER.uper_encoder; td->oer_decoder = asn_DEF_INTEGER.oer_decoder; td->oer_encoder = asn_DEF_INTEGER.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_INTEGER.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_INTEGER.per_constraints; td->elements = asn_DEF_INTEGER.elements; @@ -135,8 +137,8 @@ asn_TYPE_descriptor_t asn_DEF_MinMax_16P0 = { MinMax_16P0_encode_der, MinMax_16P0_decode_xer, MinMax_16P0_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_MinMax_16P0_tags_1, sizeof(asn_DEF_MinMax_16P0_tags_1) @@ -144,6 +146,7 @@ asn_TYPE_descriptor_t asn_DEF_MinMax_16P0 = { asn_DEF_MinMax_16P0_tags_1, /* Same as above */ sizeof(asn_DEF_MinMax_16P0_tags_1) /sizeof(asn_DEF_MinMax_16P0_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -219,6 +222,8 @@ ThreePlus_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_MinMax_16P0.uper_encoder; td->oer_decoder = asn_DEF_MinMax_16P0.oer_decoder; td->oer_encoder = asn_DEF_MinMax_16P0.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_MinMax_16P0.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_MinMax_16P0.per_constraints; td->elements = asn_DEF_MinMax_16P0.elements; @@ -286,8 +291,8 @@ asn_TYPE_descriptor_t asn_DEF_ThreePlus = { ThreePlus_encode_der, ThreePlus_decode_xer, ThreePlus_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_ThreePlus_tags_1, sizeof(asn_DEF_ThreePlus_tags_1) @@ -295,6 +300,7 @@ asn_TYPE_descriptor_t asn_DEF_ThreePlus = { asn_DEF_ThreePlus_tags_1, /* Same as above */ sizeof(asn_DEF_ThreePlus_tags_1) /sizeof(asn_DEF_ThreePlus_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ diff --git a/tests/110-param-3-OK.asn1.-Pfwide-types b/tests/110-param-3-OK.asn1.-Pfwide-types index 2aa16df1..5c26d8dc 100644 --- a/tests/110-param-3-OK.asn1.-Pfwide-types +++ b/tests/110-param-3-OK.asn1.-Pfwide-types @@ -66,6 +66,8 @@ field_7_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_ENUMERATED.uper_encoder; td->oer_decoder = asn_DEF_ENUMERATED.oer_decoder; td->oer_encoder = asn_DEF_ENUMERATED.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_ENUMERATED.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_ENUMERATED.per_constraints; td->elements = asn_DEF_ENUMERATED.elements; @@ -146,6 +148,7 @@ static asn_TYPE_member_t asn_MBR_Flag_16P0_1[] = { .tag_mode = 0, .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = asn_DFL_2_set_5, /* DEFAULT 5 */ .name = "field" @@ -176,8 +179,8 @@ asn_TYPE_descriptor_t asn_DEF_Flag_16P0 = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Flag_16P0_tags_1, sizeof(asn_DEF_Flag_16P0_tags_1) @@ -185,6 +188,7 @@ asn_TYPE_descriptor_t asn_DEF_Flag_16P0 = { asn_DEF_Flag_16P0_tags_1, /* Same as above */ sizeof(asn_DEF_Flag_16P0_tags_1) /sizeof(asn_DEF_Flag_16P0_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_Flag_16P0_1, 1, /* Elements count */ @@ -244,8 +248,8 @@ asn_TYPE_descriptor_t asn_DEF_field_7 = { field_7_encode_der, field_7_decode_xer, field_7_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_field_tags_7, sizeof(asn_DEF_field_tags_7) @@ -253,6 +257,7 @@ asn_TYPE_descriptor_t asn_DEF_field_7 = { asn_DEF_field_tags_7, /* Same as above */ sizeof(asn_DEF_field_tags_7) /sizeof(asn_DEF_field_tags_7[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* Defined elsewhere */ &asn_SPC_field_specs_7 /* Additional specs */ @@ -264,6 +269,7 @@ static asn_TYPE_member_t asn_MBR_Flag_16P1_6[] = { .tag_mode = 0, .type = &asn_DEF_field_7, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = asn_DFL_7_set_5, /* DEFAULT 5 */ .name = "field" @@ -294,8 +300,8 @@ asn_TYPE_descriptor_t asn_DEF_Flag_16P1 = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Flag_16P1_tags_6, sizeof(asn_DEF_Flag_16P1_tags_6) @@ -303,6 +309,7 @@ asn_TYPE_descriptor_t asn_DEF_Flag_16P1 = { asn_DEF_Flag_16P1_tags_6, /* Same as above */ sizeof(asn_DEF_Flag_16P1_tags_6) /sizeof(asn_DEF_Flag_16P1_tags_6[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_Flag_16P1_6, 1, /* Elements count */ @@ -356,6 +363,8 @@ IntegerColorFlag_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_Flag_16P0.uper_encoder; td->oer_decoder = asn_DEF_Flag_16P0.oer_decoder; td->oer_encoder = asn_DEF_Flag_16P0.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_Flag_16P0.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_Flag_16P0.per_constraints; td->elements = asn_DEF_Flag_16P0.elements; @@ -423,8 +432,8 @@ asn_TYPE_descriptor_t asn_DEF_IntegerColorFlag = { IntegerColorFlag_encode_der, IntegerColorFlag_decode_xer, IntegerColorFlag_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_IntegerColorFlag_tags_1, sizeof(asn_DEF_IntegerColorFlag_tags_1) @@ -432,6 +441,7 @@ asn_TYPE_descriptor_t asn_DEF_IntegerColorFlag = { asn_DEF_IntegerColorFlag_tags_1, /* Same as above */ sizeof(asn_DEF_IntegerColorFlag_tags_1) /sizeof(asn_DEF_IntegerColorFlag_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* Defined elsewhere */ 0 /* No specifics */ @@ -484,6 +494,8 @@ EnumeratedColorFlag_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_Flag_16P1.uper_encoder; td->oer_decoder = asn_DEF_Flag_16P1.oer_decoder; td->oer_encoder = asn_DEF_Flag_16P1.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_Flag_16P1.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_Flag_16P1.per_constraints; td->elements = asn_DEF_Flag_16P1.elements; @@ -551,8 +563,8 @@ asn_TYPE_descriptor_t asn_DEF_EnumeratedColorFlag = { EnumeratedColorFlag_encode_der, EnumeratedColorFlag_decode_xer, EnumeratedColorFlag_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_EnumeratedColorFlag_tags_1, sizeof(asn_DEF_EnumeratedColorFlag_tags_1) @@ -560,6 +572,7 @@ asn_TYPE_descriptor_t asn_DEF_EnumeratedColorFlag = { asn_DEF_EnumeratedColorFlag_tags_1, /* Same as above */ sizeof(asn_DEF_EnumeratedColorFlag_tags_1) /sizeof(asn_DEF_EnumeratedColorFlag_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* Defined elsewhere */ 0 /* No specifics */ diff --git a/tests/119-per-strings-OK.asn1.-Pgen-PER b/tests/119-per-strings-OK.asn1.-Pgen-PER index f33b65c2..650f9f5d 100644 --- a/tests/119-per-strings-OK.asn1.-Pgen-PER +++ b/tests/119-per-strings-OK.asn1.-Pgen-PER @@ -1187,6 +1187,7 @@ static asn_TYPE_member_t asn_MBR_many_2[] = { .tag_mode = 0, .type = &asn_DEF_PDU, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* No PER visible constraints */ .default_value = 0, .name = "" @@ -1212,9 +1213,9 @@ asn_TYPE_descriptor_t asn_DEF_many_2 = { SEQUENCE_OF_encode_der, SEQUENCE_OF_decode_xer, SEQUENCE_OF_encode_xer, + 0, 0, /* No OER support, use "-gen-OER" to enable */ SEQUENCE_OF_decode_uper, SEQUENCE_OF_encode_uper, - 0, 0, /* No OER support, use "-gen-OER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_many_tags_2, sizeof(asn_DEF_many_tags_2) @@ -1222,6 +1223,7 @@ asn_TYPE_descriptor_t asn_DEF_many_2 = { asn_DEF_many_tags_2, /* Same as above */ sizeof(asn_DEF_many_tags_2) /sizeof(asn_DEF_many_tags_2[0]), /* 2 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_many_2, 1, /* Single element */ @@ -1234,6 +1236,7 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { .tag_mode = 0, .type = &asn_DEF_many_2, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* No PER visible constraints */ .default_value = 0, .name = "many" @@ -1243,6 +1246,7 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_IA5String, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* No PER visible constraints */ .default_value = 0, .name = "ia5" @@ -1252,6 +1256,7 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_IA5String, .memb_constraints = memb_ia5_c_constraint_1, + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = &asn_PER_memb_ia5_c_constr_5, .default_value = 0, .name = "ia5-c" @@ -1261,6 +1266,7 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_IA5String, .memb_constraints = memb_ia5_ce_constraint_1, + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = &asn_PER_memb_ia5_ce_constr_6, .default_value = 0, .name = "ia5-ce" @@ -1270,6 +1276,7 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_IA5String, .memb_constraints = memb_ia5_ir_constraint_1, + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = &asn_PER_memb_ia5_ir_constr_7, .default_value = 0, .name = "ia5-ir" @@ -1279,6 +1286,7 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_VisibleString, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* No PER visible constraints */ .default_value = 0, .name = "vs" @@ -1288,6 +1296,7 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_VisibleString, .memb_constraints = memb_vs_c_constraint_1, + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = &asn_PER_memb_vs_c_constr_9, .default_value = 0, .name = "vs-c" @@ -1297,6 +1306,7 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_VisibleString, .memb_constraints = memb_vs_ce_constraint_1, + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = &asn_PER_memb_vs_ce_constr_10, .default_value = 0, .name = "vs-ce" @@ -1306,6 +1316,7 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_VisibleString, .memb_constraints = memb_vs_ir_constraint_1, + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = &asn_PER_memb_vs_ir_constr_11, .default_value = 0, .name = "vs-ir" @@ -1315,6 +1326,7 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_PrintableString, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* No PER visible constraints */ .default_value = 0, .name = "pr" @@ -1324,6 +1336,7 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_PrintableString, .memb_constraints = memb_pr_c_constraint_1, + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = &asn_PER_memb_pr_c_constr_13, .default_value = 0, .name = "pr-c" @@ -1333,6 +1346,7 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_PrintableString, .memb_constraints = memb_pr_ir_constraint_1, + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = &asn_PER_memb_pr_ir_constr_14, .default_value = 0, .name = "pr-ir" @@ -1342,6 +1356,7 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_NumericString, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* No PER visible constraints */ .default_value = 0, .name = "ns" @@ -1351,6 +1366,7 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_NumericString, .memb_constraints = memb_ns_c_constraint_1, + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = &asn_PER_memb_ns_c_constr_16, .default_value = 0, .name = "ns-c" @@ -1360,6 +1376,7 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_NumericString, .memb_constraints = memb_ns_ce_constraint_1, + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = &asn_PER_memb_ns_ce_constr_17, .default_value = 0, .name = "ns-ce" @@ -1369,6 +1386,7 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_NumericString, .memb_constraints = memb_ns_ir_constraint_1, + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = &asn_PER_memb_ns_ir_constr_18, .default_value = 0, .name = "ns-ir" @@ -1378,6 +1396,7 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_UTF8String, .memb_constraints = memb_ut_c_constraint_1, + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = &asn_PER_memb_ut_c_constr_19, .default_value = 0, .name = "ut-c" @@ -1387,6 +1406,7 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_UTF8String, .memb_constraints = memb_ut_ce_constraint_1, + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = &asn_PER_memb_ut_ce_constr_20, .default_value = 0, .name = "ut-ce" @@ -1396,6 +1416,7 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_UTF8String, .memb_constraints = memb_ut_ir_constraint_1, + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = &asn_PER_memb_ut_ir_constr_21, .default_value = 0, .name = "ut-ir" @@ -1405,6 +1426,7 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_BMPString, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* No PER visible constraints */ .default_value = 0, .name = "bm" @@ -1414,6 +1436,7 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_BMPString, .memb_constraints = memb_bm_c_constraint_1, + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = &asn_PER_memb_bm_c_constr_23, .default_value = 0, .name = "bm-c" @@ -1423,6 +1446,7 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_BMPString, .memb_constraints = memb_bm_cs_constraint_1, + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = &asn_PER_memb_bm_cs_constr_24, .default_value = 0, .name = "bm-cs" @@ -1432,6 +1456,7 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_BMPString, .memb_constraints = memb_bm_ce_constraint_1, + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = &asn_PER_memb_bm_ce_constr_25, .default_value = 0, .name = "bm-ce" @@ -1441,6 +1466,7 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_BMPString, .memb_constraints = memb_bm_ir_constraint_1, + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = &asn_PER_memb_bm_ir_constr_26, .default_value = 0, .name = "bm-ir" @@ -1450,6 +1476,7 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_UniversalString, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* No PER visible constraints */ .default_value = 0, .name = "us" @@ -1459,6 +1486,7 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_UniversalString, .memb_constraints = memb_us_c_constraint_1, + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = &asn_PER_memb_us_c_constr_28, .default_value = 0, .name = "us-c" @@ -1468,6 +1496,7 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_UniversalString, .memb_constraints = memb_us_cs_constraint_1, + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = &asn_PER_memb_us_cs_constr_29, .default_value = 0, .name = "us-cs" @@ -1477,6 +1506,7 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_UniversalString, .memb_constraints = memb_us_ce_constraint_1, + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = &asn_PER_memb_us_ce_constr_30, .default_value = 0, .name = "us-ce" @@ -1486,6 +1516,7 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_UniversalString, .memb_constraints = memb_us_ir_constraint_1, + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = &asn_PER_memb_us_ir_constr_31, .default_value = 0, .name = "us-ir" @@ -1495,6 +1526,7 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_NativeReal, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* No PER visible constraints */ .default_value = 0, .name = "real" @@ -1504,6 +1536,7 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_OBJECT_IDENTIFIER, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* No PER visible constraints */ .default_value = 0, .name = "oid" @@ -1566,9 +1599,9 @@ asn_TYPE_descriptor_t asn_DEF_PDU = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, + 0, 0, /* No OER support, use "-gen-OER" to enable */ SEQUENCE_decode_uper, SEQUENCE_encode_uper, - 0, 0, /* No OER support, use "-gen-OER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_PDU_tags_1, sizeof(asn_DEF_PDU_tags_1) @@ -1576,6 +1609,7 @@ asn_TYPE_descriptor_t asn_DEF_PDU = { asn_DEF_PDU_tags_1, /* Same as above */ sizeof(asn_DEF_PDU_tags_1) /sizeof(asn_DEF_PDU_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_PDU_1, 31, /* Elements count */ diff --git a/tests/125-bitstring-constraint-OK.asn1.-P b/tests/125-bitstring-constraint-OK.asn1.-P index 8e105aeb..930b110e 100644 --- a/tests/125-bitstring-constraint-OK.asn1.-P +++ b/tests/125-bitstring-constraint-OK.asn1.-P @@ -68,6 +68,8 @@ T_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_BIT_STRING.uper_encoder; td->oer_decoder = asn_DEF_BIT_STRING.oer_decoder; td->oer_encoder = asn_DEF_BIT_STRING.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_BIT_STRING.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_BIT_STRING.per_constraints; td->elements = asn_DEF_BIT_STRING.elements; @@ -135,8 +137,8 @@ asn_TYPE_descriptor_t asn_DEF_T = { T_encode_der, T_decode_xer, T_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_T_tags_1, sizeof(asn_DEF_T_tags_1) @@ -144,6 +146,7 @@ asn_TYPE_descriptor_t asn_DEF_T = { asn_DEF_T_tags_1, /* Same as above */ sizeof(asn_DEF_T_tags_1) /sizeof(asn_DEF_T_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* Defined elsewhere */ 0 /* No specifics */ diff --git a/tests/126-per-extensions-OK.asn1.-Pgen-PER b/tests/126-per-extensions-OK.asn1.-Pgen-PER index cb587f8e..abfaeb3f 100644 --- a/tests/126-per-extensions-OK.asn1.-Pgen-PER +++ b/tests/126-per-extensions-OK.asn1.-Pgen-PER @@ -42,6 +42,7 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_IA5String, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* No PER visible constraints */ .default_value = 0, .name = "str-o" @@ -51,6 +52,7 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_IA5String, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* No PER visible constraints */ .default_value = 0, .name = "str-m" @@ -60,6 +62,7 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_Singleton, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* No PER visible constraints */ .default_value = 0, .name = "singl" @@ -69,6 +72,7 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { .tag_mode = +1, /* EXPLICIT tag at current level */ .type = &asn_DEF_PDU_2, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* No PER visible constraints */ .default_value = 0, .name = "pdu-2" @@ -104,9 +108,9 @@ asn_TYPE_descriptor_t asn_DEF_PDU = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, + 0, 0, /* No OER support, use "-gen-OER" to enable */ SEQUENCE_decode_uper, SEQUENCE_encode_uper, - 0, 0, /* No OER support, use "-gen-OER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_PDU_tags_1, sizeof(asn_DEF_PDU_tags_1) @@ -114,6 +118,7 @@ asn_TYPE_descriptor_t asn_DEF_PDU = { asn_DEF_PDU_tags_1, /* Same as above */ sizeof(asn_DEF_PDU_tags_1) /sizeof(asn_DEF_PDU_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_PDU_1, 4, /* Elements count */ @@ -173,6 +178,7 @@ static asn_TYPE_member_t asn_MBR_Singleton_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_IA5String, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* No PER visible constraints */ .default_value = asn_DFL_2_set, /* DEFAULT "z" */ .name = "opt-z" @@ -205,9 +211,9 @@ asn_TYPE_descriptor_t asn_DEF_Singleton = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, + 0, 0, /* No OER support, use "-gen-OER" to enable */ SEQUENCE_decode_uper, SEQUENCE_encode_uper, - 0, 0, /* No OER support, use "-gen-OER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Singleton_tags_1, sizeof(asn_DEF_Singleton_tags_1) @@ -215,6 +221,7 @@ asn_TYPE_descriptor_t asn_DEF_Singleton = { asn_DEF_Singleton_tags_1, /* Same as above */ sizeof(asn_DEF_Singleton_tags_1) /sizeof(asn_DEF_Singleton_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_Singleton_1, 1, /* Elements count */ @@ -275,6 +282,7 @@ static asn_TYPE_member_t asn_MBR_PDU_2_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_NativeInteger, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* No PER visible constraints */ .default_value = 0, .name = "main" @@ -284,6 +292,7 @@ static asn_TYPE_member_t asn_MBR_PDU_2_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_NativeInteger, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* No PER visible constraints */ .default_value = 0, .name = "ext1" @@ -293,6 +302,7 @@ static asn_TYPE_member_t asn_MBR_PDU_2_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_NativeInteger, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* No PER visible constraints */ .default_value = 0, .name = "ext0" @@ -324,14 +334,15 @@ asn_TYPE_descriptor_t asn_DEF_PDU_2 = { CHOICE_encode_der, CHOICE_decode_xer, CHOICE_encode_xer, + 0, 0, /* No OER support, use "-gen-OER" to enable */ CHOICE_decode_uper, CHOICE_encode_uper, - 0, 0, /* No OER support, use "-gen-OER" to enable */ CHOICE_outmost_tag, 0, /* No effective tags (pointer) */ 0, /* No effective tags (count) */ 0, /* No tags (pointer) */ 0, /* No tags (count) */ + 0, /* No OER visible constraints */ &asn_PER_type_PDU_2_constr_1, asn_MBR_PDU_2_1, 3, /* Elements count */ diff --git a/tests/127-per-long-OK.asn1.-Pgen-PER b/tests/127-per-long-OK.asn1.-Pgen-PER index 8fae05f1..8334d949 100644 --- a/tests/127-per-long-OK.asn1.-Pgen-PER +++ b/tests/127-per-long-OK.asn1.-Pgen-PER @@ -57,6 +57,8 @@ unsigned32_4_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_NativeInteger.uper_encoder; td->oer_decoder = asn_DEF_NativeInteger.oer_decoder; td->oer_encoder = asn_DEF_NativeInteger.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_NativeInteger.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -165,6 +167,8 @@ unsplit32_5_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_NativeInteger.uper_encoder; td->oer_decoder = asn_DEF_NativeInteger.oer_decoder; td->oer_encoder = asn_DEF_NativeInteger.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_NativeInteger.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -378,9 +382,9 @@ asn_TYPE_descriptor_t asn_DEF_unsigned32_4 = { unsigned32_4_encode_der, unsigned32_4_decode_xer, unsigned32_4_encode_xer, + 0, 0, /* No OER support, use "-gen-OER" to enable */ unsigned32_4_decode_uper, unsigned32_4_encode_uper, - 0, 0, /* No OER support, use "-gen-OER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_unsigned32_tags_4, sizeof(asn_DEF_unsigned32_tags_4) @@ -388,6 +392,7 @@ asn_TYPE_descriptor_t asn_DEF_unsigned32_4 = { asn_DEF_unsigned32_tags_4, /* Same as above */ sizeof(asn_DEF_unsigned32_tags_4) /sizeof(asn_DEF_unsigned32_tags_4[0]), /* 2 */ + 0, /* No OER visible constraints */ &asn_PER_type_unsigned32_constr_4, 0, 0, /* No members */ &asn_SPC_unsigned32_specs_4 /* Additional specs */ @@ -413,9 +418,9 @@ asn_TYPE_descriptor_t asn_DEF_unsplit32_5 = { unsplit32_5_encode_der, unsplit32_5_decode_xer, unsplit32_5_encode_xer, + 0, 0, /* No OER support, use "-gen-OER" to enable */ unsplit32_5_decode_uper, unsplit32_5_encode_uper, - 0, 0, /* No OER support, use "-gen-OER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_unsplit32_tags_5, sizeof(asn_DEF_unsplit32_tags_5) @@ -423,6 +428,7 @@ asn_TYPE_descriptor_t asn_DEF_unsplit32_5 = { asn_DEF_unsplit32_tags_5, /* Same as above */ sizeof(asn_DEF_unsplit32_tags_5) /sizeof(asn_DEF_unsplit32_tags_5[0]), /* 2 */ + 0, /* No OER visible constraints */ &asn_PER_type_unsplit32_constr_5, 0, 0, /* No members */ &asn_SPC_unsplit32_specs_5 /* Additional specs */ @@ -434,6 +440,7 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_NativeInteger, .memb_constraints = memb_small32range_constraint_1, + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = &asn_PER_memb_small32range_constr_2, .default_value = 0, .name = "small32range" @@ -443,6 +450,7 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_NativeInteger, .memb_constraints = memb_full32range_constraint_1, + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = &asn_PER_memb_full32range_constr_3, .default_value = 0, .name = "full32range" @@ -452,6 +460,7 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_unsigned32_4, .memb_constraints = memb_unsigned32_constraint_1, + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = &asn_PER_memb_unsigned32_constr_4, .default_value = 0, .name = "unsigned32" @@ -461,6 +470,7 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_unsplit32_5, .memb_constraints = memb_unsplit32_constraint_1, + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = &asn_PER_memb_unsplit32_constr_5, .default_value = 0, .name = "unsplit32" @@ -494,9 +504,9 @@ asn_TYPE_descriptor_t asn_DEF_T = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, + 0, 0, /* No OER support, use "-gen-OER" to enable */ SEQUENCE_decode_uper, SEQUENCE_encode_uper, - 0, 0, /* No OER support, use "-gen-OER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_T_tags_1, sizeof(asn_DEF_T_tags_1) @@ -504,6 +514,7 @@ asn_TYPE_descriptor_t asn_DEF_T = { asn_DEF_T_tags_1, /* Same as above */ sizeof(asn_DEF_T_tags_1) /sizeof(asn_DEF_T_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_T_1, 4, /* Elements count */ diff --git a/tests/131-per-empty-OK.asn1.-Pgen-PER b/tests/131-per-empty-OK.asn1.-Pgen-PER index 233b82db..857798dc 100644 --- a/tests/131-per-empty-OK.asn1.-Pgen-PER +++ b/tests/131-per-empty-OK.asn1.-Pgen-PER @@ -39,9 +39,9 @@ asn_TYPE_descriptor_t asn_DEF_T = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, + 0, 0, /* No OER support, use "-gen-OER" to enable */ SEQUENCE_decode_uper, SEQUENCE_encode_uper, - 0, 0, /* No OER support, use "-gen-OER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_T_tags_1, sizeof(asn_DEF_T_tags_1) @@ -49,6 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_T = { asn_DEF_T_tags_1, /* Same as above */ sizeof(asn_DEF_T_tags_1) /sizeof(asn_DEF_T_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ &asn_SPC_T_specs_1 /* Additional specs */ diff --git a/tests/134-per-long-OK.asn1.-Pgen-PER b/tests/134-per-long-OK.asn1.-Pgen-PER index 432bcdb5..051d1bef 100644 --- a/tests/134-per-long-OK.asn1.-Pgen-PER +++ b/tests/134-per-long-OK.asn1.-Pgen-PER @@ -178,6 +178,7 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_INTEGER, .memb_constraints = memb_unsigned33_constraint_1, + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = &asn_PER_memb_unsigned33_constr_2, .default_value = 0, .name = "unsigned33" @@ -187,6 +188,7 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_INTEGER, .memb_constraints = memb_unsigned42_constraint_1, + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = &asn_PER_memb_unsigned42_constr_3, .default_value = 0, .name = "unsigned42" @@ -196,6 +198,7 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_INTEGER, .memb_constraints = memb_signed33_constraint_1, + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = &asn_PER_memb_signed33_constr_4, .default_value = 0, .name = "signed33" @@ -205,6 +208,7 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_INTEGER, .memb_constraints = memb_signed33ext_constraint_1, + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = &asn_PER_memb_signed33ext_constr_5, .default_value = 0, .name = "signed33ext" @@ -238,9 +242,9 @@ asn_TYPE_descriptor_t asn_DEF_T = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, + 0, 0, /* No OER support, use "-gen-OER" to enable */ SEQUENCE_decode_uper, SEQUENCE_encode_uper, - 0, 0, /* No OER support, use "-gen-OER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_T_tags_1, sizeof(asn_DEF_T_tags_1) @@ -248,6 +252,7 @@ asn_TYPE_descriptor_t asn_DEF_T = { asn_DEF_T_tags_1, /* Same as above */ sizeof(asn_DEF_T_tags_1) /sizeof(asn_DEF_T_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_T_1, 4, /* Elements count */ diff --git a/tests/19-param-OK.asn1.-Pfwide-types b/tests/19-param-OK.asn1.-Pfwide-types index e60b7ddb..6fbda3d9 100644 --- a/tests/19-param-OK.asn1.-Pfwide-types +++ b/tests/19-param-OK.asn1.-Pfwide-types @@ -71,6 +71,7 @@ static asn_TYPE_member_t asn_MBR_toBeSigned_2[] = { .tag_mode = 0, .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "version" @@ -80,6 +81,7 @@ static asn_TYPE_member_t asn_MBR_toBeSigned_2[] = { .tag_mode = 0, .type = &asn_DEF_OBJECT_IDENTIFIER, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "signature" @@ -89,6 +91,7 @@ static asn_TYPE_member_t asn_MBR_toBeSigned_2[] = { .tag_mode = 0, .type = &asn_DEF_Name, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "issuer" @@ -122,8 +125,8 @@ asn_TYPE_descriptor_t asn_DEF_toBeSigned_2 = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_toBeSigned_tags_2, sizeof(asn_DEF_toBeSigned_tags_2) @@ -131,6 +134,7 @@ asn_TYPE_descriptor_t asn_DEF_toBeSigned_2 = { asn_DEF_toBeSigned_tags_2, /* Same as above */ sizeof(asn_DEF_toBeSigned_tags_2) /sizeof(asn_DEF_toBeSigned_tags_2[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_toBeSigned_2, 3, /* Elements count */ @@ -143,6 +147,7 @@ static asn_TYPE_member_t asn_MBR_SIGNED_15P0_1[] = { .tag_mode = 0, .type = &asn_DEF_toBeSigned_2, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "toBeSigned" @@ -152,6 +157,7 @@ static asn_TYPE_member_t asn_MBR_SIGNED_15P0_1[] = { .tag_mode = 0, .type = &asn_DEF_OBJECT_IDENTIFIER, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "algorithm" @@ -161,6 +167,7 @@ static asn_TYPE_member_t asn_MBR_SIGNED_15P0_1[] = { .tag_mode = 0, .type = &asn_DEF_BIT_STRING, .memb_constraints = memb_signature_constraint_1, + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "signature" @@ -193,8 +200,8 @@ asn_TYPE_descriptor_t asn_DEF_SIGNED_15P0 = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_SIGNED_15P0_tags_1, sizeof(asn_DEF_SIGNED_15P0_tags_1) @@ -202,6 +209,7 @@ asn_TYPE_descriptor_t asn_DEF_SIGNED_15P0 = { asn_DEF_SIGNED_15P0_tags_1, /* Same as above */ sizeof(asn_DEF_SIGNED_15P0_tags_1) /sizeof(asn_DEF_SIGNED_15P0_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_SIGNED_15P0_1, 3, /* Elements count */ @@ -255,6 +263,8 @@ Certificate_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_SIGNED_15P0.uper_encoder; td->oer_decoder = asn_DEF_SIGNED_15P0.oer_decoder; td->oer_encoder = asn_DEF_SIGNED_15P0.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_SIGNED_15P0.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_SIGNED_15P0.per_constraints; td->elements = asn_DEF_SIGNED_15P0.elements; @@ -322,8 +332,8 @@ asn_TYPE_descriptor_t asn_DEF_Certificate = { Certificate_encode_der, Certificate_decode_xer, Certificate_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Certificate_tags_1, sizeof(asn_DEF_Certificate_tags_1) @@ -331,6 +341,7 @@ asn_TYPE_descriptor_t asn_DEF_Certificate = { asn_DEF_Certificate_tags_1, /* Same as above */ sizeof(asn_DEF_Certificate_tags_1) /sizeof(asn_DEF_Certificate_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* Defined elsewhere */ 0 /* No specifics */ @@ -371,6 +382,7 @@ static asn_TYPE_member_t asn_MBR_Name_1[] = { .tag_mode = 0, .type = &asn_DEF_RelativeDistinguishedName, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "" @@ -394,8 +406,8 @@ asn_TYPE_descriptor_t asn_DEF_Name = { SEQUENCE_OF_encode_der, SEQUENCE_OF_decode_xer, SEQUENCE_OF_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Name_tags_1, sizeof(asn_DEF_Name_tags_1) @@ -403,6 +415,7 @@ asn_TYPE_descriptor_t asn_DEF_Name = { asn_DEF_Name_tags_1, /* Same as above */ sizeof(asn_DEF_Name_tags_1) /sizeof(asn_DEF_Name_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_Name_1, 1, /* Single element */ @@ -492,6 +505,7 @@ static asn_TYPE_member_t asn_MBR_RelativeDistinguishedName_1[] = { .tag_mode = 0, .type = &asn_DEF_IA5String, .memb_constraints = memb_IA5String_constraint_1, + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "" @@ -515,8 +529,8 @@ asn_TYPE_descriptor_t asn_DEF_RelativeDistinguishedName = { SET_OF_encode_der, SET_OF_decode_xer, SET_OF_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_RelativeDistinguishedName_tags_1, sizeof(asn_DEF_RelativeDistinguishedName_tags_1) @@ -524,6 +538,7 @@ asn_TYPE_descriptor_t asn_DEF_RelativeDistinguishedName = { asn_DEF_RelativeDistinguishedName_tags_1, /* Same as above */ sizeof(asn_DEF_RelativeDistinguishedName_tags_1) /sizeof(asn_DEF_RelativeDistinguishedName_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_RelativeDistinguishedName_1, 1, /* Single element */ diff --git a/tests/22-tags-OK.asn1.-Pfwide-types b/tests/22-tags-OK.asn1.-Pfwide-types index 3b46bcbb..acd1fd45 100644 --- a/tests/22-tags-OK.asn1.-Pfwide-types +++ b/tests/22-tags-OK.asn1.-Pfwide-types @@ -47,6 +47,7 @@ static asn_TYPE_member_t asn_MBR_b_3[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "i" @@ -56,6 +57,7 @@ static asn_TYPE_member_t asn_MBR_b_3[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_IA5String, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "n" @@ -86,13 +88,14 @@ asn_TYPE_descriptor_t asn_DEF_b_3 = { CHOICE_encode_der, CHOICE_decode_xer, CHOICE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ CHOICE_outmost_tag, 0, /* No effective tags (pointer) */ 0, /* No effective tags (count) */ 0, /* No tags (pointer) */ 0, /* No tags (count) */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_b_3, 2, /* Elements count */ @@ -105,6 +108,7 @@ static asn_TYPE_member_t asn_MBR_T1_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "a" @@ -114,6 +118,7 @@ static asn_TYPE_member_t asn_MBR_T1_1[] = { .tag_mode = +1, /* EXPLICIT tag at current level */ .type = &asn_DEF_b_3, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "b" @@ -123,6 +128,7 @@ static asn_TYPE_member_t asn_MBR_T1_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_UTF8String, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "c" @@ -155,8 +161,8 @@ asn_TYPE_descriptor_t asn_DEF_T1 = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_T1_tags_1, sizeof(asn_DEF_T1_tags_1) @@ -164,6 +170,7 @@ asn_TYPE_descriptor_t asn_DEF_T1 = { asn_DEF_T1_tags_1, /* Same as above */ sizeof(asn_DEF_T1_tags_1) /sizeof(asn_DEF_T1_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_T1_1, 3, /* Elements count */ diff --git a/tests/30-set-OK.asn1.-Pfwide-types b/tests/30-set-OK.asn1.-Pfwide-types index 887d1c9a..665baa96 100644 --- a/tests/30-set-OK.asn1.-Pfwide-types +++ b/tests/30-set-OK.asn1.-Pfwide-types @@ -49,6 +49,7 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "i" @@ -58,6 +59,7 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { .tag_mode = 0, .type = &asn_DEF_IA5String, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "s" @@ -67,6 +69,7 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_BOOLEAN, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "b" @@ -104,8 +107,8 @@ asn_TYPE_descriptor_t asn_DEF_T = { SET_encode_der, SET_decode_xer, SET_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_T_tags_1, sizeof(asn_DEF_T_tags_1) @@ -113,6 +116,7 @@ asn_TYPE_descriptor_t asn_DEF_T = { asn_DEF_T_tags_1, /* Same as above */ sizeof(asn_DEF_T_tags_1) /sizeof(asn_DEF_T_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_T_1, 3, /* Elements count */ diff --git a/tests/31-set-of-OK.asn1.-Pfwide-types b/tests/31-set-of-OK.asn1.-Pfwide-types index 87077dd2..b6f81ca3 100644 --- a/tests/31-set-of-OK.asn1.-Pfwide-types +++ b/tests/31-set-of-OK.asn1.-Pfwide-types @@ -33,6 +33,7 @@ static asn_TYPE_member_t asn_MBR_Forest_1[] = { .tag_mode = 0, .type = &asn_DEF_Tree, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "" @@ -56,8 +57,8 @@ asn_TYPE_descriptor_t asn_DEF_Forest = { SET_OF_encode_der, SET_OF_decode_xer, SET_OF_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Forest_tags_1, sizeof(asn_DEF_Forest_tags_1) @@ -65,6 +66,7 @@ asn_TYPE_descriptor_t asn_DEF_Forest = { asn_DEF_Forest_tags_1, /* Same as above */ sizeof(asn_DEF_Forest_tags_1) /sizeof(asn_DEF_Forest_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_Forest_1, 1, /* Single element */ @@ -99,6 +101,7 @@ static asn_TYPE_member_t asn_MBR_Tree_1[] = { .tag_mode = 0, .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "height" @@ -108,6 +111,7 @@ static asn_TYPE_member_t asn_MBR_Tree_1[] = { .tag_mode = 0, .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "width" @@ -139,8 +143,8 @@ asn_TYPE_descriptor_t asn_DEF_Tree = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Tree_tags_1, sizeof(asn_DEF_Tree_tags_1) @@ -148,6 +152,7 @@ asn_TYPE_descriptor_t asn_DEF_Tree = { asn_DEF_Tree_tags_1, /* Same as above */ sizeof(asn_DEF_Tree_tags_1) /sizeof(asn_DEF_Tree_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_Tree_1, 2, /* Elements count */ @@ -253,6 +258,7 @@ static asn_TYPE_member_t asn_MBR_trees_2[] = { .tag_mode = 0, .type = &asn_DEF_Forest, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "" @@ -278,8 +284,8 @@ asn_TYPE_descriptor_t asn_DEF_trees_2 = { SET_OF_encode_der, SET_OF_decode_xer, SET_OF_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_trees_tags_2, sizeof(asn_DEF_trees_tags_2) @@ -287,6 +293,7 @@ asn_TYPE_descriptor_t asn_DEF_trees_2 = { asn_DEF_trees_tags_2, /* Same as above */ sizeof(asn_DEF_trees_tags_2) /sizeof(asn_DEF_trees_tags_2[0]), /* 2 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_trees_2, 1, /* Single element */ @@ -299,6 +306,7 @@ static asn_TYPE_member_t asn_MBR_Member_5[] = { .tag_mode = 0, .type = &asn_DEF_BIT_STRING, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "cup-of-coffee" @@ -330,8 +338,8 @@ asn_TYPE_descriptor_t asn_DEF_Member_5 = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Member_tags_5, sizeof(asn_DEF_Member_tags_5) @@ -339,6 +347,7 @@ asn_TYPE_descriptor_t asn_DEF_Member_5 = { asn_DEF_Member_tags_5, /* Same as above */ sizeof(asn_DEF_Member_tags_5) /sizeof(asn_DEF_Member_tags_5[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_Member_5, 1, /* Elements count */ @@ -351,6 +360,7 @@ static asn_TYPE_member_t asn_MBR_anything_4[] = { .tag_mode = 0, .type = &asn_DEF_Member_5, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "" @@ -376,8 +386,8 @@ asn_TYPE_descriptor_t asn_DEF_anything_4 = { SET_OF_encode_der, SET_OF_decode_xer, SET_OF_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_anything_tags_4, sizeof(asn_DEF_anything_tags_4) @@ -385,6 +395,7 @@ asn_TYPE_descriptor_t asn_DEF_anything_4 = { asn_DEF_anything_tags_4, /* Same as above */ sizeof(asn_DEF_anything_tags_4) /sizeof(asn_DEF_anything_tags_4[0]), /* 2 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_anything_4, 1, /* Single element */ @@ -397,6 +408,7 @@ static asn_TYPE_member_t asn_MBR_other_9[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "a" @@ -406,6 +418,7 @@ static asn_TYPE_member_t asn_MBR_other_9[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "b" @@ -436,13 +449,14 @@ asn_TYPE_descriptor_t asn_DEF_other_9 = { CHOICE_encode_der, CHOICE_decode_xer, CHOICE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ CHOICE_outmost_tag, 0, /* No effective tags (pointer) */ 0, /* No effective tags (count) */ 0, /* No tags (pointer) */ 0, /* No tags (count) */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_other_9, 2, /* Elements count */ @@ -455,6 +469,7 @@ static asn_TYPE_member_t asn_MBR_Stuff_1[] = { .tag_mode = 0, .type = &asn_DEF_trees_2, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "trees" @@ -464,6 +479,7 @@ static asn_TYPE_member_t asn_MBR_Stuff_1[] = { .tag_mode = 0, .type = &asn_DEF_anything_4, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "anything" @@ -473,6 +489,7 @@ static asn_TYPE_member_t asn_MBR_Stuff_1[] = { .tag_mode = 0, .type = &asn_DEF_other_9, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "other" @@ -516,8 +533,8 @@ asn_TYPE_descriptor_t asn_DEF_Stuff = { SET_encode_der, SET_decode_xer, SET_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Stuff_tags_1, sizeof(asn_DEF_Stuff_tags_1) @@ -525,6 +542,7 @@ asn_TYPE_descriptor_t asn_DEF_Stuff = { asn_DEF_Stuff_tags_1, /* Same as above */ sizeof(asn_DEF_Stuff_tags_1) /sizeof(asn_DEF_Stuff_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_Stuff_1, 3, /* Elements count */ diff --git a/tests/32-sequence-of-OK.asn1.-P b/tests/32-sequence-of-OK.asn1.-P index 9ed90a1d..447668b2 100644 --- a/tests/32-sequence-of-OK.asn1.-P +++ b/tests/32-sequence-of-OK.asn1.-P @@ -33,6 +33,7 @@ static asn_TYPE_member_t asn_MBR_Programming_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_Fault, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "" @@ -56,8 +57,8 @@ asn_TYPE_descriptor_t asn_DEF_Programming = { SEQUENCE_OF_encode_der, SEQUENCE_OF_decode_xer, SEQUENCE_OF_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Programming_tags_1, sizeof(asn_DEF_Programming_tags_1) @@ -65,6 +66,7 @@ asn_TYPE_descriptor_t asn_DEF_Programming = { asn_DEF_Programming_tags_1, /* Same as above */ sizeof(asn_DEF_Programming_tags_1) /sizeof(asn_DEF_Programming_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_Programming_1, 1, /* Single element */ @@ -106,6 +108,7 @@ static asn_TYPE_member_t asn_MBR_Fault_1[] = { .tag_mode = 0, .type = &asn_DEF_Error, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "" @@ -129,8 +132,8 @@ asn_TYPE_descriptor_t asn_DEF_Fault = { SET_OF_encode_der, SET_OF_decode_xer, SET_OF_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Fault_tags_1, sizeof(asn_DEF_Fault_tags_1) @@ -138,6 +141,7 @@ asn_TYPE_descriptor_t asn_DEF_Fault = { asn_DEF_Fault_tags_1, /* Same as above */ sizeof(asn_DEF_Fault_tags_1) /sizeof(asn_DEF_Fault_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_Fault_1, 1, /* Single element */ @@ -189,8 +193,8 @@ asn_TYPE_descriptor_t asn_DEF_Error = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Error_tags_1, sizeof(asn_DEF_Error_tags_1) @@ -198,6 +202,7 @@ asn_TYPE_descriptor_t asn_DEF_Error = { asn_DEF_Error_tags_1, /* Same as above */ sizeof(asn_DEF_Error_tags_1) /sizeof(asn_DEF_Error_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ &asn_SPC_Error_specs_1 /* Additional specs */ @@ -246,6 +251,7 @@ static asn_TYPE_member_t asn_MBR_seqOfMan_3[] = { .tag_mode = 0, .type = &asn_DEF_Error, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "" @@ -271,8 +277,8 @@ asn_TYPE_descriptor_t asn_DEF_seqOfMan_3 = { SEQUENCE_OF_encode_der, SEQUENCE_OF_decode_xer, SEQUENCE_OF_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_seqOfMan_tags_3, sizeof(asn_DEF_seqOfMan_tags_3) @@ -280,6 +286,7 @@ asn_TYPE_descriptor_t asn_DEF_seqOfMan_3 = { asn_DEF_seqOfMan_tags_3, /* Same as above */ sizeof(asn_DEF_seqOfMan_tags_3) /sizeof(asn_DEF_seqOfMan_tags_3[0]), /* 2 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_seqOfMan_3, 1, /* Single element */ @@ -292,6 +299,7 @@ static asn_TYPE_member_t asn_MBR_SeqWithMandatory_1[] = { .tag_mode = 0, .type = &asn_DEF_UTF8String, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "someString" @@ -301,6 +309,7 @@ static asn_TYPE_member_t asn_MBR_SeqWithMandatory_1[] = { .tag_mode = 0, .type = &asn_DEF_seqOfMan_3, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "seqOfMan" @@ -332,8 +341,8 @@ asn_TYPE_descriptor_t asn_DEF_SeqWithMandatory = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_SeqWithMandatory_tags_1, sizeof(asn_DEF_SeqWithMandatory_tags_1) @@ -341,6 +350,7 @@ asn_TYPE_descriptor_t asn_DEF_SeqWithMandatory = { asn_DEF_SeqWithMandatory_tags_1, /* Same as above */ sizeof(asn_DEF_SeqWithMandatory_tags_1) /sizeof(asn_DEF_SeqWithMandatory_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_SeqWithMandatory_1, 2, /* Elements count */ @@ -390,6 +400,7 @@ static asn_TYPE_member_t asn_MBR_seqOfOpt_3[] = { .tag_mode = 0, .type = &asn_DEF_Error, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "" @@ -415,8 +426,8 @@ asn_TYPE_descriptor_t asn_DEF_seqOfOpt_3 = { SEQUENCE_OF_encode_der, SEQUENCE_OF_decode_xer, SEQUENCE_OF_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_seqOfOpt_tags_3, sizeof(asn_DEF_seqOfOpt_tags_3) @@ -424,6 +435,7 @@ asn_TYPE_descriptor_t asn_DEF_seqOfOpt_3 = { asn_DEF_seqOfOpt_tags_3, /* Same as above */ sizeof(asn_DEF_seqOfOpt_tags_3) /sizeof(asn_DEF_seqOfOpt_tags_3[0]), /* 2 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_seqOfOpt_3, 1, /* Single element */ @@ -436,6 +448,7 @@ static asn_TYPE_member_t asn_MBR_SeqWithOptional_1[] = { .tag_mode = 0, .type = &asn_DEF_UTF8String, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "someString" @@ -445,6 +458,7 @@ static asn_TYPE_member_t asn_MBR_SeqWithOptional_1[] = { .tag_mode = 0, .type = &asn_DEF_seqOfOpt_3, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "seqOfOpt" @@ -476,8 +490,8 @@ asn_TYPE_descriptor_t asn_DEF_SeqWithOptional = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_SeqWithOptional_tags_1, sizeof(asn_DEF_SeqWithOptional_tags_1) @@ -485,6 +499,7 @@ asn_TYPE_descriptor_t asn_DEF_SeqWithOptional = { asn_DEF_SeqWithOptional_tags_1, /* Same as above */ sizeof(asn_DEF_SeqWithOptional_tags_1) /sizeof(asn_DEF_SeqWithOptional_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_SeqWithOptional_1, 2, /* Elements count */ diff --git a/tests/37-indirect-choice-OK.asn1.-Pfwide-types b/tests/37-indirect-choice-OK.asn1.-Pfwide-types index 6fb69e50..7ea04f31 100644 --- a/tests/37-indirect-choice-OK.asn1.-Pfwide-types +++ b/tests/37-indirect-choice-OK.asn1.-Pfwide-types @@ -44,6 +44,7 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { .tag_mode = 0, .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "t-a" @@ -53,6 +54,7 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { .tag_mode = 0, .type = &asn_DEF_OCTET_STRING, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "t-b" @@ -62,6 +64,7 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { .tag_mode = +1, /* EXPLICIT tag at current level */ .type = &asn_DEF_Choice1, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "t-c" @@ -71,6 +74,7 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_Choice2, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "t-d" @@ -102,13 +106,14 @@ asn_TYPE_descriptor_t asn_DEF_T = { CHOICE_encode_der, CHOICE_decode_xer, CHOICE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ CHOICE_outmost_tag, 0, /* No effective tags (pointer) */ 0, /* No effective tags (count) */ 0, /* No tags (pointer) */ 0, /* No tags (count) */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_T_1, 4, /* Elements count */ @@ -155,6 +160,7 @@ static asn_TYPE_member_t asn_MBR_Choice1_1[] = { .tag_mode = 0, .type = &asn_DEF_OCTET_STRING, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "c-a" @@ -164,6 +170,7 @@ static asn_TYPE_member_t asn_MBR_Choice1_1[] = { .tag_mode = 0, .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "c-b" @@ -193,13 +200,14 @@ asn_TYPE_descriptor_t asn_DEF_Choice1 = { CHOICE_encode_der, CHOICE_decode_xer, CHOICE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ CHOICE_outmost_tag, 0, /* No effective tags (pointer) */ 0, /* No effective tags (count) */ 0, /* No tags (pointer) */ 0, /* No tags (count) */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_Choice1_1, 2, /* Elements count */ @@ -251,6 +259,7 @@ static asn_TYPE_member_t asn_MBR_Choice2_1[] = { .tag_mode = 0, .type = &asn_DEF_OCTET_STRING, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "c-a" @@ -260,6 +269,7 @@ static asn_TYPE_member_t asn_MBR_Choice2_1[] = { .tag_mode = 0, .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "c-b" @@ -269,6 +279,7 @@ static asn_TYPE_member_t asn_MBR_Choice2_1[] = { .tag_mode = +1, /* EXPLICIT tag at current level */ .type = &asn_DEF_Choice1, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "c-d" @@ -278,6 +289,7 @@ static asn_TYPE_member_t asn_MBR_Choice2_1[] = { .tag_mode = +1, /* EXPLICIT tag at current level */ .type = &asn_DEF_Choice1, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "c-e" @@ -312,8 +324,8 @@ asn_TYPE_descriptor_t asn_DEF_Choice2 = { CHOICE_encode_der, CHOICE_decode_xer, CHOICE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ CHOICE_outmost_tag, asn_DEF_Choice2_tags_1, sizeof(asn_DEF_Choice2_tags_1) @@ -321,6 +333,7 @@ asn_TYPE_descriptor_t asn_DEF_Choice2 = { asn_DEF_Choice2_tags_1, /* Same as above */ sizeof(asn_DEF_Choice2_tags_1) /sizeof(asn_DEF_Choice2_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_Choice2_1, 4, /* Elements count */ @@ -374,6 +387,8 @@ Choice3_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_Choice2.uper_encoder; td->oer_decoder = asn_DEF_Choice2.oer_decoder; td->oer_encoder = asn_DEF_Choice2.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_Choice2.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_Choice2.per_constraints; td->elements = asn_DEF_Choice2.elements; @@ -442,8 +457,8 @@ asn_TYPE_descriptor_t asn_DEF_Choice3 = { Choice3_encode_der, Choice3_decode_xer, Choice3_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ CHOICE_outmost_tag, asn_DEF_Choice3_tags_1, sizeof(asn_DEF_Choice3_tags_1) @@ -451,6 +466,7 @@ asn_TYPE_descriptor_t asn_DEF_Choice3 = { asn_DEF_Choice3_tags_1, /* Same as above */ sizeof(asn_DEF_Choice3_tags_1) /sizeof(asn_DEF_Choice3_tags_1[0]), /* 2 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* Defined elsewhere */ 0 /* No specifics */ @@ -503,6 +519,8 @@ Choice4_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_Choice2.uper_encoder; td->oer_decoder = asn_DEF_Choice2.oer_decoder; td->oer_encoder = asn_DEF_Choice2.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_Choice2.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_Choice2.per_constraints; td->elements = asn_DEF_Choice2.elements; @@ -571,8 +589,8 @@ asn_TYPE_descriptor_t asn_DEF_Choice4 = { Choice4_encode_der, Choice4_decode_xer, Choice4_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ CHOICE_outmost_tag, asn_DEF_Choice4_tags_1, sizeof(asn_DEF_Choice4_tags_1) @@ -580,6 +598,7 @@ asn_TYPE_descriptor_t asn_DEF_Choice4 = { asn_DEF_Choice4_tags_1, /* Same as above */ sizeof(asn_DEF_Choice4_tags_1) /sizeof(asn_DEF_Choice4_tags_1[0]), /* 2 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* Defined elsewhere */ 0 /* No specifics */ @@ -632,6 +651,8 @@ Choice5_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_Choice2.uper_encoder; td->oer_decoder = asn_DEF_Choice2.oer_decoder; td->oer_encoder = asn_DEF_Choice2.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_Choice2.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_Choice2.per_constraints; td->elements = asn_DEF_Choice2.elements; @@ -699,8 +720,8 @@ asn_TYPE_descriptor_t asn_DEF_Choice5 = { Choice5_encode_der, Choice5_decode_xer, Choice5_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ CHOICE_outmost_tag, asn_DEF_Choice5_tags_1, sizeof(asn_DEF_Choice5_tags_1) @@ -708,6 +729,7 @@ asn_TYPE_descriptor_t asn_DEF_Choice5 = { asn_DEF_Choice5_tags_1, /* Same as above */ sizeof(asn_DEF_Choice5_tags_1) /sizeof(asn_DEF_Choice5_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* Defined elsewhere */ 0 /* No specifics */ @@ -760,6 +782,8 @@ Choice6_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_Choice1.uper_encoder; td->oer_decoder = asn_DEF_Choice1.oer_decoder; td->oer_encoder = asn_DEF_Choice1.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_Choice1.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_Choice1.per_constraints; td->elements = asn_DEF_Choice1.elements; @@ -824,13 +848,14 @@ asn_TYPE_descriptor_t asn_DEF_Choice6 = { Choice6_encode_der, Choice6_decode_xer, Choice6_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ CHOICE_outmost_tag, 0, /* No effective tags (pointer) */ 0, /* No effective tags (count) */ 0, /* No tags (pointer) */ 0, /* No tags (count) */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* Defined elsewhere */ 0 /* No specifics */ diff --git a/tests/39-sequence-of-OK.asn1.-Pfwide-types b/tests/39-sequence-of-OK.asn1.-Pfwide-types index 4b4c82d2..9b1f885e 100644 --- a/tests/39-sequence-of-OK.asn1.-Pfwide-types +++ b/tests/39-sequence-of-OK.asn1.-Pfwide-types @@ -41,6 +41,7 @@ static asn_TYPE_member_t asn_MBR_collection_3[] = { .tag_mode = 0, .type = &asn_DEF_T2, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "" @@ -65,8 +66,8 @@ asn_TYPE_descriptor_t asn_DEF_collection_3 = { SEQUENCE_OF_encode_der, SEQUENCE_OF_decode_xer, SEQUENCE_OF_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_collection_tags_3, sizeof(asn_DEF_collection_tags_3) @@ -74,6 +75,7 @@ asn_TYPE_descriptor_t asn_DEF_collection_3 = { asn_DEF_collection_tags_3, /* Same as above */ sizeof(asn_DEF_collection_tags_3) /sizeof(asn_DEF_collection_tags_3[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_collection_3, 1, /* Single element */ @@ -86,6 +88,7 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { .tag_mode = 0, .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "int" @@ -95,6 +98,7 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { .tag_mode = 0, .type = &asn_DEF_collection_3, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "collection" @@ -126,8 +130,8 @@ asn_TYPE_descriptor_t asn_DEF_T = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_T_tags_1, sizeof(asn_DEF_T_tags_1) @@ -135,6 +139,7 @@ asn_TYPE_descriptor_t asn_DEF_T = { asn_DEF_T_tags_1, /* Same as above */ sizeof(asn_DEF_T_tags_1) /sizeof(asn_DEF_T_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_T_1, 2, /* Elements count */ @@ -170,6 +175,7 @@ static asn_TYPE_member_t asn_MBR_T2_1[] = { .tag_mode = 0, .type = &asn_DEF_BOOLEAN, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "flag" @@ -179,6 +185,7 @@ static asn_TYPE_member_t asn_MBR_T2_1[] = { .tag_mode = 0, .type = &asn_DEF_UTF8String, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "str" @@ -210,8 +217,8 @@ asn_TYPE_descriptor_t asn_DEF_T2 = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_T2_tags_1, sizeof(asn_DEF_T2_tags_1) @@ -219,6 +226,7 @@ asn_TYPE_descriptor_t asn_DEF_T2 = { asn_DEF_T2_tags_1, /* Same as above */ sizeof(asn_DEF_T2_tags_1) /sizeof(asn_DEF_T2_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_T2_1, 2, /* Elements count */ diff --git a/tests/42-real-life-OK.asn1.-PR b/tests/42-real-life-OK.asn1.-PR index a07a81e2..4171f511 100644 --- a/tests/42-real-life-OK.asn1.-PR +++ b/tests/42-real-life-OK.asn1.-PR @@ -74,6 +74,7 @@ static asn_TYPE_member_t asn_MBR_varsets_3[] = { .tag_mode = 0, .type = &asn_DEF_VariablePartSet, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "" @@ -98,8 +99,8 @@ asn_TYPE_descriptor_t asn_DEF_varsets_3 = { SEQUENCE_OF_encode_der, SEQUENCE_OF_decode_xer, SEQUENCE_OF_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_varsets_tags_3, sizeof(asn_DEF_varsets_tags_3) @@ -107,6 +108,7 @@ asn_TYPE_descriptor_t asn_DEF_varsets_3 = { asn_DEF_varsets_tags_3, /* Same as above */ sizeof(asn_DEF_varsets_tags_3) /sizeof(asn_DEF_varsets_tags_3[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_varsets_3, 1, /* Single element */ @@ -119,6 +121,7 @@ static asn_TYPE_member_t asn_MBR_LogLine_1[] = { .tag_mode = 0, .type = &asn_DEF_IA5String, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "line-digest" @@ -128,6 +131,7 @@ static asn_TYPE_member_t asn_MBR_LogLine_1[] = { .tag_mode = 0, .type = &asn_DEF_varsets_3, .memb_constraints = memb_varsets_constraint_1, + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "varsets" @@ -159,8 +163,8 @@ asn_TYPE_descriptor_t asn_DEF_LogLine = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_LogLine_tags_1, sizeof(asn_DEF_LogLine_tags_1) @@ -168,6 +172,7 @@ asn_TYPE_descriptor_t asn_DEF_LogLine = { asn_DEF_LogLine_tags_1, /* Same as above */ sizeof(asn_DEF_LogLine_tags_1) /sizeof(asn_DEF_LogLine_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_LogLine_1, 2, /* Elements count */ @@ -243,6 +248,7 @@ static asn_TYPE_member_t asn_MBR_vparts_2[] = { .tag_mode = 0, .type = &asn_DEF_VariablePart, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "" @@ -267,8 +273,8 @@ asn_TYPE_descriptor_t asn_DEF_vparts_2 = { SEQUENCE_OF_encode_der, SEQUENCE_OF_decode_xer, SEQUENCE_OF_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_vparts_tags_2, sizeof(asn_DEF_vparts_tags_2) @@ -276,6 +282,7 @@ asn_TYPE_descriptor_t asn_DEF_vparts_2 = { asn_DEF_vparts_tags_2, /* Same as above */ sizeof(asn_DEF_vparts_tags_2) /sizeof(asn_DEF_vparts_tags_2[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_vparts_2, 1, /* Single element */ @@ -288,6 +295,7 @@ static asn_TYPE_member_t asn_MBR_VariablePartSet_1[] = { .tag_mode = 0, .type = &asn_DEF_vparts_2, .memb_constraints = memb_vparts_constraint_1, + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "vparts" @@ -297,6 +305,7 @@ static asn_TYPE_member_t asn_MBR_VariablePartSet_1[] = { .tag_mode = 0, .type = &asn_DEF_ActionItem, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "resolution" @@ -328,8 +337,8 @@ asn_TYPE_descriptor_t asn_DEF_VariablePartSet = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_VariablePartSet_tags_1, sizeof(asn_DEF_VariablePartSet_tags_1) @@ -337,6 +346,7 @@ asn_TYPE_descriptor_t asn_DEF_VariablePartSet = { asn_DEF_VariablePartSet_tags_1, /* Same as above */ sizeof(asn_DEF_VariablePartSet_tags_1) /sizeof(asn_DEF_VariablePartSet_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_VariablePartSet_1, 2, /* Elements count */ @@ -435,6 +445,7 @@ static asn_TYPE_member_t asn_MBR_vset_2[] = { .tag_mode = 0, .type = &asn_DEF_VisibleString, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "" @@ -459,8 +470,8 @@ asn_TYPE_descriptor_t asn_DEF_vset_2 = { SET_OF_encode_der, SET_OF_decode_xer, SET_OF_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_vset_tags_2, sizeof(asn_DEF_vset_tags_2) @@ -468,6 +479,7 @@ asn_TYPE_descriptor_t asn_DEF_vset_2 = { asn_DEF_vset_tags_2, /* Same as above */ sizeof(asn_DEF_vset_tags_2) /sizeof(asn_DEF_vset_tags_2[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_vset_2, 1, /* Single element */ @@ -480,6 +492,7 @@ static asn_TYPE_member_t asn_MBR_vrange_4[] = { .tag_mode = 0, .type = &asn_DEF_VisibleString, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "from" @@ -489,6 +502,7 @@ static asn_TYPE_member_t asn_MBR_vrange_4[] = { .tag_mode = 0, .type = &asn_DEF_VisibleString, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "to" @@ -521,8 +535,8 @@ asn_TYPE_descriptor_t asn_DEF_vrange_4 = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_vrange_tags_4, sizeof(asn_DEF_vrange_tags_4) @@ -530,6 +544,7 @@ asn_TYPE_descriptor_t asn_DEF_vrange_4 = { asn_DEF_vrange_tags_4, /* Same as above */ sizeof(asn_DEF_vrange_tags_4) /sizeof(asn_DEF_vrange_tags_4[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_vrange_4, 2, /* Elements count */ @@ -542,6 +557,7 @@ static asn_TYPE_member_t asn_MBR_VariablePart_1[] = { .tag_mode = 0, .type = &asn_DEF_vset_2, .memb_constraints = memb_vset_constraint_1, + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "vset" @@ -551,6 +567,7 @@ static asn_TYPE_member_t asn_MBR_VariablePart_1[] = { .tag_mode = 0, .type = &asn_DEF_vrange_4, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "vrange" @@ -580,13 +597,14 @@ asn_TYPE_descriptor_t asn_DEF_VariablePart = { CHOICE_encode_der, CHOICE_decode_xer, CHOICE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ CHOICE_outmost_tag, 0, /* No effective tags (pointer) */ 0, /* No effective tags (count) */ 0, /* No tags (pointer) */ 0, /* No tags (count) */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_VariablePart_1, 2, /* Elements count */ @@ -675,6 +693,8 @@ accept_as_2_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_NativeEnumerated.uper_encoder; td->oer_decoder = asn_DEF_NativeEnumerated.oer_decoder; td->oer_encoder = asn_DEF_NativeEnumerated.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_NativeEnumerated.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_NativeEnumerated.per_constraints; td->elements = asn_DEF_NativeEnumerated.elements; @@ -764,8 +784,8 @@ asn_TYPE_descriptor_t asn_DEF_accept_as_2 = { accept_as_2_encode_der, accept_as_2_decode_xer, accept_as_2_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_accept_as_tags_2, sizeof(asn_DEF_accept_as_tags_2) @@ -773,6 +793,7 @@ asn_TYPE_descriptor_t asn_DEF_accept_as_2 = { asn_DEF_accept_as_tags_2, /* Same as above */ sizeof(asn_DEF_accept_as_tags_2) /sizeof(asn_DEF_accept_as_tags_2[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* Defined elsewhere */ &asn_SPC_accept_as_specs_2 /* Additional specs */ @@ -784,6 +805,7 @@ static asn_TYPE_member_t asn_MBR_email_9[] = { .tag_mode = 0, .type = &asn_DEF_VisibleString, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "" @@ -808,8 +830,8 @@ asn_TYPE_descriptor_t asn_DEF_email_9 = { SET_OF_encode_der, SET_OF_decode_xer, SET_OF_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_email_tags_9, sizeof(asn_DEF_email_tags_9) @@ -817,6 +839,7 @@ asn_TYPE_descriptor_t asn_DEF_email_9 = { asn_DEF_email_tags_9, /* Same as above */ sizeof(asn_DEF_email_tags_9) /sizeof(asn_DEF_email_tags_9[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_email_9, 1, /* Single element */ @@ -829,6 +852,7 @@ static asn_TYPE_member_t asn_MBR_notify_7[] = { .tag_mode = 0, .type = &asn_DEF_BOOLEAN, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "critical" @@ -838,6 +862,7 @@ static asn_TYPE_member_t asn_MBR_notify_7[] = { .tag_mode = 0, .type = &asn_DEF_email_9, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "email" @@ -870,8 +895,8 @@ asn_TYPE_descriptor_t asn_DEF_notify_7 = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_notify_tags_7, sizeof(asn_DEF_notify_tags_7) @@ -879,6 +904,7 @@ asn_TYPE_descriptor_t asn_DEF_notify_7 = { asn_DEF_notify_tags_7, /* Same as above */ sizeof(asn_DEF_notify_tags_7) /sizeof(asn_DEF_notify_tags_7[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_notify_7, 2, /* Elements count */ @@ -891,6 +917,7 @@ static asn_TYPE_member_t asn_MBR_ActionItem_1[] = { .tag_mode = 0, .type = &asn_DEF_accept_as_2, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "accept-as" @@ -900,6 +927,7 @@ static asn_TYPE_member_t asn_MBR_ActionItem_1[] = { .tag_mode = 0, .type = &asn_DEF_notify_7, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "notify" @@ -931,8 +959,8 @@ asn_TYPE_descriptor_t asn_DEF_ActionItem = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_ActionItem_tags_1, sizeof(asn_DEF_ActionItem_tags_1) @@ -940,6 +968,7 @@ asn_TYPE_descriptor_t asn_DEF_ActionItem = { asn_DEF_ActionItem_tags_1, /* Same as above */ sizeof(asn_DEF_ActionItem_tags_1) /sizeof(asn_DEF_ActionItem_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_ActionItem_1, 2, /* Elements count */ diff --git a/tests/43-recursion-OK.asn1.-Pfwide-types b/tests/43-recursion-OK.asn1.-Pfwide-types index 36b891c6..25b49e35 100644 --- a/tests/43-recursion-OK.asn1.-Pfwide-types +++ b/tests/43-recursion-OK.asn1.-Pfwide-types @@ -50,6 +50,7 @@ static asn_TYPE_member_t asn_MBR_t_member1_2[] = { .tag_mode = 0, .type = &asn_DEF_Test_structure_1, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "" @@ -74,8 +75,8 @@ asn_TYPE_descriptor_t asn_DEF_t_member1_2 = { SET_OF_encode_der, SET_OF_decode_xer, SET_OF_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_t_member1_tags_2, sizeof(asn_DEF_t_member1_tags_2) @@ -83,6 +84,7 @@ asn_TYPE_descriptor_t asn_DEF_t_member1_2 = { asn_DEF_t_member1_tags_2, /* Same as above */ sizeof(asn_DEF_t_member1_tags_2) /sizeof(asn_DEF_t_member1_tags_2[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_t_member1_2, 1, /* Single element */ @@ -95,6 +97,7 @@ static asn_TYPE_member_t asn_MBR_t_member2_4[] = { .tag_mode = 0, .type = &asn_DEF_Test_structure_1, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "" @@ -119,8 +122,8 @@ asn_TYPE_descriptor_t asn_DEF_t_member2_4 = { SEQUENCE_OF_encode_der, SEQUENCE_OF_decode_xer, SEQUENCE_OF_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_t_member2_tags_4, sizeof(asn_DEF_t_member2_tags_4) @@ -128,6 +131,7 @@ asn_TYPE_descriptor_t asn_DEF_t_member2_4 = { asn_DEF_t_member2_tags_4, /* Same as above */ sizeof(asn_DEF_t_member2_tags_4) /sizeof(asn_DEF_t_member2_tags_4[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_t_member2_4, 1, /* Single element */ @@ -140,6 +144,7 @@ static asn_TYPE_member_t asn_MBR_Test_structure_1_1[] = { .tag_mode = 0, .type = &asn_DEF_t_member1_2, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "t-member1" @@ -149,6 +154,7 @@ static asn_TYPE_member_t asn_MBR_Test_structure_1_1[] = { .tag_mode = 0, .type = &asn_DEF_t_member2_4, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "t-member2" @@ -158,6 +164,7 @@ static asn_TYPE_member_t asn_MBR_Test_structure_1_1[] = { .tag_mode = 0, .type = &asn_DEF_Test_structure_1, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "t-member3" @@ -167,6 +174,7 @@ static asn_TYPE_member_t asn_MBR_Test_structure_1_1[] = { .tag_mode = 0, .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "t-member4" @@ -200,8 +208,8 @@ asn_TYPE_descriptor_t asn_DEF_Test_structure_1 = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Test_structure_1_tags_1, sizeof(asn_DEF_Test_structure_1_tags_1) @@ -209,6 +217,7 @@ asn_TYPE_descriptor_t asn_DEF_Test_structure_1 = { asn_DEF_Test_structure_1_tags_1, /* Same as above */ sizeof(asn_DEF_Test_structure_1_tags_1) /sizeof(asn_DEF_Test_structure_1_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_Test_structure_1_1, 4, /* Elements count */ @@ -273,6 +282,7 @@ static asn_TYPE_member_t asn_MBR_or_3[] = { .tag_mode = 0, .type = &asn_DEF_Choice_1, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "" @@ -298,8 +308,8 @@ asn_TYPE_descriptor_t asn_DEF_or_3 = { SET_OF_encode_der, SET_OF_decode_xer, SET_OF_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_or_tags_3, sizeof(asn_DEF_or_tags_3) @@ -307,6 +317,7 @@ asn_TYPE_descriptor_t asn_DEF_or_3 = { asn_DEF_or_tags_3, /* Same as above */ sizeof(asn_DEF_or_tags_3) /sizeof(asn_DEF_or_tags_3[0]), /* 2 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_or_3, 1, /* Single element */ @@ -319,6 +330,7 @@ static asn_TYPE_member_t asn_MBR_Choice_1_1[] = { .tag_mode = +1, /* EXPLICIT tag at current level */ .type = &asn_DEF_Choice_1, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "and" @@ -328,6 +340,7 @@ static asn_TYPE_member_t asn_MBR_Choice_1_1[] = { .tag_mode = 0, .type = &asn_DEF_or_3, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "or" @@ -337,6 +350,7 @@ static asn_TYPE_member_t asn_MBR_Choice_1_1[] = { .tag_mode = +1, /* EXPLICIT tag at current level */ .type = &asn_DEF_Choice_1, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "not" @@ -346,6 +360,7 @@ static asn_TYPE_member_t asn_MBR_Choice_1_1[] = { .tag_mode = +1, /* EXPLICIT tag at current level */ .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "other" @@ -377,13 +392,14 @@ asn_TYPE_descriptor_t asn_DEF_Choice_1 = { CHOICE_encode_der, CHOICE_decode_xer, CHOICE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ CHOICE_outmost_tag, 0, /* No effective tags (pointer) */ 0, /* No effective tags (count) */ 0, /* No tags (pointer) */ 0, /* No tags (count) */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_Choice_1_1, 4, /* Elements count */ @@ -438,6 +454,7 @@ static asn_TYPE_member_t asn_MBR_Test_structure_2_1[] = { .tag_mode = 0, .type = &asn_DEF_Test_structure_3, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "m1" @@ -473,8 +490,8 @@ asn_TYPE_descriptor_t asn_DEF_Test_structure_2 = { SET_encode_der, SET_decode_xer, SET_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Test_structure_2_tags_1, sizeof(asn_DEF_Test_structure_2_tags_1) @@ -482,6 +499,7 @@ asn_TYPE_descriptor_t asn_DEF_Test_structure_2 = { asn_DEF_Test_structure_2_tags_1, /* Same as above */ sizeof(asn_DEF_Test_structure_2_tags_1) /sizeof(asn_DEF_Test_structure_2_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_Test_structure_2_1, 1, /* Elements count */ @@ -536,6 +554,7 @@ static asn_TYPE_member_t asn_MBR_Test_structure_3_1[] = { .tag_mode = 0, .type = &asn_DEF_Test_structure_2, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "m1" @@ -571,8 +590,8 @@ asn_TYPE_descriptor_t asn_DEF_Test_structure_3 = { SET_encode_der, SET_decode_xer, SET_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Test_structure_3_tags_1, sizeof(asn_DEF_Test_structure_3_tags_1) @@ -580,6 +599,7 @@ asn_TYPE_descriptor_t asn_DEF_Test_structure_3 = { asn_DEF_Test_structure_3_tags_1, /* Same as above */ sizeof(asn_DEF_Test_structure_3_tags_1) /sizeof(asn_DEF_Test_structure_3_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_Test_structure_3_1, 1, /* Elements count */ diff --git a/tests/44-choice-in-sequence-OK.asn1.-P b/tests/44-choice-in-sequence-OK.asn1.-P index 3d9b08cf..785f4116 100644 --- a/tests/44-choice-in-sequence-OK.asn1.-P +++ b/tests/44-choice-in-sequence-OK.asn1.-P @@ -76,6 +76,7 @@ static asn_TYPE_member_t asn_MBR_e_6[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_NULL, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "f" @@ -85,6 +86,7 @@ static asn_TYPE_member_t asn_MBR_e_6[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_NULL, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "g" @@ -115,13 +117,14 @@ asn_TYPE_descriptor_t asn_DEF_e_6 = { CHOICE_encode_der, CHOICE_decode_xer, CHOICE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ CHOICE_outmost_tag, 0, /* No effective tags (pointer) */ 0, /* No effective tags (count) */ 0, /* No tags (pointer) */ 0, /* No tags (count) */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_e_6, 2, /* Elements count */ @@ -134,6 +137,7 @@ static asn_TYPE_member_t asn_MBR_h_9[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_NULL, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "i" @@ -143,6 +147,7 @@ static asn_TYPE_member_t asn_MBR_h_9[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_NULL, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "j" @@ -173,13 +178,14 @@ asn_TYPE_descriptor_t asn_DEF_h_9 = { CHOICE_encode_der, CHOICE_decode_xer, CHOICE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ CHOICE_outmost_tag, 0, /* No effective tags (pointer) */ 0, /* No effective tags (count) */ 0, /* No tags (pointer) */ 0, /* No tags (count) */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_h_9, 2, /* Elements count */ @@ -192,6 +198,7 @@ static asn_TYPE_member_t asn_MBR_b_3[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_NULL, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "c" @@ -201,6 +208,7 @@ static asn_TYPE_member_t asn_MBR_b_3[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_NULL, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "d" @@ -210,6 +218,7 @@ static asn_TYPE_member_t asn_MBR_b_3[] = { .tag_mode = 0, .type = &asn_DEF_e_6, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "e" @@ -219,6 +228,7 @@ static asn_TYPE_member_t asn_MBR_b_3[] = { .tag_mode = +1, /* EXPLICIT tag at current level */ .type = &asn_DEF_h_9, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "h" @@ -252,13 +262,14 @@ asn_TYPE_descriptor_t asn_DEF_b_3 = { CHOICE_encode_der, CHOICE_decode_xer, CHOICE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ CHOICE_outmost_tag, 0, /* No effective tags (pointer) */ 0, /* No effective tags (count) */ 0, /* No tags (pointer) */ 0, /* No tags (count) */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_b_3, 4, /* Elements count */ @@ -271,6 +282,7 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_NULL, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "a" @@ -280,6 +292,7 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { .tag_mode = 0, .type = &asn_DEF_b_3, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "b" @@ -316,8 +329,8 @@ asn_TYPE_descriptor_t asn_DEF_T = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_T_tags_1, sizeof(asn_DEF_T_tags_1) @@ -325,6 +338,7 @@ asn_TYPE_descriptor_t asn_DEF_T = { asn_DEF_T_tags_1, /* Same as above */ sizeof(asn_DEF_T_tags_1) /sizeof(asn_DEF_T_tags_1[0]), /* 2 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_T_1, 2, /* Elements count */ diff --git a/tests/46-redefine-OK.asn1.-PR b/tests/46-redefine-OK.asn1.-PR index 694e259e..b4aec3d8 100644 --- a/tests/46-redefine-OK.asn1.-PR +++ b/tests/46-redefine-OK.asn1.-PR @@ -45,6 +45,8 @@ PrimitiveType_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_OCTET_STRING.uper_encoder; td->oer_decoder = asn_DEF_OCTET_STRING.oer_decoder; td->oer_encoder = asn_DEF_OCTET_STRING.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_OCTET_STRING.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_OCTET_STRING.per_constraints; td->elements = asn_DEF_OCTET_STRING.elements; @@ -112,8 +114,8 @@ asn_TYPE_descriptor_t asn_DEF_PrimitiveType = { PrimitiveType_encode_der, PrimitiveType_decode_xer, PrimitiveType_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_PrimitiveType_tags_1, sizeof(asn_DEF_PrimitiveType_tags_1) @@ -121,6 +123,7 @@ asn_TYPE_descriptor_t asn_DEF_PrimitiveType = { asn_DEF_PrimitiveType_tags_1, /* Same as above */ sizeof(asn_DEF_PrimitiveType_tags_1) /sizeof(asn_DEF_PrimitiveType_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -153,6 +156,7 @@ static asn_TYPE_member_t asn_MBR_ConstructedType_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_PrimitiveType, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "field" @@ -183,8 +187,8 @@ asn_TYPE_descriptor_t asn_DEF_ConstructedType = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_ConstructedType_tags_1, sizeof(asn_DEF_ConstructedType_tags_1) @@ -192,6 +196,7 @@ asn_TYPE_descriptor_t asn_DEF_ConstructedType = { asn_DEF_ConstructedType_tags_1, /* Same as above */ sizeof(asn_DEF_ConstructedType_tags_1) /sizeof(asn_DEF_ConstructedType_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_ConstructedType_1, 1, /* Elements count */ @@ -245,6 +250,8 @@ T_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_ConstructedType.uper_encoder; td->oer_decoder = asn_DEF_ConstructedType.oer_decoder; td->oer_encoder = asn_DEF_ConstructedType.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_ConstructedType.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_ConstructedType.per_constraints; td->elements = asn_DEF_ConstructedType.elements; @@ -313,8 +320,8 @@ asn_TYPE_descriptor_t asn_DEF_T = { T_encode_der, T_decode_xer, T_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_T_tags_1, sizeof(asn_DEF_T_tags_1) @@ -322,6 +329,7 @@ asn_TYPE_descriptor_t asn_DEF_T = { asn_DEF_T_tags_1, /* Same as above */ sizeof(asn_DEF_T_tags_1) /sizeof(asn_DEF_T_tags_1[0]), /* 2 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* Defined elsewhere */ 0 /* No specifics */ diff --git a/tests/47-set-ext-OK.asn1.-Pfwide-types b/tests/47-set-ext-OK.asn1.-Pfwide-types index b6858814..15b07444 100644 --- a/tests/47-set-ext-OK.asn1.-Pfwide-types +++ b/tests/47-set-ext-OK.asn1.-Pfwide-types @@ -43,6 +43,7 @@ static asn_TYPE_member_t asn_MBR_T1_1[] = { .tag_mode = 0, .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "i" @@ -78,8 +79,8 @@ asn_TYPE_descriptor_t asn_DEF_T1 = { SET_encode_der, SET_decode_xer, SET_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_T1_tags_1, sizeof(asn_DEF_T1_tags_1) @@ -87,6 +88,7 @@ asn_TYPE_descriptor_t asn_DEF_T1 = { asn_DEF_T1_tags_1, /* Same as above */ sizeof(asn_DEF_T1_tags_1) /sizeof(asn_DEF_T1_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_T1_1, 1, /* Elements count */ @@ -138,6 +140,7 @@ static asn_TYPE_member_t asn_MBR_T2_1[] = { .tag_mode = 0, .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "i" @@ -173,8 +176,8 @@ asn_TYPE_descriptor_t asn_DEF_T2 = { SET_encode_der, SET_decode_xer, SET_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_T2_tags_1, sizeof(asn_DEF_T2_tags_1) @@ -182,6 +185,7 @@ asn_TYPE_descriptor_t asn_DEF_T2 = { asn_DEF_T2_tags_1, /* Same as above */ sizeof(asn_DEF_T2_tags_1) /sizeof(asn_DEF_T2_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_T2_1, 1, /* Elements count */ @@ -231,6 +235,7 @@ static asn_TYPE_member_t asn_MBR_T3_1[] = { .tag_mode = 0, .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "i" @@ -259,13 +264,14 @@ asn_TYPE_descriptor_t asn_DEF_T3 = { CHOICE_encode_der, CHOICE_decode_xer, CHOICE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ CHOICE_outmost_tag, 0, /* No effective tags (pointer) */ 0, /* No effective tags (count) */ 0, /* No tags (pointer) */ 0, /* No tags (count) */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_T3_1, 1, /* Elements count */ @@ -315,6 +321,7 @@ static asn_TYPE_member_t asn_MBR_T4_1[] = { .tag_mode = 0, .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "i" @@ -343,13 +350,14 @@ asn_TYPE_descriptor_t asn_DEF_T4 = { CHOICE_encode_der, CHOICE_decode_xer, CHOICE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ CHOICE_outmost_tag, 0, /* No effective tags (pointer) */ 0, /* No effective tags (count) */ 0, /* No tags (pointer) */ 0, /* No tags (count) */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_T4_1, 1, /* Elements count */ diff --git a/tests/50-constraint-OK.asn1.-Pfwide-types b/tests/50-constraint-OK.asn1.-Pfwide-types index 75b3698e..d17d448a 100644 --- a/tests/50-constraint-OK.asn1.-Pfwide-types +++ b/tests/50-constraint-OK.asn1.-Pfwide-types @@ -45,6 +45,8 @@ Int1_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_INTEGER.uper_encoder; td->oer_decoder = asn_DEF_INTEGER.oer_decoder; td->oer_encoder = asn_DEF_INTEGER.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_INTEGER.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_INTEGER.per_constraints; td->elements = asn_DEF_INTEGER.elements; @@ -112,8 +114,8 @@ asn_TYPE_descriptor_t asn_DEF_Int1 = { Int1_encode_der, Int1_decode_xer, Int1_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Int1_tags_1, sizeof(asn_DEF_Int1_tags_1) @@ -121,6 +123,7 @@ asn_TYPE_descriptor_t asn_DEF_Int1 = { asn_DEF_Int1_tags_1, /* Same as above */ sizeof(asn_DEF_Int1_tags_1) /sizeof(asn_DEF_Int1_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -192,6 +195,8 @@ Int2_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_Int1.uper_encoder; td->oer_decoder = asn_DEF_Int1.oer_decoder; td->oer_encoder = asn_DEF_Int1.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_Int1.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_Int1.per_constraints; td->elements = asn_DEF_Int1.elements; @@ -259,8 +264,8 @@ asn_TYPE_descriptor_t asn_DEF_Int2 = { Int2_encode_der, Int2_decode_xer, Int2_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Int2_tags_1, sizeof(asn_DEF_Int2_tags_1) @@ -268,6 +273,7 @@ asn_TYPE_descriptor_t asn_DEF_Int2 = { asn_DEF_Int2_tags_1, /* Same as above */ sizeof(asn_DEF_Int2_tags_1) /sizeof(asn_DEF_Int2_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -343,6 +349,8 @@ Int3_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_Int2.uper_encoder; td->oer_decoder = asn_DEF_Int2.oer_decoder; td->oer_encoder = asn_DEF_Int2.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_Int2.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_Int2.per_constraints; td->elements = asn_DEF_Int2.elements; @@ -410,8 +418,8 @@ asn_TYPE_descriptor_t asn_DEF_Int3 = { Int3_encode_der, Int3_decode_xer, Int3_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Int3_tags_1, sizeof(asn_DEF_Int3_tags_1) @@ -419,6 +427,7 @@ asn_TYPE_descriptor_t asn_DEF_Int3 = { asn_DEF_Int3_tags_1, /* Same as above */ sizeof(asn_DEF_Int3_tags_1) /sizeof(asn_DEF_Int3_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -494,6 +503,8 @@ Int4_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_Int3.uper_encoder; td->oer_decoder = asn_DEF_Int3.oer_decoder; td->oer_encoder = asn_DEF_Int3.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_Int3.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_Int3.per_constraints; td->elements = asn_DEF_Int3.elements; @@ -561,8 +572,8 @@ asn_TYPE_descriptor_t asn_DEF_Int4 = { Int4_encode_der, Int4_decode_xer, Int4_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Int4_tags_1, sizeof(asn_DEF_Int4_tags_1) @@ -570,6 +581,7 @@ asn_TYPE_descriptor_t asn_DEF_Int4 = { asn_DEF_Int4_tags_1, /* Same as above */ sizeof(asn_DEF_Int4_tags_1) /sizeof(asn_DEF_Int4_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -645,6 +657,8 @@ Int5_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_Int4.uper_encoder; td->oer_decoder = asn_DEF_Int4.oer_decoder; td->oer_encoder = asn_DEF_Int4.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_Int4.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_Int4.per_constraints; td->elements = asn_DEF_Int4.elements; @@ -712,8 +726,8 @@ asn_TYPE_descriptor_t asn_DEF_Int5 = { Int5_encode_der, Int5_decode_xer, Int5_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Int5_tags_1, sizeof(asn_DEF_Int5_tags_1) @@ -721,6 +735,7 @@ asn_TYPE_descriptor_t asn_DEF_Int5 = { asn_DEF_Int5_tags_1, /* Same as above */ sizeof(asn_DEF_Int5_tags_1) /sizeof(asn_DEF_Int5_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -796,6 +811,8 @@ ExtensibleExtensions_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_INTEGER.uper_encoder; td->oer_decoder = asn_DEF_INTEGER.oer_decoder; td->oer_encoder = asn_DEF_INTEGER.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_INTEGER.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_INTEGER.per_constraints; td->elements = asn_DEF_INTEGER.elements; @@ -863,8 +880,8 @@ asn_TYPE_descriptor_t asn_DEF_ExtensibleExtensions = { ExtensibleExtensions_encode_der, ExtensibleExtensions_decode_xer, ExtensibleExtensions_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_ExtensibleExtensions_tags_1, sizeof(asn_DEF_ExtensibleExtensions_tags_1) @@ -872,6 +889,7 @@ asn_TYPE_descriptor_t asn_DEF_ExtensibleExtensions = { asn_DEF_ExtensibleExtensions_tags_1, /* Same as above */ sizeof(asn_DEF_ExtensibleExtensions_tags_1) /sizeof(asn_DEF_ExtensibleExtensions_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -924,6 +942,8 @@ Str1_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_IA5String.uper_encoder; td->oer_decoder = asn_DEF_IA5String.oer_decoder; td->oer_encoder = asn_DEF_IA5String.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_IA5String.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_IA5String.per_constraints; td->elements = asn_DEF_IA5String.elements; @@ -991,8 +1011,8 @@ asn_TYPE_descriptor_t asn_DEF_Str1 = { Str1_encode_der, Str1_decode_xer, Str1_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Str1_tags_1, sizeof(asn_DEF_Str1_tags_1) @@ -1000,6 +1020,7 @@ asn_TYPE_descriptor_t asn_DEF_Str1 = { asn_DEF_Str1_tags_1, /* Same as above */ sizeof(asn_DEF_Str1_tags_1) /sizeof(asn_DEF_Str1_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -1087,6 +1108,8 @@ Str2_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_Str1.uper_encoder; td->oer_decoder = asn_DEF_Str1.oer_decoder; td->oer_encoder = asn_DEF_Str1.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_Str1.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_Str1.per_constraints; td->elements = asn_DEF_Str1.elements; @@ -1154,8 +1177,8 @@ asn_TYPE_descriptor_t asn_DEF_Str2 = { Str2_encode_der, Str2_decode_xer, Str2_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Str2_tags_1, sizeof(asn_DEF_Str2_tags_1) @@ -1163,6 +1186,7 @@ asn_TYPE_descriptor_t asn_DEF_Str2 = { asn_DEF_Str2_tags_1, /* Same as above */ sizeof(asn_DEF_Str2_tags_1) /sizeof(asn_DEF_Str2_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -1261,6 +1285,8 @@ Str3_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_Str2.uper_encoder; td->oer_decoder = asn_DEF_Str2.oer_decoder; td->oer_encoder = asn_DEF_Str2.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_Str2.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_Str2.per_constraints; td->elements = asn_DEF_Str2.elements; @@ -1328,8 +1354,8 @@ asn_TYPE_descriptor_t asn_DEF_Str3 = { Str3_encode_der, Str3_decode_xer, Str3_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Str3_tags_1, sizeof(asn_DEF_Str3_tags_1) @@ -1337,6 +1363,7 @@ asn_TYPE_descriptor_t asn_DEF_Str3 = { asn_DEF_Str3_tags_1, /* Same as above */ sizeof(asn_DEF_Str3_tags_1) /sizeof(asn_DEF_Str3_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -1421,6 +1448,8 @@ Str4_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_IA5String.uper_encoder; td->oer_decoder = asn_DEF_IA5String.oer_decoder; td->oer_encoder = asn_DEF_IA5String.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_IA5String.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_IA5String.per_constraints; td->elements = asn_DEF_IA5String.elements; @@ -1488,8 +1517,8 @@ asn_TYPE_descriptor_t asn_DEF_Str4 = { Str4_encode_der, Str4_decode_xer, Str4_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Str4_tags_1, sizeof(asn_DEF_Str4_tags_1) @@ -1497,6 +1526,7 @@ asn_TYPE_descriptor_t asn_DEF_Str4 = { asn_DEF_Str4_tags_1, /* Same as above */ sizeof(asn_DEF_Str4_tags_1) /sizeof(asn_DEF_Str4_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -1581,6 +1611,8 @@ PER_Visible_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_IA5String.uper_encoder; td->oer_decoder = asn_DEF_IA5String.oer_decoder; td->oer_encoder = asn_DEF_IA5String.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_IA5String.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_IA5String.per_constraints; td->elements = asn_DEF_IA5String.elements; @@ -1648,8 +1680,8 @@ asn_TYPE_descriptor_t asn_DEF_PER_Visible = { PER_Visible_encode_der, PER_Visible_decode_xer, PER_Visible_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_PER_Visible_tags_1, sizeof(asn_DEF_PER_Visible_tags_1) @@ -1657,6 +1689,7 @@ asn_TYPE_descriptor_t asn_DEF_PER_Visible = { asn_DEF_PER_Visible_tags_1, /* Same as above */ sizeof(asn_DEF_PER_Visible_tags_1) /sizeof(asn_DEF_PER_Visible_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -1741,6 +1774,8 @@ PER_Visible_2_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_PER_Visible.uper_encoder; td->oer_decoder = asn_DEF_PER_Visible.oer_decoder; td->oer_encoder = asn_DEF_PER_Visible.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_PER_Visible.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_PER_Visible.per_constraints; td->elements = asn_DEF_PER_Visible.elements; @@ -1808,8 +1843,8 @@ asn_TYPE_descriptor_t asn_DEF_PER_Visible_2 = { PER_Visible_2_encode_der, PER_Visible_2_decode_xer, PER_Visible_2_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_PER_Visible_2_tags_1, sizeof(asn_DEF_PER_Visible_2_tags_1) @@ -1817,6 +1852,7 @@ asn_TYPE_descriptor_t asn_DEF_PER_Visible_2 = { asn_DEF_PER_Visible_2_tags_1, /* Same as above */ sizeof(asn_DEF_PER_Visible_2_tags_1) /sizeof(asn_DEF_PER_Visible_2_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -1901,6 +1937,8 @@ Not_PER_Visible_1_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_PER_Visible.uper_encoder; td->oer_decoder = asn_DEF_PER_Visible.oer_decoder; td->oer_encoder = asn_DEF_PER_Visible.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_PER_Visible.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_PER_Visible.per_constraints; td->elements = asn_DEF_PER_Visible.elements; @@ -1968,8 +2006,8 @@ asn_TYPE_descriptor_t asn_DEF_Not_PER_Visible_1 = { Not_PER_Visible_1_encode_der, Not_PER_Visible_1_decode_xer, Not_PER_Visible_1_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Not_PER_Visible_1_tags_1, sizeof(asn_DEF_Not_PER_Visible_1_tags_1) @@ -1977,6 +2015,7 @@ asn_TYPE_descriptor_t asn_DEF_Not_PER_Visible_1 = { asn_DEF_Not_PER_Visible_1_tags_1, /* Same as above */ sizeof(asn_DEF_Not_PER_Visible_1_tags_1) /sizeof(asn_DEF_Not_PER_Visible_1_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -2061,6 +2100,8 @@ Not_PER_Visible_2_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_PER_Visible.uper_encoder; td->oer_decoder = asn_DEF_PER_Visible.oer_decoder; td->oer_encoder = asn_DEF_PER_Visible.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_PER_Visible.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_PER_Visible.per_constraints; td->elements = asn_DEF_PER_Visible.elements; @@ -2128,8 +2169,8 @@ asn_TYPE_descriptor_t asn_DEF_Not_PER_Visible_2 = { Not_PER_Visible_2_encode_der, Not_PER_Visible_2_decode_xer, Not_PER_Visible_2_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Not_PER_Visible_2_tags_1, sizeof(asn_DEF_Not_PER_Visible_2_tags_1) @@ -2137,6 +2178,7 @@ asn_TYPE_descriptor_t asn_DEF_Not_PER_Visible_2 = { asn_DEF_Not_PER_Visible_2_tags_1, /* Same as above */ sizeof(asn_DEF_Not_PER_Visible_2_tags_1) /sizeof(asn_DEF_Not_PER_Visible_2_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -2221,6 +2263,8 @@ Not_PER_Visible_3_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_PER_Visible.uper_encoder; td->oer_decoder = asn_DEF_PER_Visible.oer_decoder; td->oer_encoder = asn_DEF_PER_Visible.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_PER_Visible.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_PER_Visible.per_constraints; td->elements = asn_DEF_PER_Visible.elements; @@ -2288,8 +2332,8 @@ asn_TYPE_descriptor_t asn_DEF_Not_PER_Visible_3 = { Not_PER_Visible_3_encode_der, Not_PER_Visible_3_decode_xer, Not_PER_Visible_3_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Not_PER_Visible_3_tags_1, sizeof(asn_DEF_Not_PER_Visible_3_tags_1) @@ -2297,6 +2341,7 @@ asn_TYPE_descriptor_t asn_DEF_Not_PER_Visible_3 = { asn_DEF_Not_PER_Visible_3_tags_1, /* Same as above */ sizeof(asn_DEF_Not_PER_Visible_3_tags_1) /sizeof(asn_DEF_Not_PER_Visible_3_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -2384,6 +2429,8 @@ SIZE_but_not_FROM_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_PER_Visible.uper_encoder; td->oer_decoder = asn_DEF_PER_Visible.oer_decoder; td->oer_encoder = asn_DEF_PER_Visible.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_PER_Visible.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_PER_Visible.per_constraints; td->elements = asn_DEF_PER_Visible.elements; @@ -2451,8 +2498,8 @@ asn_TYPE_descriptor_t asn_DEF_SIZE_but_not_FROM = { SIZE_but_not_FROM_encode_der, SIZE_but_not_FROM_decode_xer, SIZE_but_not_FROM_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_SIZE_but_not_FROM_tags_1, sizeof(asn_DEF_SIZE_but_not_FROM_tags_1) @@ -2460,6 +2507,7 @@ asn_TYPE_descriptor_t asn_DEF_SIZE_but_not_FROM = { asn_DEF_SIZE_but_not_FROM_tags_1, /* Same as above */ sizeof(asn_DEF_SIZE_but_not_FROM_tags_1) /sizeof(asn_DEF_SIZE_but_not_FROM_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -2547,6 +2595,8 @@ SIZE_and_FROM_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_PER_Visible.uper_encoder; td->oer_decoder = asn_DEF_PER_Visible.oer_decoder; td->oer_encoder = asn_DEF_PER_Visible.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_PER_Visible.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_PER_Visible.per_constraints; td->elements = asn_DEF_PER_Visible.elements; @@ -2614,8 +2664,8 @@ asn_TYPE_descriptor_t asn_DEF_SIZE_and_FROM = { SIZE_and_FROM_encode_der, SIZE_and_FROM_decode_xer, SIZE_and_FROM_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_SIZE_and_FROM_tags_1, sizeof(asn_DEF_SIZE_and_FROM_tags_1) @@ -2623,6 +2673,7 @@ asn_TYPE_descriptor_t asn_DEF_SIZE_and_FROM = { asn_DEF_SIZE_and_FROM_tags_1, /* Same as above */ sizeof(asn_DEF_SIZE_and_FROM_tags_1) /sizeof(asn_DEF_SIZE_and_FROM_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -2707,6 +2758,8 @@ Neither_SIZE_nor_FROM_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_PER_Visible.uper_encoder; td->oer_decoder = asn_DEF_PER_Visible.oer_decoder; td->oer_encoder = asn_DEF_PER_Visible.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_PER_Visible.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_PER_Visible.per_constraints; td->elements = asn_DEF_PER_Visible.elements; @@ -2774,8 +2827,8 @@ asn_TYPE_descriptor_t asn_DEF_Neither_SIZE_nor_FROM = { Neither_SIZE_nor_FROM_encode_der, Neither_SIZE_nor_FROM_decode_xer, Neither_SIZE_nor_FROM_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Neither_SIZE_nor_FROM_tags_1, sizeof(asn_DEF_Neither_SIZE_nor_FROM_tags_1) @@ -2783,6 +2836,7 @@ asn_TYPE_descriptor_t asn_DEF_Neither_SIZE_nor_FROM = { asn_DEF_Neither_SIZE_nor_FROM_tags_1, /* Same as above */ sizeof(asn_DEF_Neither_SIZE_nor_FROM_tags_1) /sizeof(asn_DEF_Neither_SIZE_nor_FROM_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -2861,6 +2915,8 @@ Utf8_4_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_UTF8String.uper_encoder; td->oer_decoder = asn_DEF_UTF8String.oer_decoder; td->oer_encoder = asn_DEF_UTF8String.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_UTF8String.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_UTF8String.per_constraints; td->elements = asn_DEF_UTF8String.elements; @@ -2928,8 +2984,8 @@ asn_TYPE_descriptor_t asn_DEF_Utf8_4 = { Utf8_4_encode_der, Utf8_4_decode_xer, Utf8_4_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Utf8_4_tags_1, sizeof(asn_DEF_Utf8_4_tags_1) @@ -2937,6 +2993,7 @@ asn_TYPE_descriptor_t asn_DEF_Utf8_4 = { asn_DEF_Utf8_4_tags_1, /* Same as above */ sizeof(asn_DEF_Utf8_4_tags_1) /sizeof(asn_DEF_Utf8_4_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -3043,6 +3100,8 @@ Utf8_3_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_Utf8_2.uper_encoder; td->oer_decoder = asn_DEF_Utf8_2.oer_decoder; td->oer_encoder = asn_DEF_Utf8_2.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_Utf8_2.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_Utf8_2.per_constraints; td->elements = asn_DEF_Utf8_2.elements; @@ -3110,8 +3169,8 @@ asn_TYPE_descriptor_t asn_DEF_Utf8_3 = { Utf8_3_encode_der, Utf8_3_decode_xer, Utf8_3_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Utf8_3_tags_1, sizeof(asn_DEF_Utf8_3_tags_1) @@ -3119,6 +3178,7 @@ asn_TYPE_descriptor_t asn_DEF_Utf8_3 = { asn_DEF_Utf8_3_tags_1, /* Same as above */ sizeof(asn_DEF_Utf8_3_tags_1) /sizeof(asn_DEF_Utf8_3_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -3195,6 +3255,8 @@ Utf8_2_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_Utf8_1.uper_encoder; td->oer_decoder = asn_DEF_Utf8_1.oer_decoder; td->oer_encoder = asn_DEF_Utf8_1.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_Utf8_1.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_Utf8_1.per_constraints; td->elements = asn_DEF_Utf8_1.elements; @@ -3262,8 +3324,8 @@ asn_TYPE_descriptor_t asn_DEF_Utf8_2 = { Utf8_2_encode_der, Utf8_2_decode_xer, Utf8_2_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Utf8_2_tags_1, sizeof(asn_DEF_Utf8_2_tags_1) @@ -3271,6 +3333,7 @@ asn_TYPE_descriptor_t asn_DEF_Utf8_2 = { asn_DEF_Utf8_2_tags_1, /* Same as above */ sizeof(asn_DEF_Utf8_2_tags_1) /sizeof(asn_DEF_Utf8_2_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -3323,6 +3386,8 @@ Utf8_1_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_UTF8String.uper_encoder; td->oer_decoder = asn_DEF_UTF8String.oer_decoder; td->oer_encoder = asn_DEF_UTF8String.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_UTF8String.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_UTF8String.per_constraints; td->elements = asn_DEF_UTF8String.elements; @@ -3390,8 +3455,8 @@ asn_TYPE_descriptor_t asn_DEF_Utf8_1 = { Utf8_1_encode_der, Utf8_1_decode_xer, Utf8_1_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Utf8_1_tags_1, sizeof(asn_DEF_Utf8_1_tags_1) @@ -3399,6 +3464,7 @@ asn_TYPE_descriptor_t asn_DEF_Utf8_1 = { asn_DEF_Utf8_1_tags_1, /* Same as above */ sizeof(asn_DEF_Utf8_1_tags_1) /sizeof(asn_DEF_Utf8_1_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -3498,6 +3564,8 @@ VisibleIdentifier_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_Identifier.uper_encoder; td->oer_decoder = asn_DEF_Identifier.oer_decoder; td->oer_encoder = asn_DEF_Identifier.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_Identifier.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_Identifier.per_constraints; td->elements = asn_DEF_Identifier.elements; @@ -3565,8 +3633,8 @@ asn_TYPE_descriptor_t asn_DEF_VisibleIdentifier = { VisibleIdentifier_encode_der, VisibleIdentifier_decode_xer, VisibleIdentifier_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_VisibleIdentifier_tags_1, sizeof(asn_DEF_VisibleIdentifier_tags_1) @@ -3574,6 +3642,7 @@ asn_TYPE_descriptor_t asn_DEF_VisibleIdentifier = { asn_DEF_VisibleIdentifier_tags_1, /* Same as above */ sizeof(asn_DEF_VisibleIdentifier_tags_1) /sizeof(asn_DEF_VisibleIdentifier_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -3652,6 +3721,8 @@ enum_c_6_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_ENUMERATED.uper_encoder; td->oer_decoder = asn_DEF_ENUMERATED.oer_decoder; td->oer_encoder = asn_DEF_ENUMERATED.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_ENUMERATED.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_ENUMERATED.per_constraints; td->elements = asn_DEF_ENUMERATED.elements; @@ -3872,8 +3943,8 @@ asn_TYPE_descriptor_t asn_DEF_enum_c_6 = { enum_c_6_encode_der, enum_c_6_decode_xer, enum_c_6_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_enum_c_tags_6, sizeof(asn_DEF_enum_c_tags_6) @@ -3881,6 +3952,7 @@ asn_TYPE_descriptor_t asn_DEF_enum_c_6 = { asn_DEF_enum_c_tags_6, /* Same as above */ sizeof(asn_DEF_enum_c_tags_6) /sizeof(asn_DEF_enum_c_tags_6[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* Defined elsewhere */ &asn_SPC_enum_c_specs_6 /* Additional specs */ @@ -3892,6 +3964,7 @@ static asn_TYPE_member_t asn_MBR_Sequence_1[] = { .tag_mode = 0, .type = &asn_DEF_Int1, .memb_constraints = memb_int1_c_constraint_1, + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = asn_DFL_2_set_3, /* DEFAULT 3 */ .name = "int1-c" @@ -3901,6 +3974,7 @@ static asn_TYPE_member_t asn_MBR_Sequence_1[] = { .tag_mode = +1, /* EXPLICIT tag at current level */ .type = &asn_DEF_Int4, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "int4" @@ -3910,6 +3984,7 @@ static asn_TYPE_member_t asn_MBR_Sequence_1[] = { .tag_mode = 0, .type = &asn_DEF_Int4, .memb_constraints = memb_int4_c_constraint_1, + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "int4-c" @@ -3919,6 +3994,7 @@ static asn_TYPE_member_t asn_MBR_Sequence_1[] = { .tag_mode = 0, .type = &asn_DEF_BOOLEAN, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = asn_DFL_5_set_1, /* DEFAULT 1 */ .name = "bool" @@ -3928,6 +4004,7 @@ static asn_TYPE_member_t asn_MBR_Sequence_1[] = { .tag_mode = 0, .type = &asn_DEF_enum_c_6, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "enum-c" @@ -3937,6 +4014,7 @@ static asn_TYPE_member_t asn_MBR_Sequence_1[] = { .tag_mode = 0, .type = &asn_DEF_NULL, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "null" @@ -3946,6 +4024,7 @@ static asn_TYPE_member_t asn_MBR_Sequence_1[] = { .tag_mode = 0, .type = &asn_DEF_Int5, .memb_constraints = memb_int5_c_constraint_1, + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "int5-c" @@ -3982,8 +4061,8 @@ asn_TYPE_descriptor_t asn_DEF_Sequence = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Sequence_tags_1, sizeof(asn_DEF_Sequence_tags_1) @@ -3991,6 +4070,7 @@ asn_TYPE_descriptor_t asn_DEF_Sequence = { asn_DEF_Sequence_tags_1, /* Same as above */ sizeof(asn_DEF_Sequence_tags_1) /sizeof(asn_DEF_Sequence_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_Sequence_1, 7, /* Elements count */ @@ -4032,6 +4112,7 @@ static asn_TYPE_member_t asn_MBR_SequenceOf_1[] = { .tag_mode = 0, .type = &asn_DEF_Sequence, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "" @@ -4055,8 +4136,8 @@ asn_TYPE_descriptor_t asn_DEF_SequenceOf = { SEQUENCE_OF_encode_der, SEQUENCE_OF_decode_xer, SEQUENCE_OF_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_SequenceOf_tags_1, sizeof(asn_DEF_SequenceOf_tags_1) @@ -4064,6 +4145,7 @@ asn_TYPE_descriptor_t asn_DEF_SequenceOf = { asn_DEF_SequenceOf_tags_1, /* Same as above */ sizeof(asn_DEF_SequenceOf_tags_1) /sizeof(asn_DEF_SequenceOf_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_SequenceOf_1, 1, /* Single element */ @@ -4124,6 +4206,8 @@ Enum0_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_ENUMERATED.uper_encoder; td->oer_decoder = asn_DEF_ENUMERATED.oer_decoder; td->oer_encoder = asn_DEF_ENUMERATED.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_ENUMERATED.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_ENUMERATED.per_constraints; td->elements = asn_DEF_ENUMERATED.elements; @@ -4208,8 +4292,8 @@ asn_TYPE_descriptor_t asn_DEF_Enum0 = { Enum0_encode_der, Enum0_decode_xer, Enum0_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Enum0_tags_1, sizeof(asn_DEF_Enum0_tags_1) @@ -4217,6 +4301,7 @@ asn_TYPE_descriptor_t asn_DEF_Enum0 = { asn_DEF_Enum0_tags_1, /* Same as above */ sizeof(asn_DEF_Enum0_tags_1) /sizeof(asn_DEF_Enum0_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* Defined elsewhere */ &asn_SPC_Enum0_specs_1 /* Additional specs */ @@ -4293,6 +4378,8 @@ Enum1_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_NativeEnumerated.uper_encoder; td->oer_decoder = asn_DEF_NativeEnumerated.oer_decoder; td->oer_encoder = asn_DEF_NativeEnumerated.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_NativeEnumerated.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_NativeEnumerated.per_constraints; td->elements = asn_DEF_NativeEnumerated.elements; @@ -4377,8 +4464,8 @@ asn_TYPE_descriptor_t asn_DEF_Enum1 = { Enum1_encode_der, Enum1_decode_xer, Enum1_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Enum1_tags_1, sizeof(asn_DEF_Enum1_tags_1) @@ -4386,6 +4473,7 @@ asn_TYPE_descriptor_t asn_DEF_Enum1 = { asn_DEF_Enum1_tags_1, /* Same as above */ sizeof(asn_DEF_Enum1_tags_1) /sizeof(asn_DEF_Enum1_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* Defined elsewhere */ &asn_SPC_Enum1_specs_1 /* Additional specs */ @@ -4485,6 +4573,8 @@ Identifier_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_VisibleString.uper_encoder; td->oer_decoder = asn_DEF_VisibleString.oer_decoder; td->oer_encoder = asn_DEF_VisibleString.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_VisibleString.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_VisibleString.per_constraints; td->elements = asn_DEF_VisibleString.elements; @@ -4552,8 +4642,8 @@ asn_TYPE_descriptor_t asn_DEF_Identifier = { Identifier_encode_der, Identifier_decode_xer, Identifier_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Identifier_tags_1, sizeof(asn_DEF_Identifier_tags_1) @@ -4561,6 +4651,7 @@ asn_TYPE_descriptor_t asn_DEF_Identifier = { asn_DEF_Identifier_tags_1, /* Same as above */ sizeof(asn_DEF_Identifier_tags_1) /sizeof(asn_DEF_Identifier_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ diff --git a/tests/50-constraint-OK.asn1.-Pgen-PER b/tests/50-constraint-OK.asn1.-Pgen-PER index 3ac7a514..15d438d7 100644 --- a/tests/50-constraint-OK.asn1.-Pgen-PER +++ b/tests/50-constraint-OK.asn1.-Pgen-PER @@ -47,6 +47,8 @@ Int1_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_NativeInteger.uper_encoder; td->oer_decoder = asn_DEF_NativeInteger.oer_decoder; td->oer_encoder = asn_DEF_NativeInteger.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_NativeInteger.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -129,9 +131,9 @@ asn_TYPE_descriptor_t asn_DEF_Int1 = { Int1_encode_der, Int1_decode_xer, Int1_encode_xer, + 0, 0, /* No OER support, use "-gen-OER" to enable */ Int1_decode_uper, Int1_encode_uper, - 0, 0, /* No OER support, use "-gen-OER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Int1_tags_1, sizeof(asn_DEF_Int1_tags_1) @@ -139,6 +141,7 @@ asn_TYPE_descriptor_t asn_DEF_Int1 = { asn_DEF_Int1_tags_1, /* Same as above */ sizeof(asn_DEF_Int1_tags_1) /sizeof(asn_DEF_Int1_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -210,6 +213,8 @@ Int2_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_Int1.uper_encoder; td->oer_decoder = asn_DEF_Int1.oer_decoder; td->oer_encoder = asn_DEF_Int1.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_Int1.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_Int1.per_constraints; td->elements = asn_DEF_Int1.elements; @@ -300,9 +305,9 @@ asn_TYPE_descriptor_t asn_DEF_Int2 = { Int2_encode_der, Int2_decode_xer, Int2_encode_xer, + 0, 0, /* No OER support, use "-gen-OER" to enable */ Int2_decode_uper, Int2_encode_uper, - 0, 0, /* No OER support, use "-gen-OER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Int2_tags_1, sizeof(asn_DEF_Int2_tags_1) @@ -310,6 +315,7 @@ asn_TYPE_descriptor_t asn_DEF_Int2 = { asn_DEF_Int2_tags_1, /* Same as above */ sizeof(asn_DEF_Int2_tags_1) /sizeof(asn_DEF_Int2_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ &asn_PER_type_Int2_constr_1, 0, 0, /* No members */ 0 /* No specifics */ @@ -381,6 +387,8 @@ Int3_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_Int2.uper_encoder; td->oer_decoder = asn_DEF_Int2.oer_decoder; td->oer_encoder = asn_DEF_Int2.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_Int2.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_Int2.per_constraints; td->elements = asn_DEF_Int2.elements; @@ -471,9 +479,9 @@ asn_TYPE_descriptor_t asn_DEF_Int3 = { Int3_encode_der, Int3_decode_xer, Int3_encode_xer, + 0, 0, /* No OER support, use "-gen-OER" to enable */ Int3_decode_uper, Int3_encode_uper, - 0, 0, /* No OER support, use "-gen-OER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Int3_tags_1, sizeof(asn_DEF_Int3_tags_1) @@ -481,6 +489,7 @@ asn_TYPE_descriptor_t asn_DEF_Int3 = { asn_DEF_Int3_tags_1, /* Same as above */ sizeof(asn_DEF_Int3_tags_1) /sizeof(asn_DEF_Int3_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ &asn_PER_type_Int3_constr_1, 0, 0, /* No members */ 0 /* No specifics */ @@ -552,6 +561,8 @@ Int4_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_Int3.uper_encoder; td->oer_decoder = asn_DEF_Int3.oer_decoder; td->oer_encoder = asn_DEF_Int3.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_Int3.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_Int3.per_constraints; td->elements = asn_DEF_Int3.elements; @@ -642,9 +653,9 @@ asn_TYPE_descriptor_t asn_DEF_Int4 = { Int4_encode_der, Int4_decode_xer, Int4_encode_xer, + 0, 0, /* No OER support, use "-gen-OER" to enable */ Int4_decode_uper, Int4_encode_uper, - 0, 0, /* No OER support, use "-gen-OER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Int4_tags_1, sizeof(asn_DEF_Int4_tags_1) @@ -652,6 +663,7 @@ asn_TYPE_descriptor_t asn_DEF_Int4 = { asn_DEF_Int4_tags_1, /* Same as above */ sizeof(asn_DEF_Int4_tags_1) /sizeof(asn_DEF_Int4_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ &asn_PER_type_Int4_constr_1, 0, 0, /* No members */ 0 /* No specifics */ @@ -723,6 +735,8 @@ Int5_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_Int4.uper_encoder; td->oer_decoder = asn_DEF_Int4.oer_decoder; td->oer_encoder = asn_DEF_Int4.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_Int4.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_Int4.per_constraints; td->elements = asn_DEF_Int4.elements; @@ -813,9 +827,9 @@ asn_TYPE_descriptor_t asn_DEF_Int5 = { Int5_encode_der, Int5_decode_xer, Int5_encode_xer, + 0, 0, /* No OER support, use "-gen-OER" to enable */ Int5_decode_uper, Int5_encode_uper, - 0, 0, /* No OER support, use "-gen-OER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Int5_tags_1, sizeof(asn_DEF_Int5_tags_1) @@ -823,6 +837,7 @@ asn_TYPE_descriptor_t asn_DEF_Int5 = { asn_DEF_Int5_tags_1, /* Same as above */ sizeof(asn_DEF_Int5_tags_1) /sizeof(asn_DEF_Int5_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ &asn_PER_type_Int5_constr_1, 0, 0, /* No members */ 0 /* No specifics */ @@ -894,6 +909,8 @@ ExtensibleExtensions_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_NativeInteger.uper_encoder; td->oer_decoder = asn_DEF_NativeInteger.oer_decoder; td->oer_encoder = asn_DEF_NativeInteger.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_NativeInteger.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -984,9 +1001,9 @@ asn_TYPE_descriptor_t asn_DEF_ExtensibleExtensions = { ExtensibleExtensions_encode_der, ExtensibleExtensions_decode_xer, ExtensibleExtensions_encode_xer, + 0, 0, /* No OER support, use "-gen-OER" to enable */ ExtensibleExtensions_decode_uper, ExtensibleExtensions_encode_uper, - 0, 0, /* No OER support, use "-gen-OER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_ExtensibleExtensions_tags_1, sizeof(asn_DEF_ExtensibleExtensions_tags_1) @@ -994,6 +1011,7 @@ asn_TYPE_descriptor_t asn_DEF_ExtensibleExtensions = { asn_DEF_ExtensibleExtensions_tags_1, /* Same as above */ sizeof(asn_DEF_ExtensibleExtensions_tags_1) /sizeof(asn_DEF_ExtensibleExtensions_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ &asn_PER_type_ExtensibleExtensions_constr_1, 0, 0, /* No members */ 0 /* No specifics */ @@ -1048,6 +1066,8 @@ Str1_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_IA5String.uper_encoder; td->oer_decoder = asn_DEF_IA5String.oer_decoder; td->oer_encoder = asn_DEF_IA5String.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_IA5String.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_IA5String.per_constraints; td->elements = asn_DEF_IA5String.elements; @@ -1130,9 +1150,9 @@ asn_TYPE_descriptor_t asn_DEF_Str1 = { Str1_encode_der, Str1_decode_xer, Str1_encode_xer, + 0, 0, /* No OER support, use "-gen-OER" to enable */ Str1_decode_uper, Str1_encode_uper, - 0, 0, /* No OER support, use "-gen-OER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Str1_tags_1, sizeof(asn_DEF_Str1_tags_1) @@ -1140,6 +1160,7 @@ asn_TYPE_descriptor_t asn_DEF_Str1 = { asn_DEF_Str1_tags_1, /* Same as above */ sizeof(asn_DEF_Str1_tags_1) /sizeof(asn_DEF_Str1_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -1229,6 +1250,8 @@ Str2_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_Str1.uper_encoder; td->oer_decoder = asn_DEF_Str1.oer_decoder; td->oer_encoder = asn_DEF_Str1.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_Str1.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_Str1.per_constraints; td->elements = asn_DEF_Str1.elements; @@ -1319,9 +1342,9 @@ asn_TYPE_descriptor_t asn_DEF_Str2 = { Str2_encode_der, Str2_decode_xer, Str2_encode_xer, + 0, 0, /* No OER support, use "-gen-OER" to enable */ Str2_decode_uper, Str2_encode_uper, - 0, 0, /* No OER support, use "-gen-OER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Str2_tags_1, sizeof(asn_DEF_Str2_tags_1) @@ -1329,6 +1352,7 @@ asn_TYPE_descriptor_t asn_DEF_Str2 = { asn_DEF_Str2_tags_1, /* Same as above */ sizeof(asn_DEF_Str2_tags_1) /sizeof(asn_DEF_Str2_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ &asn_PER_type_Str2_constr_1, 0, 0, /* No members */ 0 /* No specifics */ @@ -1442,6 +1466,8 @@ Str3_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_Str2.uper_encoder; td->oer_decoder = asn_DEF_Str2.oer_decoder; td->oer_encoder = asn_DEF_Str2.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_Str2.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_Str2.per_constraints; td->elements = asn_DEF_Str2.elements; @@ -1533,9 +1559,9 @@ asn_TYPE_descriptor_t asn_DEF_Str3 = { Str3_encode_der, Str3_decode_xer, Str3_encode_xer, + 0, 0, /* No OER support, use "-gen-OER" to enable */ Str3_decode_uper, Str3_encode_uper, - 0, 0, /* No OER support, use "-gen-OER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Str3_tags_1, sizeof(asn_DEF_Str3_tags_1) @@ -1543,6 +1569,7 @@ asn_TYPE_descriptor_t asn_DEF_Str3 = { asn_DEF_Str3_tags_1, /* Same as above */ sizeof(asn_DEF_Str3_tags_1) /sizeof(asn_DEF_Str3_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ &asn_PER_type_Str3_constr_1, 0, 0, /* No members */ 0 /* No specifics */ @@ -1629,6 +1656,8 @@ Str4_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_IA5String.uper_encoder; td->oer_decoder = asn_DEF_IA5String.oer_decoder; td->oer_encoder = asn_DEF_IA5String.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_IA5String.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_IA5String.per_constraints; td->elements = asn_DEF_IA5String.elements; @@ -1719,9 +1748,9 @@ asn_TYPE_descriptor_t asn_DEF_Str4 = { Str4_encode_der, Str4_decode_xer, Str4_encode_xer, + 0, 0, /* No OER support, use "-gen-OER" to enable */ Str4_decode_uper, Str4_encode_uper, - 0, 0, /* No OER support, use "-gen-OER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Str4_tags_1, sizeof(asn_DEF_Str4_tags_1) @@ -1729,6 +1758,7 @@ asn_TYPE_descriptor_t asn_DEF_Str4 = { asn_DEF_Str4_tags_1, /* Same as above */ sizeof(asn_DEF_Str4_tags_1) /sizeof(asn_DEF_Str4_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ &asn_PER_type_Str4_constr_1, 0, 0, /* No members */ 0 /* No specifics */ @@ -1815,6 +1845,8 @@ PER_Visible_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_IA5String.uper_encoder; td->oer_decoder = asn_DEF_IA5String.oer_decoder; td->oer_encoder = asn_DEF_IA5String.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_IA5String.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_IA5String.per_constraints; td->elements = asn_DEF_IA5String.elements; @@ -1905,9 +1937,9 @@ asn_TYPE_descriptor_t asn_DEF_PER_Visible = { PER_Visible_encode_der, PER_Visible_decode_xer, PER_Visible_encode_xer, + 0, 0, /* No OER support, use "-gen-OER" to enable */ PER_Visible_decode_uper, PER_Visible_encode_uper, - 0, 0, /* No OER support, use "-gen-OER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_PER_Visible_tags_1, sizeof(asn_DEF_PER_Visible_tags_1) @@ -1915,6 +1947,7 @@ asn_TYPE_descriptor_t asn_DEF_PER_Visible = { asn_DEF_PER_Visible_tags_1, /* Same as above */ sizeof(asn_DEF_PER_Visible_tags_1) /sizeof(asn_DEF_PER_Visible_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ &asn_PER_type_PER_Visible_constr_1, 0, 0, /* No members */ 0 /* No specifics */ @@ -2001,6 +2034,8 @@ PER_Visible_2_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_PER_Visible.uper_encoder; td->oer_decoder = asn_DEF_PER_Visible.oer_decoder; td->oer_encoder = asn_DEF_PER_Visible.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_PER_Visible.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_PER_Visible.per_constraints; td->elements = asn_DEF_PER_Visible.elements; @@ -2091,9 +2126,9 @@ asn_TYPE_descriptor_t asn_DEF_PER_Visible_2 = { PER_Visible_2_encode_der, PER_Visible_2_decode_xer, PER_Visible_2_encode_xer, + 0, 0, /* No OER support, use "-gen-OER" to enable */ PER_Visible_2_decode_uper, PER_Visible_2_encode_uper, - 0, 0, /* No OER support, use "-gen-OER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_PER_Visible_2_tags_1, sizeof(asn_DEF_PER_Visible_2_tags_1) @@ -2101,6 +2136,7 @@ asn_TYPE_descriptor_t asn_DEF_PER_Visible_2 = { asn_DEF_PER_Visible_2_tags_1, /* Same as above */ sizeof(asn_DEF_PER_Visible_2_tags_1) /sizeof(asn_DEF_PER_Visible_2_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ &asn_PER_type_PER_Visible_2_constr_1, 0, 0, /* No members */ 0 /* No specifics */ @@ -2187,6 +2223,8 @@ Not_PER_Visible_1_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_PER_Visible.uper_encoder; td->oer_decoder = asn_DEF_PER_Visible.oer_decoder; td->oer_encoder = asn_DEF_PER_Visible.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_PER_Visible.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_PER_Visible.per_constraints; td->elements = asn_DEF_PER_Visible.elements; @@ -2277,9 +2315,9 @@ asn_TYPE_descriptor_t asn_DEF_Not_PER_Visible_1 = { Not_PER_Visible_1_encode_der, Not_PER_Visible_1_decode_xer, Not_PER_Visible_1_encode_xer, + 0, 0, /* No OER support, use "-gen-OER" to enable */ Not_PER_Visible_1_decode_uper, Not_PER_Visible_1_encode_uper, - 0, 0, /* No OER support, use "-gen-OER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Not_PER_Visible_1_tags_1, sizeof(asn_DEF_Not_PER_Visible_1_tags_1) @@ -2287,6 +2325,7 @@ asn_TYPE_descriptor_t asn_DEF_Not_PER_Visible_1 = { asn_DEF_Not_PER_Visible_1_tags_1, /* Same as above */ sizeof(asn_DEF_Not_PER_Visible_1_tags_1) /sizeof(asn_DEF_Not_PER_Visible_1_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ &asn_PER_type_Not_PER_Visible_1_constr_1, 0, 0, /* No members */ 0 /* No specifics */ @@ -2373,6 +2412,8 @@ Not_PER_Visible_2_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_PER_Visible.uper_encoder; td->oer_decoder = asn_DEF_PER_Visible.oer_decoder; td->oer_encoder = asn_DEF_PER_Visible.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_PER_Visible.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_PER_Visible.per_constraints; td->elements = asn_DEF_PER_Visible.elements; @@ -2463,9 +2504,9 @@ asn_TYPE_descriptor_t asn_DEF_Not_PER_Visible_2 = { Not_PER_Visible_2_encode_der, Not_PER_Visible_2_decode_xer, Not_PER_Visible_2_encode_xer, + 0, 0, /* No OER support, use "-gen-OER" to enable */ Not_PER_Visible_2_decode_uper, Not_PER_Visible_2_encode_uper, - 0, 0, /* No OER support, use "-gen-OER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Not_PER_Visible_2_tags_1, sizeof(asn_DEF_Not_PER_Visible_2_tags_1) @@ -2473,6 +2514,7 @@ asn_TYPE_descriptor_t asn_DEF_Not_PER_Visible_2 = { asn_DEF_Not_PER_Visible_2_tags_1, /* Same as above */ sizeof(asn_DEF_Not_PER_Visible_2_tags_1) /sizeof(asn_DEF_Not_PER_Visible_2_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ &asn_PER_type_Not_PER_Visible_2_constr_1, 0, 0, /* No members */ 0 /* No specifics */ @@ -2559,6 +2601,8 @@ Not_PER_Visible_3_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_PER_Visible.uper_encoder; td->oer_decoder = asn_DEF_PER_Visible.oer_decoder; td->oer_encoder = asn_DEF_PER_Visible.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_PER_Visible.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_PER_Visible.per_constraints; td->elements = asn_DEF_PER_Visible.elements; @@ -2649,9 +2693,9 @@ asn_TYPE_descriptor_t asn_DEF_Not_PER_Visible_3 = { Not_PER_Visible_3_encode_der, Not_PER_Visible_3_decode_xer, Not_PER_Visible_3_encode_xer, + 0, 0, /* No OER support, use "-gen-OER" to enable */ Not_PER_Visible_3_decode_uper, Not_PER_Visible_3_encode_uper, - 0, 0, /* No OER support, use "-gen-OER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Not_PER_Visible_3_tags_1, sizeof(asn_DEF_Not_PER_Visible_3_tags_1) @@ -2659,6 +2703,7 @@ asn_TYPE_descriptor_t asn_DEF_Not_PER_Visible_3 = { asn_DEF_Not_PER_Visible_3_tags_1, /* Same as above */ sizeof(asn_DEF_Not_PER_Visible_3_tags_1) /sizeof(asn_DEF_Not_PER_Visible_3_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ &asn_PER_type_Not_PER_Visible_3_constr_1, 0, 0, /* No members */ 0 /* No specifics */ @@ -2748,6 +2793,8 @@ SIZE_but_not_FROM_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_PER_Visible.uper_encoder; td->oer_decoder = asn_DEF_PER_Visible.oer_decoder; td->oer_encoder = asn_DEF_PER_Visible.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_PER_Visible.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_PER_Visible.per_constraints; td->elements = asn_DEF_PER_Visible.elements; @@ -2838,9 +2885,9 @@ asn_TYPE_descriptor_t asn_DEF_SIZE_but_not_FROM = { SIZE_but_not_FROM_encode_der, SIZE_but_not_FROM_decode_xer, SIZE_but_not_FROM_encode_xer, + 0, 0, /* No OER support, use "-gen-OER" to enable */ SIZE_but_not_FROM_decode_uper, SIZE_but_not_FROM_encode_uper, - 0, 0, /* No OER support, use "-gen-OER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_SIZE_but_not_FROM_tags_1, sizeof(asn_DEF_SIZE_but_not_FROM_tags_1) @@ -2848,6 +2895,7 @@ asn_TYPE_descriptor_t asn_DEF_SIZE_but_not_FROM = { asn_DEF_SIZE_but_not_FROM_tags_1, /* Same as above */ sizeof(asn_DEF_SIZE_but_not_FROM_tags_1) /sizeof(asn_DEF_SIZE_but_not_FROM_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ &asn_PER_type_SIZE_but_not_FROM_constr_1, 0, 0, /* No members */ 0 /* No specifics */ @@ -2937,6 +2985,8 @@ SIZE_and_FROM_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_PER_Visible.uper_encoder; td->oer_decoder = asn_DEF_PER_Visible.oer_decoder; td->oer_encoder = asn_DEF_PER_Visible.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_PER_Visible.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_PER_Visible.per_constraints; td->elements = asn_DEF_PER_Visible.elements; @@ -3027,9 +3077,9 @@ asn_TYPE_descriptor_t asn_DEF_SIZE_and_FROM = { SIZE_and_FROM_encode_der, SIZE_and_FROM_decode_xer, SIZE_and_FROM_encode_xer, + 0, 0, /* No OER support, use "-gen-OER" to enable */ SIZE_and_FROM_decode_uper, SIZE_and_FROM_encode_uper, - 0, 0, /* No OER support, use "-gen-OER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_SIZE_and_FROM_tags_1, sizeof(asn_DEF_SIZE_and_FROM_tags_1) @@ -3037,6 +3087,7 @@ asn_TYPE_descriptor_t asn_DEF_SIZE_and_FROM = { asn_DEF_SIZE_and_FROM_tags_1, /* Same as above */ sizeof(asn_DEF_SIZE_and_FROM_tags_1) /sizeof(asn_DEF_SIZE_and_FROM_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ &asn_PER_type_SIZE_and_FROM_constr_1, 0, 0, /* No members */ 0 /* No specifics */ @@ -3123,6 +3174,8 @@ Neither_SIZE_nor_FROM_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_PER_Visible.uper_encoder; td->oer_decoder = asn_DEF_PER_Visible.oer_decoder; td->oer_encoder = asn_DEF_PER_Visible.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_PER_Visible.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_PER_Visible.per_constraints; td->elements = asn_DEF_PER_Visible.elements; @@ -3213,9 +3266,9 @@ asn_TYPE_descriptor_t asn_DEF_Neither_SIZE_nor_FROM = { Neither_SIZE_nor_FROM_encode_der, Neither_SIZE_nor_FROM_decode_xer, Neither_SIZE_nor_FROM_encode_xer, + 0, 0, /* No OER support, use "-gen-OER" to enable */ Neither_SIZE_nor_FROM_decode_uper, Neither_SIZE_nor_FROM_encode_uper, - 0, 0, /* No OER support, use "-gen-OER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Neither_SIZE_nor_FROM_tags_1, sizeof(asn_DEF_Neither_SIZE_nor_FROM_tags_1) @@ -3223,6 +3276,7 @@ asn_TYPE_descriptor_t asn_DEF_Neither_SIZE_nor_FROM = { asn_DEF_Neither_SIZE_nor_FROM_tags_1, /* Same as above */ sizeof(asn_DEF_Neither_SIZE_nor_FROM_tags_1) /sizeof(asn_DEF_Neither_SIZE_nor_FROM_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ &asn_PER_type_Neither_SIZE_nor_FROM_constr_1, 0, 0, /* No members */ 0 /* No specifics */ @@ -3303,6 +3357,8 @@ Utf8_4_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_UTF8String.uper_encoder; td->oer_decoder = asn_DEF_UTF8String.oer_decoder; td->oer_encoder = asn_DEF_UTF8String.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_UTF8String.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_UTF8String.per_constraints; td->elements = asn_DEF_UTF8String.elements; @@ -3393,9 +3449,9 @@ asn_TYPE_descriptor_t asn_DEF_Utf8_4 = { Utf8_4_encode_der, Utf8_4_decode_xer, Utf8_4_encode_xer, + 0, 0, /* No OER support, use "-gen-OER" to enable */ Utf8_4_decode_uper, Utf8_4_encode_uper, - 0, 0, /* No OER support, use "-gen-OER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Utf8_4_tags_1, sizeof(asn_DEF_Utf8_4_tags_1) @@ -3403,6 +3459,7 @@ asn_TYPE_descriptor_t asn_DEF_Utf8_4 = { asn_DEF_Utf8_4_tags_1, /* Same as above */ sizeof(asn_DEF_Utf8_4_tags_1) /sizeof(asn_DEF_Utf8_4_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ &asn_PER_type_Utf8_4_constr_1, 0, 0, /* No members */ 0 /* No specifics */ @@ -3511,6 +3568,8 @@ Utf8_3_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_Utf8_2.uper_encoder; td->oer_decoder = asn_DEF_Utf8_2.oer_decoder; td->oer_encoder = asn_DEF_Utf8_2.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_Utf8_2.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_Utf8_2.per_constraints; td->elements = asn_DEF_Utf8_2.elements; @@ -3601,9 +3660,9 @@ asn_TYPE_descriptor_t asn_DEF_Utf8_3 = { Utf8_3_encode_der, Utf8_3_decode_xer, Utf8_3_encode_xer, + 0, 0, /* No OER support, use "-gen-OER" to enable */ Utf8_3_decode_uper, Utf8_3_encode_uper, - 0, 0, /* No OER support, use "-gen-OER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Utf8_3_tags_1, sizeof(asn_DEF_Utf8_3_tags_1) @@ -3611,6 +3670,7 @@ asn_TYPE_descriptor_t asn_DEF_Utf8_3 = { asn_DEF_Utf8_3_tags_1, /* Same as above */ sizeof(asn_DEF_Utf8_3_tags_1) /sizeof(asn_DEF_Utf8_3_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ &asn_PER_type_Utf8_3_constr_1, 0, 0, /* No members */ 0 /* No specifics */ @@ -3689,6 +3749,8 @@ Utf8_2_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_Utf8_1.uper_encoder; td->oer_decoder = asn_DEF_Utf8_1.oer_decoder; td->oer_encoder = asn_DEF_Utf8_1.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_Utf8_1.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_Utf8_1.per_constraints; td->elements = asn_DEF_Utf8_1.elements; @@ -3779,9 +3841,9 @@ asn_TYPE_descriptor_t asn_DEF_Utf8_2 = { Utf8_2_encode_der, Utf8_2_decode_xer, Utf8_2_encode_xer, + 0, 0, /* No OER support, use "-gen-OER" to enable */ Utf8_2_decode_uper, Utf8_2_encode_uper, - 0, 0, /* No OER support, use "-gen-OER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Utf8_2_tags_1, sizeof(asn_DEF_Utf8_2_tags_1) @@ -3789,6 +3851,7 @@ asn_TYPE_descriptor_t asn_DEF_Utf8_2 = { asn_DEF_Utf8_2_tags_1, /* Same as above */ sizeof(asn_DEF_Utf8_2_tags_1) /sizeof(asn_DEF_Utf8_2_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ &asn_PER_type_Utf8_2_constr_1, 0, 0, /* No members */ 0 /* No specifics */ @@ -3843,6 +3906,8 @@ Utf8_1_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_UTF8String.uper_encoder; td->oer_decoder = asn_DEF_UTF8String.oer_decoder; td->oer_encoder = asn_DEF_UTF8String.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_UTF8String.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_UTF8String.per_constraints; td->elements = asn_DEF_UTF8String.elements; @@ -3925,9 +3990,9 @@ asn_TYPE_descriptor_t asn_DEF_Utf8_1 = { Utf8_1_encode_der, Utf8_1_decode_xer, Utf8_1_encode_xer, + 0, 0, /* No OER support, use "-gen-OER" to enable */ Utf8_1_decode_uper, Utf8_1_encode_uper, - 0, 0, /* No OER support, use "-gen-OER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Utf8_1_tags_1, sizeof(asn_DEF_Utf8_1_tags_1) @@ -3935,6 +4000,7 @@ asn_TYPE_descriptor_t asn_DEF_Utf8_1 = { asn_DEF_Utf8_1_tags_1, /* Same as above */ sizeof(asn_DEF_Utf8_1_tags_1) /sizeof(asn_DEF_Utf8_1_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -4043,6 +4109,8 @@ VisibleIdentifier_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_Identifier.uper_encoder; td->oer_decoder = asn_DEF_Identifier.oer_decoder; td->oer_encoder = asn_DEF_Identifier.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_Identifier.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_Identifier.per_constraints; td->elements = asn_DEF_Identifier.elements; @@ -4125,9 +4193,9 @@ asn_TYPE_descriptor_t asn_DEF_VisibleIdentifier = { VisibleIdentifier_encode_der, VisibleIdentifier_decode_xer, VisibleIdentifier_encode_xer, + 0, 0, /* No OER support, use "-gen-OER" to enable */ VisibleIdentifier_decode_uper, VisibleIdentifier_encode_uper, - 0, 0, /* No OER support, use "-gen-OER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_VisibleIdentifier_tags_1, sizeof(asn_DEF_VisibleIdentifier_tags_1) @@ -4135,6 +4203,7 @@ asn_TYPE_descriptor_t asn_DEF_VisibleIdentifier = { asn_DEF_VisibleIdentifier_tags_1, /* Same as above */ sizeof(asn_DEF_VisibleIdentifier_tags_1) /sizeof(asn_DEF_VisibleIdentifier_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -4213,6 +4282,8 @@ enum_c_6_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_NativeEnumerated.uper_encoder; td->oer_decoder = asn_DEF_NativeEnumerated.oer_decoder; td->oer_encoder = asn_DEF_NativeEnumerated.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_NativeEnumerated.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_NativeEnumerated.per_constraints; td->elements = asn_DEF_NativeEnumerated.elements; @@ -4451,9 +4522,9 @@ asn_TYPE_descriptor_t asn_DEF_enum_c_6 = { enum_c_6_encode_der, enum_c_6_decode_xer, enum_c_6_encode_xer, + 0, 0, /* No OER support, use "-gen-OER" to enable */ enum_c_6_decode_uper, enum_c_6_encode_uper, - 0, 0, /* No OER support, use "-gen-OER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_enum_c_tags_6, sizeof(asn_DEF_enum_c_tags_6) @@ -4461,6 +4532,7 @@ asn_TYPE_descriptor_t asn_DEF_enum_c_6 = { asn_DEF_enum_c_tags_6, /* Same as above */ sizeof(asn_DEF_enum_c_tags_6) /sizeof(asn_DEF_enum_c_tags_6[0]), /* 1 */ + 0, /* No OER visible constraints */ &asn_PER_type_enum_c_constr_6, 0, 0, /* Defined elsewhere */ &asn_SPC_enum_c_specs_6 /* Additional specs */ @@ -4472,6 +4544,7 @@ static asn_TYPE_member_t asn_MBR_Sequence_1[] = { .tag_mode = 0, .type = &asn_DEF_Int1, .memb_constraints = memb_int1_c_constraint_1, + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = &asn_PER_memb_int1_c_constr_2, .default_value = asn_DFL_2_set_3, /* DEFAULT 3 */ .name = "int1-c" @@ -4481,6 +4554,7 @@ static asn_TYPE_member_t asn_MBR_Sequence_1[] = { .tag_mode = +1, /* EXPLICIT tag at current level */ .type = &asn_DEF_Int4, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* No PER visible constraints */ .default_value = 0, .name = "int4" @@ -4490,6 +4564,7 @@ static asn_TYPE_member_t asn_MBR_Sequence_1[] = { .tag_mode = 0, .type = &asn_DEF_Int4, .memb_constraints = memb_int4_c_constraint_1, + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = &asn_PER_memb_int4_c_constr_4, .default_value = 0, .name = "int4-c" @@ -4499,6 +4574,7 @@ static asn_TYPE_member_t asn_MBR_Sequence_1[] = { .tag_mode = 0, .type = &asn_DEF_BOOLEAN, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* No PER visible constraints */ .default_value = asn_DFL_5_set_1, /* DEFAULT 1 */ .name = "bool" @@ -4508,6 +4584,7 @@ static asn_TYPE_member_t asn_MBR_Sequence_1[] = { .tag_mode = 0, .type = &asn_DEF_enum_c_6, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* No PER visible constraints */ .default_value = 0, .name = "enum-c" @@ -4517,6 +4594,7 @@ static asn_TYPE_member_t asn_MBR_Sequence_1[] = { .tag_mode = 0, .type = &asn_DEF_NULL, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* No PER visible constraints */ .default_value = 0, .name = "null" @@ -4526,6 +4604,7 @@ static asn_TYPE_member_t asn_MBR_Sequence_1[] = { .tag_mode = 0, .type = &asn_DEF_Int5, .memb_constraints = memb_int5_c_constraint_1, + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = &asn_PER_memb_int5_c_constr_13, .default_value = 0, .name = "int5-c" @@ -4564,9 +4643,9 @@ asn_TYPE_descriptor_t asn_DEF_Sequence = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, + 0, 0, /* No OER support, use "-gen-OER" to enable */ SEQUENCE_decode_uper, SEQUENCE_encode_uper, - 0, 0, /* No OER support, use "-gen-OER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Sequence_tags_1, sizeof(asn_DEF_Sequence_tags_1) @@ -4574,6 +4653,7 @@ asn_TYPE_descriptor_t asn_DEF_Sequence = { asn_DEF_Sequence_tags_1, /* Same as above */ sizeof(asn_DEF_Sequence_tags_1) /sizeof(asn_DEF_Sequence_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_Sequence_1, 7, /* Elements count */ @@ -4623,6 +4703,7 @@ static asn_TYPE_member_t asn_MBR_SequenceOf_1[] = { .tag_mode = 0, .type = &asn_DEF_Sequence, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* No PER visible constraints */ .default_value = 0, .name = "" @@ -4646,9 +4727,9 @@ asn_TYPE_descriptor_t asn_DEF_SequenceOf = { SEQUENCE_OF_encode_der, SEQUENCE_OF_decode_xer, SEQUENCE_OF_encode_xer, + 0, 0, /* No OER support, use "-gen-OER" to enable */ SEQUENCE_OF_decode_uper, SEQUENCE_OF_encode_uper, - 0, 0, /* No OER support, use "-gen-OER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_SequenceOf_tags_1, sizeof(asn_DEF_SequenceOf_tags_1) @@ -4656,6 +4737,7 @@ asn_TYPE_descriptor_t asn_DEF_SequenceOf = { asn_DEF_SequenceOf_tags_1, /* Same as above */ sizeof(asn_DEF_SequenceOf_tags_1) /sizeof(asn_DEF_SequenceOf_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ &asn_PER_type_SequenceOf_constr_1, asn_MBR_SequenceOf_1, 1, /* Single element */ @@ -4718,6 +4800,8 @@ Enum0_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_NativeEnumerated.uper_encoder; td->oer_decoder = asn_DEF_NativeEnumerated.oer_decoder; td->oer_encoder = asn_DEF_NativeEnumerated.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_NativeEnumerated.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_NativeEnumerated.per_constraints; td->elements = asn_DEF_NativeEnumerated.elements; @@ -4825,9 +4909,9 @@ asn_TYPE_descriptor_t asn_DEF_Enum0 = { Enum0_encode_der, Enum0_decode_xer, Enum0_encode_xer, + 0, 0, /* No OER support, use "-gen-OER" to enable */ Enum0_decode_uper, Enum0_encode_uper, - 0, 0, /* No OER support, use "-gen-OER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Enum0_tags_1, sizeof(asn_DEF_Enum0_tags_1) @@ -4835,6 +4919,7 @@ asn_TYPE_descriptor_t asn_DEF_Enum0 = { asn_DEF_Enum0_tags_1, /* Same as above */ sizeof(asn_DEF_Enum0_tags_1) /sizeof(asn_DEF_Enum0_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ &asn_PER_type_Enum0_constr_1, 0, 0, /* Defined elsewhere */ &asn_SPC_Enum0_specs_1 /* Additional specs */ @@ -4913,6 +4998,8 @@ Enum1_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_NativeEnumerated.uper_encoder; td->oer_decoder = asn_DEF_NativeEnumerated.oer_decoder; td->oer_encoder = asn_DEF_NativeEnumerated.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_NativeEnumerated.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_NativeEnumerated.per_constraints; td->elements = asn_DEF_NativeEnumerated.elements; @@ -5020,9 +5107,9 @@ asn_TYPE_descriptor_t asn_DEF_Enum1 = { Enum1_encode_der, Enum1_decode_xer, Enum1_encode_xer, + 0, 0, /* No OER support, use "-gen-OER" to enable */ Enum1_decode_uper, Enum1_encode_uper, - 0, 0, /* No OER support, use "-gen-OER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Enum1_tags_1, sizeof(asn_DEF_Enum1_tags_1) @@ -5030,6 +5117,7 @@ asn_TYPE_descriptor_t asn_DEF_Enum1 = { asn_DEF_Enum1_tags_1, /* Same as above */ sizeof(asn_DEF_Enum1_tags_1) /sizeof(asn_DEF_Enum1_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ &asn_PER_type_Enum1_constr_1, 0, 0, /* Defined elsewhere */ &asn_SPC_Enum1_specs_1 /* Additional specs */ @@ -5148,6 +5236,8 @@ Identifier_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_VisibleString.uper_encoder; td->oer_decoder = asn_DEF_VisibleString.oer_decoder; td->oer_encoder = asn_DEF_VisibleString.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_VisibleString.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_VisibleString.per_constraints; td->elements = asn_DEF_VisibleString.elements; @@ -5239,9 +5329,9 @@ asn_TYPE_descriptor_t asn_DEF_Identifier = { Identifier_encode_der, Identifier_decode_xer, Identifier_encode_xer, + 0, 0, /* No OER support, use "-gen-OER" to enable */ Identifier_decode_uper, Identifier_encode_uper, - 0, 0, /* No OER support, use "-gen-OER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Identifier_tags_1, sizeof(asn_DEF_Identifier_tags_1) @@ -5249,6 +5339,7 @@ asn_TYPE_descriptor_t asn_DEF_Identifier = { asn_DEF_Identifier_tags_1, /* Same as above */ sizeof(asn_DEF_Identifier_tags_1) /sizeof(asn_DEF_Identifier_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ &asn_PER_type_Identifier_constr_1, 0, 0, /* No members */ 0 /* No specifics */ diff --git a/tests/59-choice-extended-OK.asn1.-Pfwide-types b/tests/59-choice-extended-OK.asn1.-Pfwide-types index 39445d0a..651ba210 100644 --- a/tests/59-choice-extended-OK.asn1.-Pfwide-types +++ b/tests/59-choice-extended-OK.asn1.-Pfwide-types @@ -52,6 +52,7 @@ static asn_TYPE_member_t asn_MBR_Choice_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "a" @@ -61,6 +62,7 @@ static asn_TYPE_member_t asn_MBR_Choice_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "b" @@ -70,6 +72,7 @@ static asn_TYPE_member_t asn_MBR_Choice_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_Choice, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "c" @@ -103,8 +106,8 @@ asn_TYPE_descriptor_t asn_DEF_Choice = { CHOICE_encode_der, CHOICE_decode_xer, CHOICE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ CHOICE_outmost_tag, asn_DEF_Choice_tags_1, sizeof(asn_DEF_Choice_tags_1) @@ -112,6 +115,7 @@ asn_TYPE_descriptor_t asn_DEF_Choice = { asn_DEF_Choice_tags_1, /* Same as above */ sizeof(asn_DEF_Choice_tags_1) /sizeof(asn_DEF_Choice_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_Choice_1, 3, /* Elements count */ diff --git a/tests/60-any-OK.asn1.-Pfwide-types b/tests/60-any-OK.asn1.-Pfwide-types index 635be8e9..18214d3e 100644 --- a/tests/60-any-OK.asn1.-Pfwide-types +++ b/tests/60-any-OK.asn1.-Pfwide-types @@ -27,6 +27,7 @@ static asn_TYPE_member_t asn_MBR_T1_1[] = { .tag_mode = 0, .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "i" @@ -36,6 +37,7 @@ static asn_TYPE_member_t asn_MBR_T1_1[] = { .tag_mode = 0, .type = &asn_DEF_ANY, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "any" @@ -66,8 +68,8 @@ asn_TYPE_descriptor_t asn_DEF_T1 = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_T1_tags_1, sizeof(asn_DEF_T1_tags_1) @@ -75,6 +77,7 @@ asn_TYPE_descriptor_t asn_DEF_T1 = { asn_DEF_T1_tags_1, /* Same as above */ sizeof(asn_DEF_T1_tags_1) /sizeof(asn_DEF_T1_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_T1_1, 2, /* Elements count */ @@ -110,6 +113,7 @@ static asn_TYPE_member_t asn_MBR_T2_1[] = { .tag_mode = 0, .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "i" @@ -119,6 +123,7 @@ static asn_TYPE_member_t asn_MBR_T2_1[] = { .tag_mode = +1, /* EXPLICIT tag at current level */ .type = &asn_DEF_ANY, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "any" @@ -150,8 +155,8 @@ asn_TYPE_descriptor_t asn_DEF_T2 = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_T2_tags_1, sizeof(asn_DEF_T2_tags_1) @@ -159,6 +164,7 @@ asn_TYPE_descriptor_t asn_DEF_T2 = { asn_DEF_T2_tags_1, /* Same as above */ sizeof(asn_DEF_T2_tags_1) /sizeof(asn_DEF_T2_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_T2_1, 2, /* Elements count */ @@ -193,6 +199,7 @@ static asn_TYPE_member_t asn_MBR_T3_1[] = { .tag_mode = 0, .type = &asn_DEF_ANY, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "any1" @@ -202,6 +209,7 @@ static asn_TYPE_member_t asn_MBR_T3_1[] = { .tag_mode = 0, .type = &asn_DEF_ANY, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "any2" @@ -229,8 +237,8 @@ asn_TYPE_descriptor_t asn_DEF_T3 = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_T3_tags_1, sizeof(asn_DEF_T3_tags_1) @@ -238,6 +246,7 @@ asn_TYPE_descriptor_t asn_DEF_T3 = { asn_DEF_T3_tags_1, /* Same as above */ sizeof(asn_DEF_T3_tags_1) /sizeof(asn_DEF_T3_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_T3_1, 2, /* Elements count */ diff --git a/tests/65-multi-tag-OK.asn1.-Pfnative-types b/tests/65-multi-tag-OK.asn1.-Pfnative-types index 8e416e44..9a20c0fa 100644 --- a/tests/65-multi-tag-OK.asn1.-Pfnative-types +++ b/tests/65-multi-tag-OK.asn1.-Pfnative-types @@ -45,6 +45,8 @@ T1_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_T2.uper_encoder; td->oer_decoder = asn_DEF_T2.oer_decoder; td->oer_encoder = asn_DEF_T2.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_T2.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_T2.per_constraints; td->elements = asn_DEF_T2.elements; @@ -123,8 +125,8 @@ asn_TYPE_descriptor_t asn_DEF_T1 = { T1_encode_der, T1_decode_xer, T1_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_T1_tags_1, sizeof(asn_DEF_T1_tags_1) @@ -132,6 +134,7 @@ asn_TYPE_descriptor_t asn_DEF_T1 = { asn_DEF_T1_all_tags_1, sizeof(asn_DEF_T1_all_tags_1) /sizeof(asn_DEF_T1_all_tags_1[0]), /* 6 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -184,6 +187,8 @@ T2_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_T3.uper_encoder; td->oer_decoder = asn_DEF_T3.oer_decoder; td->oer_encoder = asn_DEF_T3.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_T3.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_T3.per_constraints; td->elements = asn_DEF_T3.elements; @@ -260,8 +265,8 @@ asn_TYPE_descriptor_t asn_DEF_T2 = { T2_encode_der, T2_decode_xer, T2_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_T2_tags_1, sizeof(asn_DEF_T2_tags_1) @@ -269,6 +274,7 @@ asn_TYPE_descriptor_t asn_DEF_T2 = { asn_DEF_T2_all_tags_1, sizeof(asn_DEF_T2_all_tags_1) /sizeof(asn_DEF_T2_all_tags_1[0]), /* 5 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -321,6 +327,8 @@ T3_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_T4.uper_encoder; td->oer_decoder = asn_DEF_T4.oer_decoder; td->oer_encoder = asn_DEF_T4.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_T4.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_T4.per_constraints; td->elements = asn_DEF_T4.elements; @@ -395,8 +403,8 @@ asn_TYPE_descriptor_t asn_DEF_T3 = { T3_encode_der, T3_decode_xer, T3_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_T3_tags_1, sizeof(asn_DEF_T3_tags_1) @@ -404,6 +412,7 @@ asn_TYPE_descriptor_t asn_DEF_T3 = { asn_DEF_T3_all_tags_1, sizeof(asn_DEF_T3_all_tags_1) /sizeof(asn_DEF_T3_all_tags_1[0]), /* 4 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -456,6 +465,8 @@ T4_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_T5.uper_encoder; td->oer_decoder = asn_DEF_T5.oer_decoder; td->oer_encoder = asn_DEF_T5.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_T5.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_T5.per_constraints; td->elements = asn_DEF_T5.elements; @@ -525,8 +536,8 @@ asn_TYPE_descriptor_t asn_DEF_T4 = { T4_encode_der, T4_decode_xer, T4_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_T4_tags_1, sizeof(asn_DEF_T4_tags_1) @@ -534,6 +545,7 @@ asn_TYPE_descriptor_t asn_DEF_T4 = { asn_DEF_T4_tags_1, /* Same as above */ sizeof(asn_DEF_T4_tags_1) /sizeof(asn_DEF_T4_tags_1[0]), /* 3 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -586,6 +598,8 @@ T5_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_T6.uper_encoder; td->oer_decoder = asn_DEF_T6.oer_decoder; td->oer_encoder = asn_DEF_T6.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_T6.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_T6.per_constraints; td->elements = asn_DEF_T6.elements; @@ -654,8 +668,8 @@ asn_TYPE_descriptor_t asn_DEF_T5 = { T5_encode_der, T5_decode_xer, T5_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_T5_tags_1, sizeof(asn_DEF_T5_tags_1) @@ -663,6 +677,7 @@ asn_TYPE_descriptor_t asn_DEF_T5 = { asn_DEF_T5_tags_1, /* Same as above */ sizeof(asn_DEF_T5_tags_1) /sizeof(asn_DEF_T5_tags_1[0]), /* 2 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -715,6 +730,8 @@ T6_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_NativeReal.uper_encoder; td->oer_decoder = asn_DEF_NativeReal.oer_decoder; td->oer_encoder = asn_DEF_NativeReal.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_NativeReal.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_NativeReal.per_constraints; td->elements = asn_DEF_NativeReal.elements; @@ -782,8 +799,8 @@ asn_TYPE_descriptor_t asn_DEF_T6 = { T6_encode_der, T6_decode_xer, T6_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_T6_tags_1, sizeof(asn_DEF_T6_tags_1) @@ -791,6 +808,7 @@ asn_TYPE_descriptor_t asn_DEF_T6 = { asn_DEF_T6_tags_1, /* Same as above */ sizeof(asn_DEF_T6_tags_1) /sizeof(asn_DEF_T6_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -843,6 +861,8 @@ T_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_Ts.uper_encoder; td->oer_decoder = asn_DEF_Ts.oer_decoder; td->oer_encoder = asn_DEF_Ts.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_Ts.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_Ts.per_constraints; td->elements = asn_DEF_Ts.elements; @@ -912,8 +932,8 @@ asn_TYPE_descriptor_t asn_DEF_T = { T_encode_der, T_decode_xer, T_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_T_tags_1, sizeof(asn_DEF_T_tags_1) @@ -921,6 +941,7 @@ asn_TYPE_descriptor_t asn_DEF_T = { asn_DEF_T_tags_1, /* Same as above */ sizeof(asn_DEF_T_tags_1) /sizeof(asn_DEF_T_tags_1[0]), /* 3 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* Defined elsewhere */ 0 /* No specifics */ @@ -956,6 +977,7 @@ static asn_TYPE_member_t asn_MBR_Ts_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_T2, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "m1" @@ -965,6 +987,7 @@ static asn_TYPE_member_t asn_MBR_Ts_1[] = { .tag_mode = +1, /* EXPLICIT tag at current level */ .type = &asn_DEF_T3, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "m2" @@ -974,6 +997,7 @@ static asn_TYPE_member_t asn_MBR_Ts_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_T3, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "m3" @@ -1007,8 +1031,8 @@ asn_TYPE_descriptor_t asn_DEF_Ts = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Ts_tags_1, sizeof(asn_DEF_Ts_tags_1) @@ -1016,6 +1040,7 @@ asn_TYPE_descriptor_t asn_DEF_Ts = { asn_DEF_Ts_tags_1, /* Same as above */ sizeof(asn_DEF_Ts_tags_1) /sizeof(asn_DEF_Ts_tags_1[0]), /* 2 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_Ts_1, 3, /* Elements count */ diff --git a/tests/65-multi-tag-OK.asn1.-Pfwide-types b/tests/65-multi-tag-OK.asn1.-Pfwide-types index 897e6431..5381ea78 100644 --- a/tests/65-multi-tag-OK.asn1.-Pfwide-types +++ b/tests/65-multi-tag-OK.asn1.-Pfwide-types @@ -45,6 +45,8 @@ T1_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_T2.uper_encoder; td->oer_decoder = asn_DEF_T2.oer_decoder; td->oer_encoder = asn_DEF_T2.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_T2.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_T2.per_constraints; td->elements = asn_DEF_T2.elements; @@ -123,8 +125,8 @@ asn_TYPE_descriptor_t asn_DEF_T1 = { T1_encode_der, T1_decode_xer, T1_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_T1_tags_1, sizeof(asn_DEF_T1_tags_1) @@ -132,6 +134,7 @@ asn_TYPE_descriptor_t asn_DEF_T1 = { asn_DEF_T1_all_tags_1, sizeof(asn_DEF_T1_all_tags_1) /sizeof(asn_DEF_T1_all_tags_1[0]), /* 6 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -184,6 +187,8 @@ T2_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_T3.uper_encoder; td->oer_decoder = asn_DEF_T3.oer_decoder; td->oer_encoder = asn_DEF_T3.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_T3.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_T3.per_constraints; td->elements = asn_DEF_T3.elements; @@ -260,8 +265,8 @@ asn_TYPE_descriptor_t asn_DEF_T2 = { T2_encode_der, T2_decode_xer, T2_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_T2_tags_1, sizeof(asn_DEF_T2_tags_1) @@ -269,6 +274,7 @@ asn_TYPE_descriptor_t asn_DEF_T2 = { asn_DEF_T2_all_tags_1, sizeof(asn_DEF_T2_all_tags_1) /sizeof(asn_DEF_T2_all_tags_1[0]), /* 5 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -321,6 +327,8 @@ T3_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_T4.uper_encoder; td->oer_decoder = asn_DEF_T4.oer_decoder; td->oer_encoder = asn_DEF_T4.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_T4.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_T4.per_constraints; td->elements = asn_DEF_T4.elements; @@ -395,8 +403,8 @@ asn_TYPE_descriptor_t asn_DEF_T3 = { T3_encode_der, T3_decode_xer, T3_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_T3_tags_1, sizeof(asn_DEF_T3_tags_1) @@ -404,6 +412,7 @@ asn_TYPE_descriptor_t asn_DEF_T3 = { asn_DEF_T3_all_tags_1, sizeof(asn_DEF_T3_all_tags_1) /sizeof(asn_DEF_T3_all_tags_1[0]), /* 4 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -456,6 +465,8 @@ T4_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_T5.uper_encoder; td->oer_decoder = asn_DEF_T5.oer_decoder; td->oer_encoder = asn_DEF_T5.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_T5.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_T5.per_constraints; td->elements = asn_DEF_T5.elements; @@ -525,8 +536,8 @@ asn_TYPE_descriptor_t asn_DEF_T4 = { T4_encode_der, T4_decode_xer, T4_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_T4_tags_1, sizeof(asn_DEF_T4_tags_1) @@ -534,6 +545,7 @@ asn_TYPE_descriptor_t asn_DEF_T4 = { asn_DEF_T4_tags_1, /* Same as above */ sizeof(asn_DEF_T4_tags_1) /sizeof(asn_DEF_T4_tags_1[0]), /* 3 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -586,6 +598,8 @@ T5_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_T6.uper_encoder; td->oer_decoder = asn_DEF_T6.oer_decoder; td->oer_encoder = asn_DEF_T6.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_T6.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_T6.per_constraints; td->elements = asn_DEF_T6.elements; @@ -654,8 +668,8 @@ asn_TYPE_descriptor_t asn_DEF_T5 = { T5_encode_der, T5_decode_xer, T5_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_T5_tags_1, sizeof(asn_DEF_T5_tags_1) @@ -663,6 +677,7 @@ asn_TYPE_descriptor_t asn_DEF_T5 = { asn_DEF_T5_tags_1, /* Same as above */ sizeof(asn_DEF_T5_tags_1) /sizeof(asn_DEF_T5_tags_1[0]), /* 2 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -715,6 +730,8 @@ T6_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_REAL.uper_encoder; td->oer_decoder = asn_DEF_REAL.oer_decoder; td->oer_encoder = asn_DEF_REAL.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_REAL.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_REAL.per_constraints; td->elements = asn_DEF_REAL.elements; @@ -782,8 +799,8 @@ asn_TYPE_descriptor_t asn_DEF_T6 = { T6_encode_der, T6_decode_xer, T6_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_T6_tags_1, sizeof(asn_DEF_T6_tags_1) @@ -791,6 +808,7 @@ asn_TYPE_descriptor_t asn_DEF_T6 = { asn_DEF_T6_tags_1, /* Same as above */ sizeof(asn_DEF_T6_tags_1) /sizeof(asn_DEF_T6_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -843,6 +861,8 @@ T_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_Ts.uper_encoder; td->oer_decoder = asn_DEF_Ts.oer_decoder; td->oer_encoder = asn_DEF_Ts.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_Ts.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_Ts.per_constraints; td->elements = asn_DEF_Ts.elements; @@ -912,8 +932,8 @@ asn_TYPE_descriptor_t asn_DEF_T = { T_encode_der, T_decode_xer, T_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_T_tags_1, sizeof(asn_DEF_T_tags_1) @@ -921,6 +941,7 @@ asn_TYPE_descriptor_t asn_DEF_T = { asn_DEF_T_tags_1, /* Same as above */ sizeof(asn_DEF_T_tags_1) /sizeof(asn_DEF_T_tags_1[0]), /* 3 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* Defined elsewhere */ 0 /* No specifics */ @@ -956,6 +977,7 @@ static asn_TYPE_member_t asn_MBR_Ts_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_T2, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "m1" @@ -965,6 +987,7 @@ static asn_TYPE_member_t asn_MBR_Ts_1[] = { .tag_mode = +1, /* EXPLICIT tag at current level */ .type = &asn_DEF_T3, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "m2" @@ -974,6 +997,7 @@ static asn_TYPE_member_t asn_MBR_Ts_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_T3, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "m3" @@ -1007,8 +1031,8 @@ asn_TYPE_descriptor_t asn_DEF_Ts = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Ts_tags_1, sizeof(asn_DEF_Ts_tags_1) @@ -1016,6 +1040,7 @@ asn_TYPE_descriptor_t asn_DEF_Ts = { asn_DEF_Ts_tags_1, /* Same as above */ sizeof(asn_DEF_Ts_tags_1) /sizeof(asn_DEF_Ts_tags_1[0]), /* 2 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_Ts_1, 3, /* Elements count */ diff --git a/tests/66-ref-simple-OK.asn1.-Pfwide-types b/tests/66-ref-simple-OK.asn1.-Pfwide-types index d5f1d4b4..8f370823 100644 --- a/tests/66-ref-simple-OK.asn1.-Pfwide-types +++ b/tests/66-ref-simple-OK.asn1.-Pfwide-types @@ -26,6 +26,7 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { .tag_mode = 0, .type = &asn_DEF_SimpleType, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "named" @@ -49,8 +50,8 @@ asn_TYPE_descriptor_t asn_DEF_T = { SET_OF_encode_der, SET_OF_decode_xer, SET_OF_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_T_tags_1, sizeof(asn_DEF_T_tags_1) @@ -58,6 +59,7 @@ asn_TYPE_descriptor_t asn_DEF_T = { asn_DEF_T_tags_1, /* Same as above */ sizeof(asn_DEF_T_tags_1) /sizeof(asn_DEF_T_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_T_1, 1, /* Single element */ @@ -119,6 +121,8 @@ SimpleType_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_ENUMERATED.uper_encoder; td->oer_decoder = asn_DEF_ENUMERATED.oer_decoder; td->oer_encoder = asn_DEF_ENUMERATED.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_ENUMERATED.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_ENUMERATED.per_constraints; td->elements = asn_DEF_ENUMERATED.elements; @@ -205,8 +209,8 @@ asn_TYPE_descriptor_t asn_DEF_SimpleType = { SimpleType_encode_der, SimpleType_decode_xer, SimpleType_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_SimpleType_tags_1, sizeof(asn_DEF_SimpleType_tags_1) @@ -214,6 +218,7 @@ asn_TYPE_descriptor_t asn_DEF_SimpleType = { asn_DEF_SimpleType_tags_1, /* Same as above */ sizeof(asn_DEF_SimpleType_tags_1) /sizeof(asn_DEF_SimpleType_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* Defined elsewhere */ &asn_SPC_SimpleType_specs_1 /* Additional specs */ diff --git a/tests/69-reserved-words-OK.asn1.-Pfwide-types b/tests/69-reserved-words-OK.asn1.-Pfwide-types index 0f5b3f8d..6debb972 100644 --- a/tests/69-reserved-words-OK.asn1.-Pfwide-types +++ b/tests/69-reserved-words-OK.asn1.-Pfwide-types @@ -103,8 +103,8 @@ asn_TYPE_descriptor_t asn_DEF_class_4 = { SET_encode_der, SET_decode_xer, SET_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_class_tags_4, sizeof(asn_DEF_class_tags_4) @@ -112,6 +112,7 @@ asn_TYPE_descriptor_t asn_DEF_class_4 = { asn_DEF_class_tags_4, /* Same as above */ sizeof(asn_DEF_class_tags_4) /sizeof(asn_DEF_class_tags_4[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ &asn_SPC_class_specs_4 /* Additional specs */ @@ -123,6 +124,7 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { .tag_mode = 0, .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "int" @@ -132,6 +134,7 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { .tag_mode = 0, .type = &asn_DEF_OCTET_STRING, .memb_constraints = memb_char_constraint_1, + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "char" @@ -141,6 +144,7 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { .tag_mode = 0, .type = &asn_DEF_class_4, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "class" @@ -150,6 +154,7 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { .tag_mode = 0, .type = &asn_DEF_REAL, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "double" @@ -183,8 +188,8 @@ asn_TYPE_descriptor_t asn_DEF_T = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_T_tags_1, sizeof(asn_DEF_T_tags_1) @@ -192,6 +197,7 @@ asn_TYPE_descriptor_t asn_DEF_T = { asn_DEF_T_tags_1, /* Same as above */ sizeof(asn_DEF_T_tags_1) /sizeof(asn_DEF_T_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_T_1, 4, /* Elements count */ diff --git a/tests/70-xer-test-OK.asn1.-Pfwide-types b/tests/70-xer-test-OK.asn1.-Pfwide-types index 5038fcd6..4211c0cb 100644 --- a/tests/70-xer-test-OK.asn1.-Pfwide-types +++ b/tests/70-xer-test-OK.asn1.-Pfwide-types @@ -83,6 +83,7 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_Sequence, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "sequence" @@ -92,6 +93,7 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_Set, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "set" @@ -101,6 +103,7 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_SequenceOf, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "sequenceOf" @@ -110,6 +113,7 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_ExtensibleSet, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "extensibleSet" @@ -119,6 +123,7 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_ExtensibleSequence, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "extensibleSequence" @@ -128,6 +133,7 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_ExtensibleSequence2, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "extensibleSequence2" @@ -137,6 +143,7 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_SetOfNULL, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "setOfNULL" @@ -146,6 +153,7 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_SetOfREAL, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "setOfREAL" @@ -155,6 +163,7 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_SetOfEnums, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "setOfEnums" @@ -164,6 +173,7 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_NamedSetOfNULL, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "namedSetOfNULL" @@ -173,6 +183,7 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_NamedSetOfREAL, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "namedSetOfREAL" @@ -182,6 +193,7 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_NamedSetOfEnums, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "namedSetOfEnums" @@ -191,6 +203,7 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_SeqOfZuka, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "seqOfZuka" @@ -200,6 +213,7 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_SetOfChoice, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "setOfChoice" @@ -209,6 +223,7 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_NamedSetOfChoice, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "namedSetOfChoice" @@ -251,13 +266,14 @@ asn_TYPE_descriptor_t asn_DEF_PDU = { CHOICE_encode_der, CHOICE_decode_xer, CHOICE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ CHOICE_outmost_tag, 0, /* No effective tags (pointer) */ 0, /* No effective tags (count) */ 0, /* No tags (pointer) */ 0, /* No tags (count) */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_PDU_1, 15, /* Elements count */ @@ -304,6 +320,7 @@ static asn_TYPE_member_t asn_MBR_Sequence_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "integer" @@ -313,6 +330,7 @@ static asn_TYPE_member_t asn_MBR_Sequence_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_Sequence, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "sequence" @@ -322,6 +340,7 @@ static asn_TYPE_member_t asn_MBR_Sequence_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_BIT_STRING, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "bits" @@ -331,6 +350,7 @@ static asn_TYPE_member_t asn_MBR_Sequence_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_UTF8String, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "string" @@ -364,8 +384,8 @@ asn_TYPE_descriptor_t asn_DEF_Sequence = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Sequence_tags_1, sizeof(asn_DEF_Sequence_tags_1) @@ -373,6 +393,7 @@ asn_TYPE_descriptor_t asn_DEF_Sequence = { asn_DEF_Sequence_tags_1, /* Same as above */ sizeof(asn_DEF_Sequence_tags_1) /sizeof(asn_DEF_Sequence_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_Sequence_1, 4, /* Elements count */ @@ -423,6 +444,7 @@ static asn_TYPE_member_t asn_MBR_Set_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_RELATIVE_OID, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "roid" @@ -432,6 +454,7 @@ static asn_TYPE_member_t asn_MBR_Set_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_OCTET_STRING, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "opaque" @@ -468,8 +491,8 @@ asn_TYPE_descriptor_t asn_DEF_Set = { SET_encode_der, SET_decode_xer, SET_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Set_tags_1, sizeof(asn_DEF_Set_tags_1) @@ -477,6 +500,7 @@ asn_TYPE_descriptor_t asn_DEF_Set = { asn_DEF_Set_tags_1, /* Same as above */ sizeof(asn_DEF_Set_tags_1) /sizeof(asn_DEF_Set_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_Set_1, 2, /* Elements count */ @@ -555,6 +579,8 @@ enum_4_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_ENUMERATED.uper_encoder; td->oer_decoder = asn_DEF_ENUMERATED.oer_decoder; td->oer_encoder = asn_DEF_ENUMERATED.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_ENUMERATED.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_ENUMERATED.per_constraints; td->elements = asn_DEF_ENUMERATED.elements; @@ -641,8 +667,8 @@ asn_TYPE_descriptor_t asn_DEF_enum_4 = { enum_4_encode_der, enum_4_decode_xer, enum_4_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_enum_tags_4, sizeof(asn_DEF_enum_tags_4) @@ -650,6 +676,7 @@ asn_TYPE_descriptor_t asn_DEF_enum_4 = { asn_DEF_enum_tags_4, /* Same as above */ sizeof(asn_DEF_enum_tags_4) /sizeof(asn_DEF_enum_tags_4[0]), /* 2 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* Defined elsewhere */ &asn_SPC_enum_specs_4 /* Additional specs */ @@ -661,6 +688,7 @@ static asn_TYPE_member_t asn_MBR_ExtensibleSet_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_UTF8String, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "string" @@ -670,6 +698,7 @@ static asn_TYPE_member_t asn_MBR_ExtensibleSet_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_enum_4, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "enum" @@ -706,8 +735,8 @@ asn_TYPE_descriptor_t asn_DEF_ExtensibleSet = { SET_encode_der, SET_decode_xer, SET_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_ExtensibleSet_tags_1, sizeof(asn_DEF_ExtensibleSet_tags_1) @@ -715,6 +744,7 @@ asn_TYPE_descriptor_t asn_DEF_ExtensibleSet = { asn_DEF_ExtensibleSet_tags_1, /* Same as above */ sizeof(asn_DEF_ExtensibleSet_tags_1) /sizeof(asn_DEF_ExtensibleSet_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_ExtensibleSet_1, 2, /* Elements count */ @@ -756,6 +786,7 @@ static asn_TYPE_member_t asn_MBR_ExtensibleSequence_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_UTF8String, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "string" @@ -765,6 +796,7 @@ static asn_TYPE_member_t asn_MBR_ExtensibleSequence_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "integer" @@ -774,6 +806,7 @@ static asn_TYPE_member_t asn_MBR_ExtensibleSequence_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_GeneralizedTime, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "gtime" @@ -806,8 +839,8 @@ asn_TYPE_descriptor_t asn_DEF_ExtensibleSequence = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_ExtensibleSequence_tags_1, sizeof(asn_DEF_ExtensibleSequence_tags_1) @@ -815,6 +848,7 @@ asn_TYPE_descriptor_t asn_DEF_ExtensibleSequence = { asn_DEF_ExtensibleSequence_tags_1, /* Same as above */ sizeof(asn_DEF_ExtensibleSequence_tags_1) /sizeof(asn_DEF_ExtensibleSequence_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_ExtensibleSequence_1, 3, /* Elements count */ @@ -854,6 +888,7 @@ static asn_TYPE_member_t asn_MBR_ExtensibleSequence2_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_UTF8String, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "string" @@ -863,6 +898,7 @@ static asn_TYPE_member_t asn_MBR_ExtensibleSequence2_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "integer" @@ -894,8 +930,8 @@ asn_TYPE_descriptor_t asn_DEF_ExtensibleSequence2 = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_ExtensibleSequence2_tags_1, sizeof(asn_DEF_ExtensibleSequence2_tags_1) @@ -903,6 +939,7 @@ asn_TYPE_descriptor_t asn_DEF_ExtensibleSequence2 = { asn_DEF_ExtensibleSequence2_tags_1, /* Same as above */ sizeof(asn_DEF_ExtensibleSequence2_tags_1) /sizeof(asn_DEF_ExtensibleSequence2_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_ExtensibleSequence2_1, 2, /* Elements count */ @@ -937,6 +974,7 @@ static asn_TYPE_member_t asn_MBR_SetOfNULL_1[] = { .tag_mode = 0, .type = &asn_DEF_NULL, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "" @@ -960,8 +998,8 @@ asn_TYPE_descriptor_t asn_DEF_SetOfNULL = { SET_OF_encode_der, SET_OF_decode_xer, SET_OF_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_SetOfNULL_tags_1, sizeof(asn_DEF_SetOfNULL_tags_1) @@ -969,6 +1007,7 @@ asn_TYPE_descriptor_t asn_DEF_SetOfNULL = { asn_DEF_SetOfNULL_tags_1, /* Same as above */ sizeof(asn_DEF_SetOfNULL_tags_1) /sizeof(asn_DEF_SetOfNULL_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_SetOfNULL_1, 1, /* Single element */ @@ -1003,6 +1042,7 @@ static asn_TYPE_member_t asn_MBR_SetOfREAL_1[] = { .tag_mode = 0, .type = &asn_DEF_REAL, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "" @@ -1026,8 +1066,8 @@ asn_TYPE_descriptor_t asn_DEF_SetOfREAL = { SET_OF_encode_der, SET_OF_decode_xer, SET_OF_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_SetOfREAL_tags_1, sizeof(asn_DEF_SetOfREAL_tags_1) @@ -1035,6 +1075,7 @@ asn_TYPE_descriptor_t asn_DEF_SetOfREAL = { asn_DEF_SetOfREAL_tags_1, /* Same as above */ sizeof(asn_DEF_SetOfREAL_tags_1) /sizeof(asn_DEF_SetOfREAL_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_SetOfREAL_1, 1, /* Single element */ @@ -1096,6 +1137,8 @@ Member_2_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_ENUMERATED.uper_encoder; td->oer_decoder = asn_DEF_ENUMERATED.oer_decoder; td->oer_encoder = asn_DEF_ENUMERATED.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_ENUMERATED.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_ENUMERATED.per_constraints; td->elements = asn_DEF_ENUMERATED.elements; @@ -1181,8 +1224,8 @@ asn_TYPE_descriptor_t asn_DEF_Member_2 = { Member_2_encode_der, Member_2_decode_xer, Member_2_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Member_tags_2, sizeof(asn_DEF_Member_tags_2) @@ -1190,6 +1233,7 @@ asn_TYPE_descriptor_t asn_DEF_Member_2 = { asn_DEF_Member_tags_2, /* Same as above */ sizeof(asn_DEF_Member_tags_2) /sizeof(asn_DEF_Member_tags_2[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* Defined elsewhere */ &asn_SPC_Member_specs_2 /* Additional specs */ @@ -1201,6 +1245,7 @@ static asn_TYPE_member_t asn_MBR_SetOfEnums_1[] = { .tag_mode = 0, .type = &asn_DEF_Member_2, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "" @@ -1224,8 +1269,8 @@ asn_TYPE_descriptor_t asn_DEF_SetOfEnums = { SET_OF_encode_der, SET_OF_decode_xer, SET_OF_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_SetOfEnums_tags_1, sizeof(asn_DEF_SetOfEnums_tags_1) @@ -1233,6 +1278,7 @@ asn_TYPE_descriptor_t asn_DEF_SetOfEnums = { asn_DEF_SetOfEnums_tags_1, /* Same as above */ sizeof(asn_DEF_SetOfEnums_tags_1) /sizeof(asn_DEF_SetOfEnums_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_SetOfEnums_1, 1, /* Single element */ @@ -1267,6 +1313,7 @@ static asn_TYPE_member_t asn_MBR_NamedSetOfNULL_1[] = { .tag_mode = 0, .type = &asn_DEF_NULL, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "y" @@ -1290,8 +1337,8 @@ asn_TYPE_descriptor_t asn_DEF_NamedSetOfNULL = { SET_OF_encode_der, SET_OF_decode_xer, SET_OF_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_NamedSetOfNULL_tags_1, sizeof(asn_DEF_NamedSetOfNULL_tags_1) @@ -1299,6 +1346,7 @@ asn_TYPE_descriptor_t asn_DEF_NamedSetOfNULL = { asn_DEF_NamedSetOfNULL_tags_1, /* Same as above */ sizeof(asn_DEF_NamedSetOfNULL_tags_1) /sizeof(asn_DEF_NamedSetOfNULL_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_NamedSetOfNULL_1, 1, /* Single element */ @@ -1333,6 +1381,7 @@ static asn_TYPE_member_t asn_MBR_NamedSetOfREAL_1[] = { .tag_mode = 0, .type = &asn_DEF_REAL, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "name" @@ -1356,8 +1405,8 @@ asn_TYPE_descriptor_t asn_DEF_NamedSetOfREAL = { SET_OF_encode_der, SET_OF_decode_xer, SET_OF_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_NamedSetOfREAL_tags_1, sizeof(asn_DEF_NamedSetOfREAL_tags_1) @@ -1365,6 +1414,7 @@ asn_TYPE_descriptor_t asn_DEF_NamedSetOfREAL = { asn_DEF_NamedSetOfREAL_tags_1, /* Same as above */ sizeof(asn_DEF_NamedSetOfREAL_tags_1) /sizeof(asn_DEF_NamedSetOfREAL_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_NamedSetOfREAL_1, 1, /* Single element */ @@ -1426,6 +1476,8 @@ name_2_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_ENUMERATED.uper_encoder; td->oer_decoder = asn_DEF_ENUMERATED.oer_decoder; td->oer_encoder = asn_DEF_ENUMERATED.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_ENUMERATED.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_ENUMERATED.per_constraints; td->elements = asn_DEF_ENUMERATED.elements; @@ -1511,8 +1563,8 @@ asn_TYPE_descriptor_t asn_DEF_name_2 = { name_2_encode_der, name_2_decode_xer, name_2_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_name_tags_2, sizeof(asn_DEF_name_tags_2) @@ -1520,6 +1572,7 @@ asn_TYPE_descriptor_t asn_DEF_name_2 = { asn_DEF_name_tags_2, /* Same as above */ sizeof(asn_DEF_name_tags_2) /sizeof(asn_DEF_name_tags_2[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* Defined elsewhere */ &asn_SPC_name_specs_2 /* Additional specs */ @@ -1531,6 +1584,7 @@ static asn_TYPE_member_t asn_MBR_NamedSetOfEnums_1[] = { .tag_mode = 0, .type = &asn_DEF_name_2, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "name" @@ -1554,8 +1608,8 @@ asn_TYPE_descriptor_t asn_DEF_NamedSetOfEnums = { SET_OF_encode_der, SET_OF_decode_xer, SET_OF_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_NamedSetOfEnums_tags_1, sizeof(asn_DEF_NamedSetOfEnums_tags_1) @@ -1563,6 +1617,7 @@ asn_TYPE_descriptor_t asn_DEF_NamedSetOfEnums = { asn_DEF_NamedSetOfEnums_tags_1, /* Same as above */ sizeof(asn_DEF_NamedSetOfEnums_tags_1) /sizeof(asn_DEF_NamedSetOfEnums_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_NamedSetOfEnums_1, 1, /* Single element */ @@ -1597,6 +1652,7 @@ static asn_TYPE_member_t asn_MBR_SequenceOf_1[] = { .tag_mode = 0, .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "id" @@ -1620,8 +1676,8 @@ asn_TYPE_descriptor_t asn_DEF_SequenceOf = { SEQUENCE_OF_encode_der, SEQUENCE_OF_decode_xer, SEQUENCE_OF_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_SequenceOf_tags_1, sizeof(asn_DEF_SequenceOf_tags_1) @@ -1629,6 +1685,7 @@ asn_TYPE_descriptor_t asn_DEF_SequenceOf = { asn_DEF_SequenceOf_tags_1, /* Same as above */ sizeof(asn_DEF_SequenceOf_tags_1) /sizeof(asn_DEF_SequenceOf_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_SequenceOf_1, 1, /* Single element */ @@ -1663,6 +1720,7 @@ static asn_TYPE_member_t asn_MBR_SeqOfZuka_1[] = { .tag_mode = 0, .type = &asn_DEF_NULL, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "zuka" @@ -1686,8 +1744,8 @@ asn_TYPE_descriptor_t asn_DEF_SeqOfZuka = { SEQUENCE_OF_encode_der, SEQUENCE_OF_decode_xer, SEQUENCE_OF_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_SeqOfZuka_tags_1, sizeof(asn_DEF_SeqOfZuka_tags_1) @@ -1695,6 +1753,7 @@ asn_TYPE_descriptor_t asn_DEF_SeqOfZuka = { asn_DEF_SeqOfZuka_tags_1, /* Same as above */ sizeof(asn_DEF_SeqOfZuka_tags_1) /sizeof(asn_DEF_SeqOfZuka_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_SeqOfZuka_1, 1, /* Single element */ @@ -1736,6 +1795,7 @@ static asn_TYPE_member_t asn_MBR_SetOfChoice_1[] = { .tag_mode = 0, .type = &asn_DEF_SimpleChoice, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "" @@ -1759,8 +1819,8 @@ asn_TYPE_descriptor_t asn_DEF_SetOfChoice = { SET_OF_encode_der, SET_OF_decode_xer, SET_OF_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_SetOfChoice_tags_1, sizeof(asn_DEF_SetOfChoice_tags_1) @@ -1768,6 +1828,7 @@ asn_TYPE_descriptor_t asn_DEF_SetOfChoice = { asn_DEF_SetOfChoice_tags_1, /* Same as above */ sizeof(asn_DEF_SetOfChoice_tags_1) /sizeof(asn_DEF_SetOfChoice_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_SetOfChoice_1, 1, /* Single element */ @@ -1809,6 +1870,7 @@ static asn_TYPE_member_t asn_MBR_NamedSetOfChoice_1[] = { .tag_mode = 0, .type = &asn_DEF_SimpleChoice, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "whatever" @@ -1832,8 +1894,8 @@ asn_TYPE_descriptor_t asn_DEF_NamedSetOfChoice = { SET_OF_encode_der, SET_OF_decode_xer, SET_OF_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_NamedSetOfChoice_tags_1, sizeof(asn_DEF_NamedSetOfChoice_tags_1) @@ -1841,6 +1903,7 @@ asn_TYPE_descriptor_t asn_DEF_NamedSetOfChoice = { asn_DEF_NamedSetOfChoice_tags_1, /* Same as above */ sizeof(asn_DEF_NamedSetOfChoice_tags_1) /sizeof(asn_DEF_NamedSetOfChoice_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_NamedSetOfChoice_1, 1, /* Single element */ @@ -1887,6 +1950,7 @@ static asn_TYPE_member_t asn_MBR_SimpleChoice_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_NULL, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "a" @@ -1896,6 +1960,7 @@ static asn_TYPE_member_t asn_MBR_SimpleChoice_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "b" @@ -1925,13 +1990,14 @@ asn_TYPE_descriptor_t asn_DEF_SimpleChoice = { CHOICE_encode_der, CHOICE_decode_xer, CHOICE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ CHOICE_outmost_tag, 0, /* No effective tags (pointer) */ 0, /* No effective tags (count) */ 0, /* No tags (pointer) */ 0, /* No tags (count) */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_SimpleChoice_1, 2, /* Elements count */ diff --git a/tests/72-same-names-OK.asn1.-Pfwide-types b/tests/72-same-names-OK.asn1.-Pfwide-types index bcf07a4d..2f601c5a 100644 --- a/tests/72-same-names-OK.asn1.-Pfwide-types +++ b/tests/72-same-names-OK.asn1.-Pfwide-types @@ -38,6 +38,7 @@ static asn_TYPE_member_t asn_MBR_Member_2[] = { .tag_mode = 0, .type = &asn_DEF_Type1, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "t1" @@ -47,6 +48,7 @@ static asn_TYPE_member_t asn_MBR_Member_2[] = { .tag_mode = 0, .type = &asn_DEF_Type2, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "t2" @@ -80,8 +82,8 @@ asn_TYPE_descriptor_t asn_DEF_Member_2 = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Member_tags_2, sizeof(asn_DEF_Member_tags_2) @@ -89,6 +91,7 @@ asn_TYPE_descriptor_t asn_DEF_Member_2 = { asn_DEF_Member_tags_2, /* Same as above */ sizeof(asn_DEF_Member_tags_2) /sizeof(asn_DEF_Member_tags_2[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_Member_2, 2, /* Elements count */ @@ -101,6 +104,7 @@ static asn_TYPE_member_t asn_MBR_Type_1[] = { .tag_mode = 0, .type = &asn_DEF_Member_2, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "" @@ -124,8 +128,8 @@ asn_TYPE_descriptor_t asn_DEF_Type = { SET_OF_encode_der, SET_OF_decode_xer, SET_OF_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Type_tags_1, sizeof(asn_DEF_Type_tags_1) @@ -133,6 +137,7 @@ asn_TYPE_descriptor_t asn_DEF_Type = { asn_DEF_Type_tags_1, /* Same as above */ sizeof(asn_DEF_Type_tags_1) /sizeof(asn_DEF_Type_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_Type_1, 1, /* Single element */ @@ -188,6 +193,7 @@ static asn_TYPE_member_t asn_MBR_another_name_3[] = { .tag_mode = 0, .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "a" @@ -197,6 +203,7 @@ static asn_TYPE_member_t asn_MBR_another_name_3[] = { .tag_mode = 0, .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "b" @@ -229,8 +236,8 @@ asn_TYPE_descriptor_t asn_DEF_another_name_3 = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_another_name_tags_3, sizeof(asn_DEF_another_name_tags_3) @@ -238,6 +245,7 @@ asn_TYPE_descriptor_t asn_DEF_another_name_3 = { asn_DEF_another_name_tags_3, /* Same as above */ sizeof(asn_DEF_another_name_tags_3) /sizeof(asn_DEF_another_name_tags_3[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_another_name_3, 2, /* Elements count */ @@ -250,6 +258,7 @@ static asn_TYPE_member_t asn_MBR_one_name_2[] = { .tag_mode = 0, .type = &asn_DEF_another_name_3, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "another-name" @@ -279,13 +288,14 @@ asn_TYPE_descriptor_t asn_DEF_one_name_2 = { CHOICE_encode_der, CHOICE_decode_xer, CHOICE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ CHOICE_outmost_tag, 0, /* No effective tags (pointer) */ 0, /* No effective tags (count) */ 0, /* No tags (pointer) */ 0, /* No tags (count) */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_one_name_2, 1, /* Elements count */ @@ -298,6 +308,7 @@ static asn_TYPE_member_t asn_MBR_Type1_1[] = { .tag_mode = 0, .type = &asn_DEF_one_name_2, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "one-name" @@ -328,8 +339,8 @@ asn_TYPE_descriptor_t asn_DEF_Type1 = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Type1_tags_1, sizeof(asn_DEF_Type1_tags_1) @@ -337,6 +348,7 @@ asn_TYPE_descriptor_t asn_DEF_Type1 = { asn_DEF_Type1_tags_1, /* Same as above */ sizeof(asn_DEF_Type1_tags_1) /sizeof(asn_DEF_Type1_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_Type1_1, 1, /* Elements count */ @@ -489,6 +501,7 @@ static asn_TYPE_member_t asn_MBR_another_name_3[] = { .tag_mode = 0, .type = &asn_DEF_BIT_STRING, .memb_constraints = memb_a_constraint_3, + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "a" @@ -498,6 +511,7 @@ static asn_TYPE_member_t asn_MBR_another_name_3[] = { .tag_mode = 0, .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "b" @@ -530,8 +544,8 @@ asn_TYPE_descriptor_t asn_DEF_another_name_3 = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_another_name_tags_3, sizeof(asn_DEF_another_name_tags_3) @@ -539,6 +553,7 @@ asn_TYPE_descriptor_t asn_DEF_another_name_3 = { asn_DEF_another_name_tags_3, /* Same as above */ sizeof(asn_DEF_another_name_tags_3) /sizeof(asn_DEF_another_name_tags_3[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_another_name_3, 2, /* Elements count */ @@ -551,6 +566,7 @@ static asn_TYPE_member_t asn_MBR_one_name_2[] = { .tag_mode = 0, .type = &asn_DEF_another_name_3, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "another-name" @@ -582,8 +598,8 @@ asn_TYPE_descriptor_t asn_DEF_one_name_2 = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_one_name_tags_2, sizeof(asn_DEF_one_name_tags_2) @@ -591,6 +607,7 @@ asn_TYPE_descriptor_t asn_DEF_one_name_2 = { asn_DEF_one_name_tags_2, /* Same as above */ sizeof(asn_DEF_one_name_tags_2) /sizeof(asn_DEF_one_name_tags_2[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_one_name_2, 1, /* Elements count */ @@ -603,6 +620,7 @@ static asn_TYPE_member_t asn_MBR_another_name_8[] = { .tag_mode = 0, .type = &asn_DEF_BIT_STRING, .memb_constraints = memb_a_constraint_8, + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "a" @@ -612,6 +630,7 @@ static asn_TYPE_member_t asn_MBR_another_name_8[] = { .tag_mode = 0, .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "b" @@ -644,8 +663,8 @@ asn_TYPE_descriptor_t asn_DEF_another_name_8 = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_another_name_tags_8, sizeof(asn_DEF_another_name_tags_8) @@ -653,6 +672,7 @@ asn_TYPE_descriptor_t asn_DEF_another_name_8 = { asn_DEF_another_name_tags_8, /* Same as above */ sizeof(asn_DEF_another_name_tags_8) /sizeof(asn_DEF_another_name_tags_8[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_another_name_8, 2, /* Elements count */ @@ -665,6 +685,7 @@ static asn_TYPE_member_t asn_MBR_two_name_7[] = { .tag_mode = 0, .type = &asn_DEF_another_name_8, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "another-name" @@ -701,8 +722,8 @@ asn_TYPE_descriptor_t asn_DEF_two_name_7 = { SET_encode_der, SET_decode_xer, SET_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_two_name_tags_7, sizeof(asn_DEF_two_name_tags_7) @@ -710,6 +731,7 @@ asn_TYPE_descriptor_t asn_DEF_two_name_7 = { asn_DEF_two_name_tags_7, /* Same as above */ sizeof(asn_DEF_two_name_tags_7) /sizeof(asn_DEF_two_name_tags_7[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_two_name_7, 1, /* Elements count */ @@ -722,6 +744,7 @@ static asn_TYPE_member_t asn_MBR_Type2_1[] = { .tag_mode = 0, .type = &asn_DEF_one_name_2, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "one-name" @@ -731,6 +754,7 @@ static asn_TYPE_member_t asn_MBR_Type2_1[] = { .tag_mode = 0, .type = &asn_DEF_two_name_7, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "two-name" @@ -760,13 +784,14 @@ asn_TYPE_descriptor_t asn_DEF_Type2 = { CHOICE_encode_der, CHOICE_decode_xer, CHOICE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ CHOICE_outmost_tag, 0, /* No effective tags (pointer) */ 0, /* No effective tags (count) */ 0, /* No tags (pointer) */ 0, /* No tags (count) */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_Type2_1, 2, /* Elements count */ diff --git a/tests/73-circular-OK.asn1.-Pfwide-types b/tests/73-circular-OK.asn1.-Pfwide-types index e64d2af0..e675d08a 100644 --- a/tests/73-circular-OK.asn1.-Pfwide-types +++ b/tests/73-circular-OK.asn1.-Pfwide-types @@ -39,6 +39,7 @@ static asn_TYPE_member_t asn_MBR_data_2[] = { .tag_mode = 0, .type = &asn_DEF_EpytRef, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "" @@ -63,8 +64,8 @@ asn_TYPE_descriptor_t asn_DEF_data_2 = { SEQUENCE_OF_encode_der, SEQUENCE_OF_decode_xer, SEQUENCE_OF_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_data_tags_2, sizeof(asn_DEF_data_tags_2) @@ -72,6 +73,7 @@ asn_TYPE_descriptor_t asn_DEF_data_2 = { asn_DEF_data_tags_2, /* Same as above */ sizeof(asn_DEF_data_tags_2) /sizeof(asn_DEF_data_tags_2[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_data_2, 1, /* Single element */ @@ -84,6 +86,7 @@ static asn_TYPE_member_t asn_MBR_Type_1[] = { .tag_mode = 0, .type = &asn_DEF_data_2, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "data" @@ -114,8 +117,8 @@ asn_TYPE_descriptor_t asn_DEF_Type = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Type_tags_1, sizeof(asn_DEF_Type_tags_1) @@ -123,6 +126,7 @@ asn_TYPE_descriptor_t asn_DEF_Type = { asn_DEF_Type_tags_1, /* Same as above */ sizeof(asn_DEF_Type_tags_1) /sizeof(asn_DEF_Type_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_Type_1, 1, /* Elements count */ @@ -176,6 +180,8 @@ EpytRef_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_Epyt.uper_encoder; td->oer_decoder = asn_DEF_Epyt.oer_decoder; td->oer_encoder = asn_DEF_Epyt.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_Epyt.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_Epyt.per_constraints; td->elements = asn_DEF_Epyt.elements; @@ -243,8 +249,8 @@ asn_TYPE_descriptor_t asn_DEF_EpytRef = { EpytRef_encode_der, EpytRef_decode_xer, EpytRef_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_EpytRef_tags_1, sizeof(asn_DEF_EpytRef_tags_1) @@ -252,6 +258,7 @@ asn_TYPE_descriptor_t asn_DEF_EpytRef = { asn_DEF_EpytRef_tags_1, /* Same as above */ sizeof(asn_DEF_EpytRef_tags_1) /sizeof(asn_DEF_EpytRef_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* Defined elsewhere */ 0 /* No specifics */ @@ -302,6 +309,7 @@ static asn_TYPE_member_t asn_MBR_stype_2[] = { .tag_mode = 0, .type = &asn_DEF_Type, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "" @@ -326,8 +334,8 @@ asn_TYPE_descriptor_t asn_DEF_stype_2 = { SET_OF_encode_der, SET_OF_decode_xer, SET_OF_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_stype_tags_2, sizeof(asn_DEF_stype_tags_2) @@ -335,6 +343,7 @@ asn_TYPE_descriptor_t asn_DEF_stype_2 = { asn_DEF_stype_tags_2, /* Same as above */ sizeof(asn_DEF_stype_tags_2) /sizeof(asn_DEF_stype_tags_2[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_stype_2, 1, /* Single element */ @@ -347,6 +356,7 @@ static asn_TYPE_member_t asn_MBR_Epyt_1[] = { .tag_mode = 0, .type = &asn_DEF_stype_2, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "stype" @@ -356,6 +366,7 @@ static asn_TYPE_member_t asn_MBR_Epyt_1[] = { .tag_mode = 0, .type = &asn_DEF_Type, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "type" @@ -365,6 +376,7 @@ static asn_TYPE_member_t asn_MBR_Epyt_1[] = { .tag_mode = 0, .type = &asn_DEF_Ypet, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "ypet" @@ -397,8 +409,8 @@ asn_TYPE_descriptor_t asn_DEF_Epyt = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Epyt_tags_1, sizeof(asn_DEF_Epyt_tags_1) @@ -406,6 +418,7 @@ asn_TYPE_descriptor_t asn_DEF_Epyt = { asn_DEF_Epyt_tags_1, /* Same as above */ sizeof(asn_DEF_Epyt_tags_1) /sizeof(asn_DEF_Epyt_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_Epyt_1, 3, /* Elements count */ @@ -578,6 +591,7 @@ static asn_TYPE_member_t asn_MBR_senums_4[] = { .tag_mode = 0, .type = &asn_DEF_EnumType, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "" @@ -602,8 +616,8 @@ asn_TYPE_descriptor_t asn_DEF_senums_4 = { SET_OF_encode_der, SET_OF_decode_xer, SET_OF_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_senums_tags_4, sizeof(asn_DEF_senums_tags_4) @@ -611,6 +625,7 @@ asn_TYPE_descriptor_t asn_DEF_senums_4 = { asn_DEF_senums_tags_4, /* Same as above */ sizeof(asn_DEF_senums_tags_4) /sizeof(asn_DEF_senums_tags_4[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_senums_4, 1, /* Single element */ @@ -623,6 +638,7 @@ static asn_TYPE_member_t asn_MBR_Ypet_1[] = { .tag_mode = 0, .type = &asn_DEF_Epyt, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "epyt" @@ -632,6 +648,7 @@ static asn_TYPE_member_t asn_MBR_Ypet_1[] = { .tag_mode = 0, .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = asn_DFL_3_set_7, /* DEFAULT 7 */ .name = "plain" @@ -641,6 +658,7 @@ static asn_TYPE_member_t asn_MBR_Ypet_1[] = { .tag_mode = 0, .type = &asn_DEF_senums_4, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "senums" @@ -650,6 +668,7 @@ static asn_TYPE_member_t asn_MBR_Ypet_1[] = { .tag_mode = +1, /* EXPLICIT tag at current level */ .type = &asn_DEF_IA5String, .memb_constraints = memb_patest1_constraint_1, + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "patest1" @@ -659,6 +678,7 @@ static asn_TYPE_member_t asn_MBR_Ypet_1[] = { .tag_mode = +1, /* EXPLICIT tag at current level */ .type = &asn_DEF_IA5String, .memb_constraints = memb_patest2_constraint_1, + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "patest2" @@ -698,8 +718,8 @@ asn_TYPE_descriptor_t asn_DEF_Ypet = { SET_encode_der, SET_decode_xer, SET_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Ypet_tags_1, sizeof(asn_DEF_Ypet_tags_1) @@ -707,6 +727,7 @@ asn_TYPE_descriptor_t asn_DEF_Ypet = { asn_DEF_Ypet_tags_1, /* Same as above */ sizeof(asn_DEF_Ypet_tags_1) /sizeof(asn_DEF_Ypet_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_Ypet_1, 5, /* Elements count */ @@ -767,6 +788,8 @@ EnumType_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_ENUMERATED.uper_encoder; td->oer_decoder = asn_DEF_ENUMERATED.oer_decoder; td->oer_encoder = asn_DEF_ENUMERATED.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_ENUMERATED.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_ENUMERATED.per_constraints; td->elements = asn_DEF_ENUMERATED.elements; @@ -851,8 +874,8 @@ asn_TYPE_descriptor_t asn_DEF_EnumType = { EnumType_encode_der, EnumType_decode_xer, EnumType_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_EnumType_tags_1, sizeof(asn_DEF_EnumType_tags_1) @@ -860,6 +883,7 @@ asn_TYPE_descriptor_t asn_DEF_EnumType = { asn_DEF_EnumType_tags_1, /* Same as above */ sizeof(asn_DEF_EnumType_tags_1) /sizeof(asn_DEF_EnumType_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* Defined elsewhere */ &asn_SPC_EnumType_specs_1 /* Additional specs */ diff --git a/tests/84-param-tags-OK.asn1.-Pfwide-types b/tests/84-param-tags-OK.asn1.-Pfwide-types index 73dc8bc4..682621b6 100644 --- a/tests/84-param-tags-OK.asn1.-Pfwide-types +++ b/tests/84-param-tags-OK.asn1.-Pfwide-types @@ -79,6 +79,7 @@ static asn_TYPE_member_t asn_MBR_TestType_16P0_1[] = { .tag_mode = 0, .type = &asn_DEF_NativeInteger, .memb_constraints = memb_common_constraint_1, + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = asn_DFL_2_set_0, /* DEFAULT 0 */ .name = "common" @@ -109,8 +110,8 @@ asn_TYPE_descriptor_t asn_DEF_TestType_16P0 = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_TestType_16P0_tags_1, sizeof(asn_DEF_TestType_16P0_tags_1) @@ -118,6 +119,7 @@ asn_TYPE_descriptor_t asn_DEF_TestType_16P0 = { asn_DEF_TestType_16P0_tags_1, /* Same as above */ sizeof(asn_DEF_TestType_16P0_tags_1) /sizeof(asn_DEF_TestType_16P0_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_TestType_16P0_1, 1, /* Elements count */ @@ -148,6 +150,7 @@ static asn_TYPE_member_t asn_MBR_TestType_16P1_3[] = { .tag_mode = 0, .type = &asn_DEF_BOOLEAN, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = asn_DFL_4_set_0, /* DEFAULT 0 */ .name = "common" @@ -178,8 +181,8 @@ asn_TYPE_descriptor_t asn_DEF_TestType_16P1 = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_TestType_16P1_tags_3, sizeof(asn_DEF_TestType_16P1_tags_3) @@ -187,6 +190,7 @@ asn_TYPE_descriptor_t asn_DEF_TestType_16P1 = { asn_DEF_TestType_16P1_tags_3, /* Same as above */ sizeof(asn_DEF_TestType_16P1_tags_3) /sizeof(asn_DEF_TestType_16P1_tags_3[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_TestType_16P1_3, 1, /* Elements count */ @@ -232,6 +236,7 @@ static asn_TYPE_member_t asn_MBR_TestChoice_1[] = { .tag_mode = 0, .type = &asn_DEF_TestType_16P0, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "type1" @@ -241,6 +246,7 @@ static asn_TYPE_member_t asn_MBR_TestChoice_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_TestType_16P1, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "type2" @@ -270,13 +276,14 @@ asn_TYPE_descriptor_t asn_DEF_TestChoice = { CHOICE_encode_der, CHOICE_decode_xer, CHOICE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ CHOICE_outmost_tag, 0, /* No effective tags (pointer) */ 0, /* No effective tags (count) */ 0, /* No tags (pointer) */ 0, /* No tags (count) */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_TestChoice_1, 2, /* Elements count */ @@ -371,6 +378,7 @@ static asn_TYPE_member_t asn_MBR_AutoType_34P0_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_NativeInteger, .memb_constraints = memb_common_constraint_1, + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "common" @@ -401,8 +409,8 @@ asn_TYPE_descriptor_t asn_DEF_AutoType_34P0 = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_AutoType_34P0_tags_1, sizeof(asn_DEF_AutoType_34P0_tags_1) @@ -410,6 +418,7 @@ asn_TYPE_descriptor_t asn_DEF_AutoType_34P0 = { asn_DEF_AutoType_34P0_tags_1, /* Same as above */ sizeof(asn_DEF_AutoType_34P0_tags_1) /sizeof(asn_DEF_AutoType_34P0_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_AutoType_34P0_1, 1, /* Elements count */ @@ -422,6 +431,7 @@ static asn_TYPE_member_t asn_MBR_AutoType_34P1_3[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_BOOLEAN, .memb_constraints = memb_common_constraint_3, + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "common" @@ -452,8 +462,8 @@ asn_TYPE_descriptor_t asn_DEF_AutoType_34P1 = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_AutoType_34P1_tags_3, sizeof(asn_DEF_AutoType_34P1_tags_3) @@ -461,6 +471,7 @@ asn_TYPE_descriptor_t asn_DEF_AutoType_34P1 = { asn_DEF_AutoType_34P1_tags_3, /* Same as above */ sizeof(asn_DEF_AutoType_34P1_tags_3) /sizeof(asn_DEF_AutoType_34P1_tags_3[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_AutoType_34P1_3, 1, /* Elements count */ @@ -506,6 +517,7 @@ static asn_TYPE_member_t asn_MBR_AutoChoice_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_AutoType_34P0, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "type1" @@ -515,6 +527,7 @@ static asn_TYPE_member_t asn_MBR_AutoChoice_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_AutoType_34P1, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "type2" @@ -544,13 +557,14 @@ asn_TYPE_descriptor_t asn_DEF_AutoChoice = { CHOICE_encode_der, CHOICE_decode_xer, CHOICE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ CHOICE_outmost_tag, 0, /* No effective tags (pointer) */ 0, /* No effective tags (count) */ 0, /* No tags (pointer) */ 0, /* No tags (count) */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_AutoChoice_1, 2, /* Elements count */ diff --git a/tests/88-integer-enum-OK.asn1.-Pfwide-types b/tests/88-integer-enum-OK.asn1.-Pfwide-types index d387aa72..6fc58f54 100644 --- a/tests/88-integer-enum-OK.asn1.-Pfwide-types +++ b/tests/88-integer-enum-OK.asn1.-Pfwide-types @@ -52,6 +52,8 @@ T_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_INTEGER.uper_encoder; td->oer_decoder = asn_DEF_INTEGER.oer_decoder; td->oer_encoder = asn_DEF_INTEGER.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_INTEGER.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_INTEGER.per_constraints; td->elements = asn_DEF_INTEGER.elements; @@ -119,8 +121,8 @@ asn_TYPE_descriptor_t asn_DEF_T = { T_encode_der, T_decode_xer, T_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_T_tags_1, sizeof(asn_DEF_T_tags_1) @@ -128,6 +130,7 @@ asn_TYPE_descriptor_t asn_DEF_T = { asn_DEF_T_tags_1, /* Same as above */ sizeof(asn_DEF_T_tags_1) /sizeof(asn_DEF_T_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* Defined elsewhere */ 0 /* No specifics */ diff --git a/tests/89-bit-string-enum-OK.asn1.-Pfcompound-names b/tests/89-bit-string-enum-OK.asn1.-Pfcompound-names index f796c514..8d932968 100644 --- a/tests/89-bit-string-enum-OK.asn1.-Pfcompound-names +++ b/tests/89-bit-string-enum-OK.asn1.-Pfcompound-names @@ -39,6 +39,7 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { .tag_mode = 0, .type = &asn_DEF_BIT_STRING, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "bs" @@ -67,13 +68,14 @@ asn_TYPE_descriptor_t asn_DEF_T = { CHOICE_encode_der, CHOICE_decode_xer, CHOICE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ CHOICE_outmost_tag, 0, /* No effective tags (pointer) */ 0, /* No effective tags (count) */ 0, /* No tags (pointer) */ 0, /* No tags (count) */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_T_1, 1, /* Elements count */ diff --git a/tests/89-bit-string-enum-OK.asn1.-Pfwide-types b/tests/89-bit-string-enum-OK.asn1.-Pfwide-types index 45aa9f8b..0a3aa76e 100644 --- a/tests/89-bit-string-enum-OK.asn1.-Pfwide-types +++ b/tests/89-bit-string-enum-OK.asn1.-Pfwide-types @@ -39,6 +39,7 @@ static asn_TYPE_member_t asn_MBR_T_1[] = { .tag_mode = 0, .type = &asn_DEF_BIT_STRING, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "bs" @@ -67,13 +68,14 @@ asn_TYPE_descriptor_t asn_DEF_T = { CHOICE_encode_der, CHOICE_decode_xer, CHOICE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ CHOICE_outmost_tag, 0, /* No effective tags (pointer) */ 0, /* No effective tags (count) */ 0, /* No tags (pointer) */ 0, /* No tags (count) */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_T_1, 1, /* Elements count */ diff --git a/tests/90-cond-int-type-OK.asn1.-P b/tests/90-cond-int-type-OK.asn1.-P index f1e60ca6..c446233b 100644 --- a/tests/90-cond-int-type-OK.asn1.-P +++ b/tests/90-cond-int-type-OK.asn1.-P @@ -45,6 +45,8 @@ CN_IntegerUnlimited_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_NativeInteger.uper_encoder; td->oer_decoder = asn_DEF_NativeInteger.oer_decoder; td->oer_encoder = asn_DEF_NativeInteger.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_NativeInteger.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -112,8 +114,8 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerUnlimited = { CN_IntegerUnlimited_encode_der, CN_IntegerUnlimited_decode_xer, CN_IntegerUnlimited_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_CN_IntegerUnlimited_tags_1, sizeof(asn_DEF_CN_IntegerUnlimited_tags_1) @@ -121,6 +123,7 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerUnlimited = { asn_DEF_CN_IntegerUnlimited_tags_1, /* Same as above */ sizeof(asn_DEF_CN_IntegerUnlimited_tags_1) /sizeof(asn_DEF_CN_IntegerUnlimited_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -186,6 +189,8 @@ CN_IntegerMinMax_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_NativeInteger.uper_encoder; td->oer_decoder = asn_DEF_NativeInteger.oer_decoder; td->oer_encoder = asn_DEF_NativeInteger.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_NativeInteger.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -253,8 +258,8 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerMinMax = { CN_IntegerMinMax_encode_der, CN_IntegerMinMax_decode_xer, CN_IntegerMinMax_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_CN_IntegerMinMax_tags_1, sizeof(asn_DEF_CN_IntegerMinMax_tags_1) @@ -262,6 +267,7 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerMinMax = { asn_DEF_CN_IntegerMinMax_tags_1, /* Same as above */ sizeof(asn_DEF_CN_IntegerMinMax_tags_1) /sizeof(asn_DEF_CN_IntegerMinMax_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -331,6 +337,8 @@ CN_IntegerMinLow_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_NativeInteger.uper_encoder; td->oer_decoder = asn_DEF_NativeInteger.oer_decoder; td->oer_encoder = asn_DEF_NativeInteger.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_NativeInteger.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -398,8 +406,8 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerMinLow = { CN_IntegerMinLow_encode_der, CN_IntegerMinLow_decode_xer, CN_IntegerMinLow_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_CN_IntegerMinLow_tags_1, sizeof(asn_DEF_CN_IntegerMinLow_tags_1) @@ -407,6 +415,7 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerMinLow = { asn_DEF_CN_IntegerMinLow_tags_1, /* Same as above */ sizeof(asn_DEF_CN_IntegerMinLow_tags_1) /sizeof(asn_DEF_CN_IntegerMinLow_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -482,6 +491,8 @@ NO_IntegerMinHigh_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_INTEGER.uper_encoder; td->oer_decoder = asn_DEF_INTEGER.oer_decoder; td->oer_encoder = asn_DEF_INTEGER.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_INTEGER.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_INTEGER.per_constraints; td->elements = asn_DEF_INTEGER.elements; @@ -549,8 +560,8 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerMinHigh = { NO_IntegerMinHigh_encode_der, NO_IntegerMinHigh_decode_xer, NO_IntegerMinHigh_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_NO_IntegerMinHigh_tags_1, sizeof(asn_DEF_NO_IntegerMinHigh_tags_1) @@ -558,6 +569,7 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerMinHigh = { asn_DEF_NO_IntegerMinHigh_tags_1, /* Same as above */ sizeof(asn_DEF_NO_IntegerMinHigh_tags_1) /sizeof(asn_DEF_NO_IntegerMinHigh_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -627,6 +639,8 @@ NO_IntegerLowHigh_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_NativeInteger.uper_encoder; td->oer_decoder = asn_DEF_NativeInteger.oer_decoder; td->oer_encoder = asn_DEF_NativeInteger.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_NativeInteger.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -699,8 +713,8 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerLowHigh = { NO_IntegerLowHigh_encode_der, NO_IntegerLowHigh_decode_xer, NO_IntegerLowHigh_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_NO_IntegerLowHigh_tags_1, sizeof(asn_DEF_NO_IntegerLowHigh_tags_1) @@ -708,6 +722,7 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerLowHigh = { asn_DEF_NO_IntegerLowHigh_tags_1, /* Same as above */ sizeof(asn_DEF_NO_IntegerLowHigh_tags_1) /sizeof(asn_DEF_NO_IntegerLowHigh_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ &asn_SPC_NO_IntegerLowHigh_specs_1 /* Additional specs */ @@ -777,6 +792,8 @@ CN_IntegerLowMax_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_NativeInteger.uper_encoder; td->oer_decoder = asn_DEF_NativeInteger.oer_decoder; td->oer_encoder = asn_DEF_NativeInteger.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_NativeInteger.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -844,8 +861,8 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerLowMax = { CN_IntegerLowMax_encode_der, CN_IntegerLowMax_decode_xer, CN_IntegerLowMax_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_CN_IntegerLowMax_tags_1, sizeof(asn_DEF_CN_IntegerLowMax_tags_1) @@ -853,6 +870,7 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerLowMax = { asn_DEF_CN_IntegerLowMax_tags_1, /* Same as above */ sizeof(asn_DEF_CN_IntegerLowMax_tags_1) /sizeof(asn_DEF_CN_IntegerLowMax_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -928,6 +946,8 @@ NO_IntegerHighMax_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_INTEGER.uper_encoder; td->oer_decoder = asn_DEF_INTEGER.oer_decoder; td->oer_encoder = asn_DEF_INTEGER.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_INTEGER.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_INTEGER.per_constraints; td->elements = asn_DEF_INTEGER.elements; @@ -995,8 +1015,8 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerHighMax = { NO_IntegerHighMax_encode_der, NO_IntegerHighMax_decode_xer, NO_IntegerHighMax_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_NO_IntegerHighMax_tags_1, sizeof(asn_DEF_NO_IntegerHighMax_tags_1) @@ -1004,6 +1024,7 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerHighMax = { asn_DEF_NO_IntegerHighMax_tags_1, /* Same as above */ sizeof(asn_DEF_NO_IntegerHighMax_tags_1) /sizeof(asn_DEF_NO_IntegerHighMax_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -1079,6 +1100,8 @@ NO_IntegerLowestMax_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_INTEGER.uper_encoder; td->oer_decoder = asn_DEF_INTEGER.oer_decoder; td->oer_encoder = asn_DEF_INTEGER.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_INTEGER.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_INTEGER.per_constraints; td->elements = asn_DEF_INTEGER.elements; @@ -1146,8 +1169,8 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerLowestMax = { NO_IntegerLowestMax_encode_der, NO_IntegerLowestMax_decode_xer, NO_IntegerLowestMax_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_NO_IntegerLowestMax_tags_1, sizeof(asn_DEF_NO_IntegerLowestMax_tags_1) @@ -1155,6 +1178,7 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerLowestMax = { asn_DEF_NO_IntegerLowestMax_tags_1, /* Same as above */ sizeof(asn_DEF_NO_IntegerLowestMax_tags_1) /sizeof(asn_DEF_NO_IntegerLowestMax_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -1224,6 +1248,8 @@ NO_IntegerOutRange_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_NativeInteger.uper_encoder; td->oer_decoder = asn_DEF_NativeInteger.oer_decoder; td->oer_encoder = asn_DEF_NativeInteger.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_NativeInteger.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -1296,8 +1322,8 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerOutRange = { NO_IntegerOutRange_encode_der, NO_IntegerOutRange_decode_xer, NO_IntegerOutRange_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_NO_IntegerOutRange_tags_1, sizeof(asn_DEF_NO_IntegerOutRange_tags_1) @@ -1305,6 +1331,7 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerOutRange = { asn_DEF_NO_IntegerOutRange_tags_1, /* Same as above */ sizeof(asn_DEF_NO_IntegerOutRange_tags_1) /sizeof(asn_DEF_NO_IntegerOutRange_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ &asn_SPC_NO_IntegerOutRange_specs_1 /* Additional specs */ @@ -1374,6 +1401,8 @@ NO_IntegerOutValue_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_NativeInteger.uper_encoder; td->oer_decoder = asn_DEF_NativeInteger.oer_decoder; td->oer_encoder = asn_DEF_NativeInteger.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_NativeInteger.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -1446,8 +1475,8 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerOutValue = { NO_IntegerOutValue_encode_der, NO_IntegerOutValue_decode_xer, NO_IntegerOutValue_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_NO_IntegerOutValue_tags_1, sizeof(asn_DEF_NO_IntegerOutValue_tags_1) @@ -1455,6 +1484,7 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerOutValue = { asn_DEF_NO_IntegerOutValue_tags_1, /* Same as above */ sizeof(asn_DEF_NO_IntegerOutValue_tags_1) /sizeof(asn_DEF_NO_IntegerOutValue_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ &asn_SPC_NO_IntegerOutValue_specs_1 /* Additional specs */ @@ -1524,6 +1554,8 @@ OK_IntegerInRange1_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_NativeInteger.uper_encoder; td->oer_decoder = asn_DEF_NativeInteger.oer_decoder; td->oer_encoder = asn_DEF_NativeInteger.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_NativeInteger.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -1591,8 +1623,8 @@ asn_TYPE_descriptor_t asn_DEF_OK_IntegerInRange1 = { OK_IntegerInRange1_encode_der, OK_IntegerInRange1_decode_xer, OK_IntegerInRange1_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_OK_IntegerInRange1_tags_1, sizeof(asn_DEF_OK_IntegerInRange1_tags_1) @@ -1600,6 +1632,7 @@ asn_TYPE_descriptor_t asn_DEF_OK_IntegerInRange1 = { asn_DEF_OK_IntegerInRange1_tags_1, /* Same as above */ sizeof(asn_DEF_OK_IntegerInRange1_tags_1) /sizeof(asn_DEF_OK_IntegerInRange1_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -1669,6 +1702,8 @@ OK_IntegerInRange2_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_NativeInteger.uper_encoder; td->oer_decoder = asn_DEF_NativeInteger.oer_decoder; td->oer_encoder = asn_DEF_NativeInteger.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_NativeInteger.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -1736,8 +1771,8 @@ asn_TYPE_descriptor_t asn_DEF_OK_IntegerInRange2 = { OK_IntegerInRange2_encode_der, OK_IntegerInRange2_decode_xer, OK_IntegerInRange2_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_OK_IntegerInRange2_tags_1, sizeof(asn_DEF_OK_IntegerInRange2_tags_1) @@ -1745,6 +1780,7 @@ asn_TYPE_descriptor_t asn_DEF_OK_IntegerInRange2 = { asn_DEF_OK_IntegerInRange2_tags_1, /* Same as above */ sizeof(asn_DEF_OK_IntegerInRange2_tags_1) /sizeof(asn_DEF_OK_IntegerInRange2_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -1814,6 +1850,8 @@ OK_IntegerInRange3_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_NativeInteger.uper_encoder; td->oer_decoder = asn_DEF_NativeInteger.oer_decoder; td->oer_encoder = asn_DEF_NativeInteger.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_NativeInteger.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -1881,8 +1919,8 @@ asn_TYPE_descriptor_t asn_DEF_OK_IntegerInRange3 = { OK_IntegerInRange3_encode_der, OK_IntegerInRange3_decode_xer, OK_IntegerInRange3_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_OK_IntegerInRange3_tags_1, sizeof(asn_DEF_OK_IntegerInRange3_tags_1) @@ -1890,6 +1928,7 @@ asn_TYPE_descriptor_t asn_DEF_OK_IntegerInRange3 = { asn_DEF_OK_IntegerInRange3_tags_1, /* Same as above */ sizeof(asn_DEF_OK_IntegerInRange3_tags_1) /sizeof(asn_DEF_OK_IntegerInRange3_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -1959,6 +1998,8 @@ OK_IntegerInRange4_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_NativeInteger.uper_encoder; td->oer_decoder = asn_DEF_NativeInteger.oer_decoder; td->oer_encoder = asn_DEF_NativeInteger.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_NativeInteger.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -2026,8 +2067,8 @@ asn_TYPE_descriptor_t asn_DEF_OK_IntegerInRange4 = { OK_IntegerInRange4_encode_der, OK_IntegerInRange4_decode_xer, OK_IntegerInRange4_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_OK_IntegerInRange4_tags_1, sizeof(asn_DEF_OK_IntegerInRange4_tags_1) @@ -2035,6 +2076,7 @@ asn_TYPE_descriptor_t asn_DEF_OK_IntegerInRange4 = { asn_DEF_OK_IntegerInRange4_tags_1, /* Same as above */ sizeof(asn_DEF_OK_IntegerInRange4_tags_1) /sizeof(asn_DEF_OK_IntegerInRange4_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -2104,6 +2146,8 @@ OK_IntegerInRange5_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_NativeInteger.uper_encoder; td->oer_decoder = asn_DEF_NativeInteger.oer_decoder; td->oer_encoder = asn_DEF_NativeInteger.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_NativeInteger.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -2171,8 +2215,8 @@ asn_TYPE_descriptor_t asn_DEF_OK_IntegerInRange5 = { OK_IntegerInRange5_encode_der, OK_IntegerInRange5_decode_xer, OK_IntegerInRange5_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_OK_IntegerInRange5_tags_1, sizeof(asn_DEF_OK_IntegerInRange5_tags_1) @@ -2180,6 +2224,7 @@ asn_TYPE_descriptor_t asn_DEF_OK_IntegerInRange5 = { asn_DEF_OK_IntegerInRange5_tags_1, /* Same as above */ sizeof(asn_DEF_OK_IntegerInRange5_tags_1) /sizeof(asn_DEF_OK_IntegerInRange5_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -2240,6 +2285,8 @@ NO_IntegerInRange6_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_NativeInteger.uper_encoder; td->oer_decoder = asn_DEF_NativeInteger.oer_decoder; td->oer_encoder = asn_DEF_NativeInteger.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_NativeInteger.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -2312,8 +2359,8 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerInRange6 = { NO_IntegerInRange6_encode_der, NO_IntegerInRange6_decode_xer, NO_IntegerInRange6_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_NO_IntegerInRange6_tags_1, sizeof(asn_DEF_NO_IntegerInRange6_tags_1) @@ -2321,6 +2368,7 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerInRange6 = { asn_DEF_NO_IntegerInRange6_tags_1, /* Same as above */ sizeof(asn_DEF_NO_IntegerInRange6_tags_1) /sizeof(asn_DEF_NO_IntegerInRange6_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ &asn_SPC_NO_IntegerInRange6_specs_1 /* Additional specs */ @@ -2380,6 +2428,8 @@ CN_IntegerEnumerated1_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_NativeInteger.uper_encoder; td->oer_decoder = asn_DEF_NativeInteger.oer_decoder; td->oer_encoder = asn_DEF_NativeInteger.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_NativeInteger.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -2447,8 +2497,8 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerEnumerated1 = { CN_IntegerEnumerated1_encode_der, CN_IntegerEnumerated1_decode_xer, CN_IntegerEnumerated1_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_CN_IntegerEnumerated1_tags_1, sizeof(asn_DEF_CN_IntegerEnumerated1_tags_1) @@ -2456,6 +2506,7 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerEnumerated1 = { asn_DEF_CN_IntegerEnumerated1_tags_1, /* Same as above */ sizeof(asn_DEF_CN_IntegerEnumerated1_tags_1) /sizeof(asn_DEF_CN_IntegerEnumerated1_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* Defined elsewhere */ 0 /* No specifics */ @@ -2515,6 +2566,8 @@ NO_IntegerEnumerated2_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_INTEGER.uper_encoder; td->oer_decoder = asn_DEF_INTEGER.oer_decoder; td->oer_encoder = asn_DEF_INTEGER.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_INTEGER.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_INTEGER.per_constraints; td->elements = asn_DEF_INTEGER.elements; @@ -2582,8 +2635,8 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerEnumerated2 = { NO_IntegerEnumerated2_encode_der, NO_IntegerEnumerated2_decode_xer, NO_IntegerEnumerated2_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_NO_IntegerEnumerated2_tags_1, sizeof(asn_DEF_NO_IntegerEnumerated2_tags_1) @@ -2591,6 +2644,7 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerEnumerated2 = { asn_DEF_NO_IntegerEnumerated2_tags_1, /* Same as above */ sizeof(asn_DEF_NO_IntegerEnumerated2_tags_1) /sizeof(asn_DEF_NO_IntegerEnumerated2_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* Defined elsewhere */ 0 /* No specifics */ diff --git a/tests/90-cond-int-type-OK.asn1.-Pfwide-types b/tests/90-cond-int-type-OK.asn1.-Pfwide-types index b2ba2972..fee054c9 100644 --- a/tests/90-cond-int-type-OK.asn1.-Pfwide-types +++ b/tests/90-cond-int-type-OK.asn1.-Pfwide-types @@ -45,6 +45,8 @@ CN_IntegerUnlimited_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_INTEGER.uper_encoder; td->oer_decoder = asn_DEF_INTEGER.oer_decoder; td->oer_encoder = asn_DEF_INTEGER.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_INTEGER.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_INTEGER.per_constraints; td->elements = asn_DEF_INTEGER.elements; @@ -112,8 +114,8 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerUnlimited = { CN_IntegerUnlimited_encode_der, CN_IntegerUnlimited_decode_xer, CN_IntegerUnlimited_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_CN_IntegerUnlimited_tags_1, sizeof(asn_DEF_CN_IntegerUnlimited_tags_1) @@ -121,6 +123,7 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerUnlimited = { asn_DEF_CN_IntegerUnlimited_tags_1, /* Same as above */ sizeof(asn_DEF_CN_IntegerUnlimited_tags_1) /sizeof(asn_DEF_CN_IntegerUnlimited_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -188,6 +191,8 @@ CN_IntegerMinMax_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_INTEGER.uper_encoder; td->oer_decoder = asn_DEF_INTEGER.oer_decoder; td->oer_encoder = asn_DEF_INTEGER.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_INTEGER.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_INTEGER.per_constraints; td->elements = asn_DEF_INTEGER.elements; @@ -255,8 +260,8 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerMinMax = { CN_IntegerMinMax_encode_der, CN_IntegerMinMax_decode_xer, CN_IntegerMinMax_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_CN_IntegerMinMax_tags_1, sizeof(asn_DEF_CN_IntegerMinMax_tags_1) @@ -264,6 +269,7 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerMinMax = { asn_DEF_CN_IntegerMinMax_tags_1, /* Same as above */ sizeof(asn_DEF_CN_IntegerMinMax_tags_1) /sizeof(asn_DEF_CN_IntegerMinMax_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -339,6 +345,8 @@ CN_IntegerMinLow_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_INTEGER.uper_encoder; td->oer_decoder = asn_DEF_INTEGER.oer_decoder; td->oer_encoder = asn_DEF_INTEGER.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_INTEGER.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_INTEGER.per_constraints; td->elements = asn_DEF_INTEGER.elements; @@ -406,8 +414,8 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerMinLow = { CN_IntegerMinLow_encode_der, CN_IntegerMinLow_decode_xer, CN_IntegerMinLow_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_CN_IntegerMinLow_tags_1, sizeof(asn_DEF_CN_IntegerMinLow_tags_1) @@ -415,6 +423,7 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerMinLow = { asn_DEF_CN_IntegerMinLow_tags_1, /* Same as above */ sizeof(asn_DEF_CN_IntegerMinLow_tags_1) /sizeof(asn_DEF_CN_IntegerMinLow_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -490,6 +499,8 @@ NO_IntegerMinHigh_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_INTEGER.uper_encoder; td->oer_decoder = asn_DEF_INTEGER.oer_decoder; td->oer_encoder = asn_DEF_INTEGER.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_INTEGER.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_INTEGER.per_constraints; td->elements = asn_DEF_INTEGER.elements; @@ -557,8 +568,8 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerMinHigh = { NO_IntegerMinHigh_encode_der, NO_IntegerMinHigh_decode_xer, NO_IntegerMinHigh_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_NO_IntegerMinHigh_tags_1, sizeof(asn_DEF_NO_IntegerMinHigh_tags_1) @@ -566,6 +577,7 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerMinHigh = { asn_DEF_NO_IntegerMinHigh_tags_1, /* Same as above */ sizeof(asn_DEF_NO_IntegerMinHigh_tags_1) /sizeof(asn_DEF_NO_IntegerMinHigh_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -635,6 +647,8 @@ NO_IntegerLowHigh_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_NativeInteger.uper_encoder; td->oer_decoder = asn_DEF_NativeInteger.oer_decoder; td->oer_encoder = asn_DEF_NativeInteger.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_NativeInteger.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -707,8 +721,8 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerLowHigh = { NO_IntegerLowHigh_encode_der, NO_IntegerLowHigh_decode_xer, NO_IntegerLowHigh_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_NO_IntegerLowHigh_tags_1, sizeof(asn_DEF_NO_IntegerLowHigh_tags_1) @@ -716,6 +730,7 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerLowHigh = { asn_DEF_NO_IntegerLowHigh_tags_1, /* Same as above */ sizeof(asn_DEF_NO_IntegerLowHigh_tags_1) /sizeof(asn_DEF_NO_IntegerLowHigh_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ &asn_SPC_NO_IntegerLowHigh_specs_1 /* Additional specs */ @@ -791,6 +806,8 @@ CN_IntegerLowMax_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_INTEGER.uper_encoder; td->oer_decoder = asn_DEF_INTEGER.oer_decoder; td->oer_encoder = asn_DEF_INTEGER.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_INTEGER.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_INTEGER.per_constraints; td->elements = asn_DEF_INTEGER.elements; @@ -858,8 +875,8 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerLowMax = { CN_IntegerLowMax_encode_der, CN_IntegerLowMax_decode_xer, CN_IntegerLowMax_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_CN_IntegerLowMax_tags_1, sizeof(asn_DEF_CN_IntegerLowMax_tags_1) @@ -867,6 +884,7 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerLowMax = { asn_DEF_CN_IntegerLowMax_tags_1, /* Same as above */ sizeof(asn_DEF_CN_IntegerLowMax_tags_1) /sizeof(asn_DEF_CN_IntegerLowMax_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -942,6 +960,8 @@ NO_IntegerHighMax_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_INTEGER.uper_encoder; td->oer_decoder = asn_DEF_INTEGER.oer_decoder; td->oer_encoder = asn_DEF_INTEGER.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_INTEGER.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_INTEGER.per_constraints; td->elements = asn_DEF_INTEGER.elements; @@ -1009,8 +1029,8 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerHighMax = { NO_IntegerHighMax_encode_der, NO_IntegerHighMax_decode_xer, NO_IntegerHighMax_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_NO_IntegerHighMax_tags_1, sizeof(asn_DEF_NO_IntegerHighMax_tags_1) @@ -1018,6 +1038,7 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerHighMax = { asn_DEF_NO_IntegerHighMax_tags_1, /* Same as above */ sizeof(asn_DEF_NO_IntegerHighMax_tags_1) /sizeof(asn_DEF_NO_IntegerHighMax_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -1093,6 +1114,8 @@ NO_IntegerLowestMax_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_INTEGER.uper_encoder; td->oer_decoder = asn_DEF_INTEGER.oer_decoder; td->oer_encoder = asn_DEF_INTEGER.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_INTEGER.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_INTEGER.per_constraints; td->elements = asn_DEF_INTEGER.elements; @@ -1160,8 +1183,8 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerLowestMax = { NO_IntegerLowestMax_encode_der, NO_IntegerLowestMax_decode_xer, NO_IntegerLowestMax_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_NO_IntegerLowestMax_tags_1, sizeof(asn_DEF_NO_IntegerLowestMax_tags_1) @@ -1169,6 +1192,7 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerLowestMax = { asn_DEF_NO_IntegerLowestMax_tags_1, /* Same as above */ sizeof(asn_DEF_NO_IntegerLowestMax_tags_1) /sizeof(asn_DEF_NO_IntegerLowestMax_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -1238,6 +1262,8 @@ NO_IntegerOutRange_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_NativeInteger.uper_encoder; td->oer_decoder = asn_DEF_NativeInteger.oer_decoder; td->oer_encoder = asn_DEF_NativeInteger.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_NativeInteger.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -1310,8 +1336,8 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerOutRange = { NO_IntegerOutRange_encode_der, NO_IntegerOutRange_decode_xer, NO_IntegerOutRange_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_NO_IntegerOutRange_tags_1, sizeof(asn_DEF_NO_IntegerOutRange_tags_1) @@ -1319,6 +1345,7 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerOutRange = { asn_DEF_NO_IntegerOutRange_tags_1, /* Same as above */ sizeof(asn_DEF_NO_IntegerOutRange_tags_1) /sizeof(asn_DEF_NO_IntegerOutRange_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ &asn_SPC_NO_IntegerOutRange_specs_1 /* Additional specs */ @@ -1388,6 +1415,8 @@ NO_IntegerOutValue_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_NativeInteger.uper_encoder; td->oer_decoder = asn_DEF_NativeInteger.oer_decoder; td->oer_encoder = asn_DEF_NativeInteger.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_NativeInteger.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -1460,8 +1489,8 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerOutValue = { NO_IntegerOutValue_encode_der, NO_IntegerOutValue_decode_xer, NO_IntegerOutValue_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_NO_IntegerOutValue_tags_1, sizeof(asn_DEF_NO_IntegerOutValue_tags_1) @@ -1469,6 +1498,7 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerOutValue = { asn_DEF_NO_IntegerOutValue_tags_1, /* Same as above */ sizeof(asn_DEF_NO_IntegerOutValue_tags_1) /sizeof(asn_DEF_NO_IntegerOutValue_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ &asn_SPC_NO_IntegerOutValue_specs_1 /* Additional specs */ @@ -1538,6 +1568,8 @@ OK_IntegerInRange1_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_NativeInteger.uper_encoder; td->oer_decoder = asn_DEF_NativeInteger.oer_decoder; td->oer_encoder = asn_DEF_NativeInteger.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_NativeInteger.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -1605,8 +1637,8 @@ asn_TYPE_descriptor_t asn_DEF_OK_IntegerInRange1 = { OK_IntegerInRange1_encode_der, OK_IntegerInRange1_decode_xer, OK_IntegerInRange1_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_OK_IntegerInRange1_tags_1, sizeof(asn_DEF_OK_IntegerInRange1_tags_1) @@ -1614,6 +1646,7 @@ asn_TYPE_descriptor_t asn_DEF_OK_IntegerInRange1 = { asn_DEF_OK_IntegerInRange1_tags_1, /* Same as above */ sizeof(asn_DEF_OK_IntegerInRange1_tags_1) /sizeof(asn_DEF_OK_IntegerInRange1_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -1683,6 +1716,8 @@ OK_IntegerInRange2_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_NativeInteger.uper_encoder; td->oer_decoder = asn_DEF_NativeInteger.oer_decoder; td->oer_encoder = asn_DEF_NativeInteger.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_NativeInteger.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -1750,8 +1785,8 @@ asn_TYPE_descriptor_t asn_DEF_OK_IntegerInRange2 = { OK_IntegerInRange2_encode_der, OK_IntegerInRange2_decode_xer, OK_IntegerInRange2_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_OK_IntegerInRange2_tags_1, sizeof(asn_DEF_OK_IntegerInRange2_tags_1) @@ -1759,6 +1794,7 @@ asn_TYPE_descriptor_t asn_DEF_OK_IntegerInRange2 = { asn_DEF_OK_IntegerInRange2_tags_1, /* Same as above */ sizeof(asn_DEF_OK_IntegerInRange2_tags_1) /sizeof(asn_DEF_OK_IntegerInRange2_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -1828,6 +1864,8 @@ OK_IntegerInRange3_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_NativeInteger.uper_encoder; td->oer_decoder = asn_DEF_NativeInteger.oer_decoder; td->oer_encoder = asn_DEF_NativeInteger.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_NativeInteger.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -1895,8 +1933,8 @@ asn_TYPE_descriptor_t asn_DEF_OK_IntegerInRange3 = { OK_IntegerInRange3_encode_der, OK_IntegerInRange3_decode_xer, OK_IntegerInRange3_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_OK_IntegerInRange3_tags_1, sizeof(asn_DEF_OK_IntegerInRange3_tags_1) @@ -1904,6 +1942,7 @@ asn_TYPE_descriptor_t asn_DEF_OK_IntegerInRange3 = { asn_DEF_OK_IntegerInRange3_tags_1, /* Same as above */ sizeof(asn_DEF_OK_IntegerInRange3_tags_1) /sizeof(asn_DEF_OK_IntegerInRange3_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -1973,6 +2012,8 @@ OK_IntegerInRange4_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_NativeInteger.uper_encoder; td->oer_decoder = asn_DEF_NativeInteger.oer_decoder; td->oer_encoder = asn_DEF_NativeInteger.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_NativeInteger.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -2040,8 +2081,8 @@ asn_TYPE_descriptor_t asn_DEF_OK_IntegerInRange4 = { OK_IntegerInRange4_encode_der, OK_IntegerInRange4_decode_xer, OK_IntegerInRange4_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_OK_IntegerInRange4_tags_1, sizeof(asn_DEF_OK_IntegerInRange4_tags_1) @@ -2049,6 +2090,7 @@ asn_TYPE_descriptor_t asn_DEF_OK_IntegerInRange4 = { asn_DEF_OK_IntegerInRange4_tags_1, /* Same as above */ sizeof(asn_DEF_OK_IntegerInRange4_tags_1) /sizeof(asn_DEF_OK_IntegerInRange4_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -2124,6 +2166,8 @@ OK_IntegerInRange5_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_INTEGER.uper_encoder; td->oer_decoder = asn_DEF_INTEGER.oer_decoder; td->oer_encoder = asn_DEF_INTEGER.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_INTEGER.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_INTEGER.per_constraints; td->elements = asn_DEF_INTEGER.elements; @@ -2191,8 +2235,8 @@ asn_TYPE_descriptor_t asn_DEF_OK_IntegerInRange5 = { OK_IntegerInRange5_encode_der, OK_IntegerInRange5_decode_xer, OK_IntegerInRange5_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_OK_IntegerInRange5_tags_1, sizeof(asn_DEF_OK_IntegerInRange5_tags_1) @@ -2200,6 +2244,7 @@ asn_TYPE_descriptor_t asn_DEF_OK_IntegerInRange5 = { asn_DEF_OK_IntegerInRange5_tags_1, /* Same as above */ sizeof(asn_DEF_OK_IntegerInRange5_tags_1) /sizeof(asn_DEF_OK_IntegerInRange5_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -2260,6 +2305,8 @@ NO_IntegerInRange6_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_NativeInteger.uper_encoder; td->oer_decoder = asn_DEF_NativeInteger.oer_decoder; td->oer_encoder = asn_DEF_NativeInteger.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_NativeInteger.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -2332,8 +2379,8 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerInRange6 = { NO_IntegerInRange6_encode_der, NO_IntegerInRange6_decode_xer, NO_IntegerInRange6_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_NO_IntegerInRange6_tags_1, sizeof(asn_DEF_NO_IntegerInRange6_tags_1) @@ -2341,6 +2388,7 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerInRange6 = { asn_DEF_NO_IntegerInRange6_tags_1, /* Same as above */ sizeof(asn_DEF_NO_IntegerInRange6_tags_1) /sizeof(asn_DEF_NO_IntegerInRange6_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ &asn_SPC_NO_IntegerInRange6_specs_1 /* Additional specs */ @@ -2400,6 +2448,8 @@ CN_IntegerEnumerated1_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_INTEGER.uper_encoder; td->oer_decoder = asn_DEF_INTEGER.oer_decoder; td->oer_encoder = asn_DEF_INTEGER.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_INTEGER.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_INTEGER.per_constraints; td->elements = asn_DEF_INTEGER.elements; @@ -2467,8 +2517,8 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerEnumerated1 = { CN_IntegerEnumerated1_encode_der, CN_IntegerEnumerated1_decode_xer, CN_IntegerEnumerated1_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_CN_IntegerEnumerated1_tags_1, sizeof(asn_DEF_CN_IntegerEnumerated1_tags_1) @@ -2476,6 +2526,7 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerEnumerated1 = { asn_DEF_CN_IntegerEnumerated1_tags_1, /* Same as above */ sizeof(asn_DEF_CN_IntegerEnumerated1_tags_1) /sizeof(asn_DEF_CN_IntegerEnumerated1_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* Defined elsewhere */ 0 /* No specifics */ @@ -2535,6 +2586,8 @@ NO_IntegerEnumerated2_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_INTEGER.uper_encoder; td->oer_decoder = asn_DEF_INTEGER.oer_decoder; td->oer_encoder = asn_DEF_INTEGER.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_INTEGER.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_INTEGER.per_constraints; td->elements = asn_DEF_INTEGER.elements; @@ -2602,8 +2655,8 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerEnumerated2 = { NO_IntegerEnumerated2_encode_der, NO_IntegerEnumerated2_decode_xer, NO_IntegerEnumerated2_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_NO_IntegerEnumerated2_tags_1, sizeof(asn_DEF_NO_IntegerEnumerated2_tags_1) @@ -2611,6 +2664,7 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerEnumerated2 = { asn_DEF_NO_IntegerEnumerated2_tags_1, /* Same as above */ sizeof(asn_DEF_NO_IntegerEnumerated2_tags_1) /sizeof(asn_DEF_NO_IntegerEnumerated2_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* Defined elsewhere */ 0 /* No specifics */ diff --git a/tests/90-cond-int-type-OK.asn1.-Pgen-PER b/tests/90-cond-int-type-OK.asn1.-Pgen-PER index e429279f..770ab8fd 100644 --- a/tests/90-cond-int-type-OK.asn1.-Pgen-PER +++ b/tests/90-cond-int-type-OK.asn1.-Pgen-PER @@ -47,6 +47,8 @@ CN_IntegerUnlimited_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_NativeInteger.uper_encoder; td->oer_decoder = asn_DEF_NativeInteger.oer_decoder; td->oer_encoder = asn_DEF_NativeInteger.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_NativeInteger.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -129,9 +131,9 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerUnlimited = { CN_IntegerUnlimited_encode_der, CN_IntegerUnlimited_decode_xer, CN_IntegerUnlimited_encode_xer, + 0, 0, /* No OER support, use "-gen-OER" to enable */ CN_IntegerUnlimited_decode_uper, CN_IntegerUnlimited_encode_uper, - 0, 0, /* No OER support, use "-gen-OER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_CN_IntegerUnlimited_tags_1, sizeof(asn_DEF_CN_IntegerUnlimited_tags_1) @@ -139,6 +141,7 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerUnlimited = { asn_DEF_CN_IntegerUnlimited_tags_1, /* Same as above */ sizeof(asn_DEF_CN_IntegerUnlimited_tags_1) /sizeof(asn_DEF_CN_IntegerUnlimited_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -206,6 +209,8 @@ CN_IntegerMinMax_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_NativeInteger.uper_encoder; td->oer_decoder = asn_DEF_NativeInteger.oer_decoder; td->oer_encoder = asn_DEF_NativeInteger.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_NativeInteger.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -296,9 +301,9 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerMinMax = { CN_IntegerMinMax_encode_der, CN_IntegerMinMax_decode_xer, CN_IntegerMinMax_encode_xer, + 0, 0, /* No OER support, use "-gen-OER" to enable */ CN_IntegerMinMax_decode_uper, CN_IntegerMinMax_encode_uper, - 0, 0, /* No OER support, use "-gen-OER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_CN_IntegerMinMax_tags_1, sizeof(asn_DEF_CN_IntegerMinMax_tags_1) @@ -306,6 +311,7 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerMinMax = { asn_DEF_CN_IntegerMinMax_tags_1, /* Same as above */ sizeof(asn_DEF_CN_IntegerMinMax_tags_1) /sizeof(asn_DEF_CN_IntegerMinMax_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ &asn_PER_type_CN_IntegerMinMax_constr_1, 0, 0, /* No members */ 0 /* No specifics */ @@ -377,6 +383,8 @@ CN_IntegerMinLow_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_NativeInteger.uper_encoder; td->oer_decoder = asn_DEF_NativeInteger.oer_decoder; td->oer_encoder = asn_DEF_NativeInteger.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_NativeInteger.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -467,9 +475,9 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerMinLow = { CN_IntegerMinLow_encode_der, CN_IntegerMinLow_decode_xer, CN_IntegerMinLow_encode_xer, + 0, 0, /* No OER support, use "-gen-OER" to enable */ CN_IntegerMinLow_decode_uper, CN_IntegerMinLow_encode_uper, - 0, 0, /* No OER support, use "-gen-OER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_CN_IntegerMinLow_tags_1, sizeof(asn_DEF_CN_IntegerMinLow_tags_1) @@ -477,6 +485,7 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerMinLow = { asn_DEF_CN_IntegerMinLow_tags_1, /* Same as above */ sizeof(asn_DEF_CN_IntegerMinLow_tags_1) /sizeof(asn_DEF_CN_IntegerMinLow_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ &asn_PER_type_CN_IntegerMinLow_constr_1, 0, 0, /* No members */ 0 /* No specifics */ @@ -554,6 +563,8 @@ NO_IntegerMinHigh_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_INTEGER.uper_encoder; td->oer_decoder = asn_DEF_INTEGER.oer_decoder; td->oer_encoder = asn_DEF_INTEGER.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_INTEGER.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_INTEGER.per_constraints; td->elements = asn_DEF_INTEGER.elements; @@ -644,9 +655,9 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerMinHigh = { NO_IntegerMinHigh_encode_der, NO_IntegerMinHigh_decode_xer, NO_IntegerMinHigh_encode_xer, + 0, 0, /* No OER support, use "-gen-OER" to enable */ NO_IntegerMinHigh_decode_uper, NO_IntegerMinHigh_encode_uper, - 0, 0, /* No OER support, use "-gen-OER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_NO_IntegerMinHigh_tags_1, sizeof(asn_DEF_NO_IntegerMinHigh_tags_1) @@ -654,6 +665,7 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerMinHigh = { asn_DEF_NO_IntegerMinHigh_tags_1, /* Same as above */ sizeof(asn_DEF_NO_IntegerMinHigh_tags_1) /sizeof(asn_DEF_NO_IntegerMinHigh_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ &asn_PER_type_NO_IntegerMinHigh_constr_1, 0, 0, /* No members */ 0 /* No specifics */ @@ -725,6 +737,8 @@ NO_IntegerLowHigh_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_NativeInteger.uper_encoder; td->oer_decoder = asn_DEF_NativeInteger.oer_decoder; td->oer_encoder = asn_DEF_NativeInteger.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_NativeInteger.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -820,9 +834,9 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerLowHigh = { NO_IntegerLowHigh_encode_der, NO_IntegerLowHigh_decode_xer, NO_IntegerLowHigh_encode_xer, + 0, 0, /* No OER support, use "-gen-OER" to enable */ NO_IntegerLowHigh_decode_uper, NO_IntegerLowHigh_encode_uper, - 0, 0, /* No OER support, use "-gen-OER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_NO_IntegerLowHigh_tags_1, sizeof(asn_DEF_NO_IntegerLowHigh_tags_1) @@ -830,6 +844,7 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerLowHigh = { asn_DEF_NO_IntegerLowHigh_tags_1, /* Same as above */ sizeof(asn_DEF_NO_IntegerLowHigh_tags_1) /sizeof(asn_DEF_NO_IntegerLowHigh_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ &asn_PER_type_NO_IntegerLowHigh_constr_1, 0, 0, /* No members */ &asn_SPC_NO_IntegerLowHigh_specs_1 /* Additional specs */ @@ -901,6 +916,8 @@ CN_IntegerLowMax_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_NativeInteger.uper_encoder; td->oer_decoder = asn_DEF_NativeInteger.oer_decoder; td->oer_encoder = asn_DEF_NativeInteger.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_NativeInteger.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -991,9 +1008,9 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerLowMax = { CN_IntegerLowMax_encode_der, CN_IntegerLowMax_decode_xer, CN_IntegerLowMax_encode_xer, + 0, 0, /* No OER support, use "-gen-OER" to enable */ CN_IntegerLowMax_decode_uper, CN_IntegerLowMax_encode_uper, - 0, 0, /* No OER support, use "-gen-OER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_CN_IntegerLowMax_tags_1, sizeof(asn_DEF_CN_IntegerLowMax_tags_1) @@ -1001,6 +1018,7 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerLowMax = { asn_DEF_CN_IntegerLowMax_tags_1, /* Same as above */ sizeof(asn_DEF_CN_IntegerLowMax_tags_1) /sizeof(asn_DEF_CN_IntegerLowMax_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ &asn_PER_type_CN_IntegerLowMax_constr_1, 0, 0, /* No members */ 0 /* No specifics */ @@ -1078,6 +1096,8 @@ NO_IntegerHighMax_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_INTEGER.uper_encoder; td->oer_decoder = asn_DEF_INTEGER.oer_decoder; td->oer_encoder = asn_DEF_INTEGER.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_INTEGER.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_INTEGER.per_constraints; td->elements = asn_DEF_INTEGER.elements; @@ -1168,9 +1188,9 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerHighMax = { NO_IntegerHighMax_encode_der, NO_IntegerHighMax_decode_xer, NO_IntegerHighMax_encode_xer, + 0, 0, /* No OER support, use "-gen-OER" to enable */ NO_IntegerHighMax_decode_uper, NO_IntegerHighMax_encode_uper, - 0, 0, /* No OER support, use "-gen-OER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_NO_IntegerHighMax_tags_1, sizeof(asn_DEF_NO_IntegerHighMax_tags_1) @@ -1178,6 +1198,7 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerHighMax = { asn_DEF_NO_IntegerHighMax_tags_1, /* Same as above */ sizeof(asn_DEF_NO_IntegerHighMax_tags_1) /sizeof(asn_DEF_NO_IntegerHighMax_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ &asn_PER_type_NO_IntegerHighMax_constr_1, 0, 0, /* No members */ 0 /* No specifics */ @@ -1255,6 +1276,8 @@ NO_IntegerLowestMax_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_INTEGER.uper_encoder; td->oer_decoder = asn_DEF_INTEGER.oer_decoder; td->oer_encoder = asn_DEF_INTEGER.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_INTEGER.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_INTEGER.per_constraints; td->elements = asn_DEF_INTEGER.elements; @@ -1345,9 +1368,9 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerLowestMax = { NO_IntegerLowestMax_encode_der, NO_IntegerLowestMax_decode_xer, NO_IntegerLowestMax_encode_xer, + 0, 0, /* No OER support, use "-gen-OER" to enable */ NO_IntegerLowestMax_decode_uper, NO_IntegerLowestMax_encode_uper, - 0, 0, /* No OER support, use "-gen-OER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_NO_IntegerLowestMax_tags_1, sizeof(asn_DEF_NO_IntegerLowestMax_tags_1) @@ -1355,6 +1378,7 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerLowestMax = { asn_DEF_NO_IntegerLowestMax_tags_1, /* Same as above */ sizeof(asn_DEF_NO_IntegerLowestMax_tags_1) /sizeof(asn_DEF_NO_IntegerLowestMax_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ &asn_PER_type_NO_IntegerLowestMax_constr_1, 0, 0, /* No members */ 0 /* No specifics */ @@ -1426,6 +1450,8 @@ NO_IntegerOutRange_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_NativeInteger.uper_encoder; td->oer_decoder = asn_DEF_NativeInteger.oer_decoder; td->oer_encoder = asn_DEF_NativeInteger.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_NativeInteger.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -1521,9 +1547,9 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerOutRange = { NO_IntegerOutRange_encode_der, NO_IntegerOutRange_decode_xer, NO_IntegerOutRange_encode_xer, + 0, 0, /* No OER support, use "-gen-OER" to enable */ NO_IntegerOutRange_decode_uper, NO_IntegerOutRange_encode_uper, - 0, 0, /* No OER support, use "-gen-OER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_NO_IntegerOutRange_tags_1, sizeof(asn_DEF_NO_IntegerOutRange_tags_1) @@ -1531,6 +1557,7 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerOutRange = { asn_DEF_NO_IntegerOutRange_tags_1, /* Same as above */ sizeof(asn_DEF_NO_IntegerOutRange_tags_1) /sizeof(asn_DEF_NO_IntegerOutRange_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ &asn_PER_type_NO_IntegerOutRange_constr_1, 0, 0, /* No members */ &asn_SPC_NO_IntegerOutRange_specs_1 /* Additional specs */ @@ -1602,6 +1629,8 @@ NO_IntegerOutValue_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_NativeInteger.uper_encoder; td->oer_decoder = asn_DEF_NativeInteger.oer_decoder; td->oer_encoder = asn_DEF_NativeInteger.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_NativeInteger.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -1697,9 +1726,9 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerOutValue = { NO_IntegerOutValue_encode_der, NO_IntegerOutValue_decode_xer, NO_IntegerOutValue_encode_xer, + 0, 0, /* No OER support, use "-gen-OER" to enable */ NO_IntegerOutValue_decode_uper, NO_IntegerOutValue_encode_uper, - 0, 0, /* No OER support, use "-gen-OER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_NO_IntegerOutValue_tags_1, sizeof(asn_DEF_NO_IntegerOutValue_tags_1) @@ -1707,6 +1736,7 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerOutValue = { asn_DEF_NO_IntegerOutValue_tags_1, /* Same as above */ sizeof(asn_DEF_NO_IntegerOutValue_tags_1) /sizeof(asn_DEF_NO_IntegerOutValue_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ &asn_PER_type_NO_IntegerOutValue_constr_1, 0, 0, /* No members */ &asn_SPC_NO_IntegerOutValue_specs_1 /* Additional specs */ @@ -1778,6 +1808,8 @@ OK_IntegerInRange1_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_NativeInteger.uper_encoder; td->oer_decoder = asn_DEF_NativeInteger.oer_decoder; td->oer_encoder = asn_DEF_NativeInteger.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_NativeInteger.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -1868,9 +1900,9 @@ asn_TYPE_descriptor_t asn_DEF_OK_IntegerInRange1 = { OK_IntegerInRange1_encode_der, OK_IntegerInRange1_decode_xer, OK_IntegerInRange1_encode_xer, + 0, 0, /* No OER support, use "-gen-OER" to enable */ OK_IntegerInRange1_decode_uper, OK_IntegerInRange1_encode_uper, - 0, 0, /* No OER support, use "-gen-OER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_OK_IntegerInRange1_tags_1, sizeof(asn_DEF_OK_IntegerInRange1_tags_1) @@ -1878,6 +1910,7 @@ asn_TYPE_descriptor_t asn_DEF_OK_IntegerInRange1 = { asn_DEF_OK_IntegerInRange1_tags_1, /* Same as above */ sizeof(asn_DEF_OK_IntegerInRange1_tags_1) /sizeof(asn_DEF_OK_IntegerInRange1_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ &asn_PER_type_OK_IntegerInRange1_constr_1, 0, 0, /* No members */ 0 /* No specifics */ @@ -1949,6 +1982,8 @@ OK_IntegerInRange2_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_NativeInteger.uper_encoder; td->oer_decoder = asn_DEF_NativeInteger.oer_decoder; td->oer_encoder = asn_DEF_NativeInteger.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_NativeInteger.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -2039,9 +2074,9 @@ asn_TYPE_descriptor_t asn_DEF_OK_IntegerInRange2 = { OK_IntegerInRange2_encode_der, OK_IntegerInRange2_decode_xer, OK_IntegerInRange2_encode_xer, + 0, 0, /* No OER support, use "-gen-OER" to enable */ OK_IntegerInRange2_decode_uper, OK_IntegerInRange2_encode_uper, - 0, 0, /* No OER support, use "-gen-OER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_OK_IntegerInRange2_tags_1, sizeof(asn_DEF_OK_IntegerInRange2_tags_1) @@ -2049,6 +2084,7 @@ asn_TYPE_descriptor_t asn_DEF_OK_IntegerInRange2 = { asn_DEF_OK_IntegerInRange2_tags_1, /* Same as above */ sizeof(asn_DEF_OK_IntegerInRange2_tags_1) /sizeof(asn_DEF_OK_IntegerInRange2_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ &asn_PER_type_OK_IntegerInRange2_constr_1, 0, 0, /* No members */ 0 /* No specifics */ @@ -2120,6 +2156,8 @@ OK_IntegerInRange3_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_NativeInteger.uper_encoder; td->oer_decoder = asn_DEF_NativeInteger.oer_decoder; td->oer_encoder = asn_DEF_NativeInteger.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_NativeInteger.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -2210,9 +2248,9 @@ asn_TYPE_descriptor_t asn_DEF_OK_IntegerInRange3 = { OK_IntegerInRange3_encode_der, OK_IntegerInRange3_decode_xer, OK_IntegerInRange3_encode_xer, + 0, 0, /* No OER support, use "-gen-OER" to enable */ OK_IntegerInRange3_decode_uper, OK_IntegerInRange3_encode_uper, - 0, 0, /* No OER support, use "-gen-OER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_OK_IntegerInRange3_tags_1, sizeof(asn_DEF_OK_IntegerInRange3_tags_1) @@ -2220,6 +2258,7 @@ asn_TYPE_descriptor_t asn_DEF_OK_IntegerInRange3 = { asn_DEF_OK_IntegerInRange3_tags_1, /* Same as above */ sizeof(asn_DEF_OK_IntegerInRange3_tags_1) /sizeof(asn_DEF_OK_IntegerInRange3_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ &asn_PER_type_OK_IntegerInRange3_constr_1, 0, 0, /* No members */ 0 /* No specifics */ @@ -2291,6 +2330,8 @@ OK_IntegerInRange4_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_NativeInteger.uper_encoder; td->oer_decoder = asn_DEF_NativeInteger.oer_decoder; td->oer_encoder = asn_DEF_NativeInteger.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_NativeInteger.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -2381,9 +2422,9 @@ asn_TYPE_descriptor_t asn_DEF_OK_IntegerInRange4 = { OK_IntegerInRange4_encode_der, OK_IntegerInRange4_decode_xer, OK_IntegerInRange4_encode_xer, + 0, 0, /* No OER support, use "-gen-OER" to enable */ OK_IntegerInRange4_decode_uper, OK_IntegerInRange4_encode_uper, - 0, 0, /* No OER support, use "-gen-OER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_OK_IntegerInRange4_tags_1, sizeof(asn_DEF_OK_IntegerInRange4_tags_1) @@ -2391,6 +2432,7 @@ asn_TYPE_descriptor_t asn_DEF_OK_IntegerInRange4 = { asn_DEF_OK_IntegerInRange4_tags_1, /* Same as above */ sizeof(asn_DEF_OK_IntegerInRange4_tags_1) /sizeof(asn_DEF_OK_IntegerInRange4_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ &asn_PER_type_OK_IntegerInRange4_constr_1, 0, 0, /* No members */ 0 /* No specifics */ @@ -2462,6 +2504,8 @@ OK_IntegerInRange5_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_NativeInteger.uper_encoder; td->oer_decoder = asn_DEF_NativeInteger.oer_decoder; td->oer_encoder = asn_DEF_NativeInteger.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_NativeInteger.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -2552,9 +2596,9 @@ asn_TYPE_descriptor_t asn_DEF_OK_IntegerInRange5 = { OK_IntegerInRange5_encode_der, OK_IntegerInRange5_decode_xer, OK_IntegerInRange5_encode_xer, + 0, 0, /* No OER support, use "-gen-OER" to enable */ OK_IntegerInRange5_decode_uper, OK_IntegerInRange5_encode_uper, - 0, 0, /* No OER support, use "-gen-OER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_OK_IntegerInRange5_tags_1, sizeof(asn_DEF_OK_IntegerInRange5_tags_1) @@ -2562,6 +2606,7 @@ asn_TYPE_descriptor_t asn_DEF_OK_IntegerInRange5 = { asn_DEF_OK_IntegerInRange5_tags_1, /* Same as above */ sizeof(asn_DEF_OK_IntegerInRange5_tags_1) /sizeof(asn_DEF_OK_IntegerInRange5_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ &asn_PER_type_OK_IntegerInRange5_constr_1, 0, 0, /* No members */ 0 /* No specifics */ @@ -2624,6 +2669,8 @@ NO_IntegerInRange6_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_NativeInteger.uper_encoder; td->oer_decoder = asn_DEF_NativeInteger.oer_decoder; td->oer_encoder = asn_DEF_NativeInteger.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_NativeInteger.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -2719,9 +2766,9 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerInRange6 = { NO_IntegerInRange6_encode_der, NO_IntegerInRange6_decode_xer, NO_IntegerInRange6_encode_xer, + 0, 0, /* No OER support, use "-gen-OER" to enable */ NO_IntegerInRange6_decode_uper, NO_IntegerInRange6_encode_uper, - 0, 0, /* No OER support, use "-gen-OER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_NO_IntegerInRange6_tags_1, sizeof(asn_DEF_NO_IntegerInRange6_tags_1) @@ -2729,6 +2776,7 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerInRange6 = { asn_DEF_NO_IntegerInRange6_tags_1, /* Same as above */ sizeof(asn_DEF_NO_IntegerInRange6_tags_1) /sizeof(asn_DEF_NO_IntegerInRange6_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ &asn_PER_type_NO_IntegerInRange6_constr_1, 0, 0, /* No members */ &asn_SPC_NO_IntegerInRange6_specs_1 /* Additional specs */ @@ -2790,6 +2838,8 @@ CN_IntegerEnumerated1_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_NativeInteger.uper_encoder; td->oer_decoder = asn_DEF_NativeInteger.oer_decoder; td->oer_encoder = asn_DEF_NativeInteger.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_NativeInteger.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -2872,9 +2922,9 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerEnumerated1 = { CN_IntegerEnumerated1_encode_der, CN_IntegerEnumerated1_decode_xer, CN_IntegerEnumerated1_encode_xer, + 0, 0, /* No OER support, use "-gen-OER" to enable */ CN_IntegerEnumerated1_decode_uper, CN_IntegerEnumerated1_encode_uper, - 0, 0, /* No OER support, use "-gen-OER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_CN_IntegerEnumerated1_tags_1, sizeof(asn_DEF_CN_IntegerEnumerated1_tags_1) @@ -2882,6 +2932,7 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerEnumerated1 = { asn_DEF_CN_IntegerEnumerated1_tags_1, /* Same as above */ sizeof(asn_DEF_CN_IntegerEnumerated1_tags_1) /sizeof(asn_DEF_CN_IntegerEnumerated1_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* Defined elsewhere */ 0 /* No specifics */ @@ -2943,6 +2994,8 @@ NO_IntegerEnumerated2_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_INTEGER.uper_encoder; td->oer_decoder = asn_DEF_INTEGER.oer_decoder; td->oer_encoder = asn_DEF_INTEGER.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_INTEGER.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_INTEGER.per_constraints; td->elements = asn_DEF_INTEGER.elements; @@ -3025,9 +3078,9 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerEnumerated2 = { NO_IntegerEnumerated2_encode_der, NO_IntegerEnumerated2_decode_xer, NO_IntegerEnumerated2_encode_xer, + 0, 0, /* No OER support, use "-gen-OER" to enable */ NO_IntegerEnumerated2_decode_uper, NO_IntegerEnumerated2_encode_uper, - 0, 0, /* No OER support, use "-gen-OER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_NO_IntegerEnumerated2_tags_1, sizeof(asn_DEF_NO_IntegerEnumerated2_tags_1) @@ -3035,6 +3088,7 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerEnumerated2 = { asn_DEF_NO_IntegerEnumerated2_tags_1, /* Same as above */ sizeof(asn_DEF_NO_IntegerEnumerated2_tags_1) /sizeof(asn_DEF_NO_IntegerEnumerated2_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* Defined elsewhere */ 0 /* No specifics */ diff --git a/tests/91-cond-int-blessSize-OK.asn1.-Pfbless-SIZE b/tests/91-cond-int-blessSize-OK.asn1.-Pfbless-SIZE index dddd6c5f..0ffabb1d 100644 --- a/tests/91-cond-int-blessSize-OK.asn1.-Pfbless-SIZE +++ b/tests/91-cond-int-blessSize-OK.asn1.-Pfbless-SIZE @@ -58,6 +58,8 @@ OK_Integer1_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_NativeInteger.uper_encoder; td->oer_decoder = asn_DEF_NativeInteger.oer_decoder; td->oer_encoder = asn_DEF_NativeInteger.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_NativeInteger.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -125,8 +127,8 @@ asn_TYPE_descriptor_t asn_DEF_OK_Integer1 = { OK_Integer1_encode_der, OK_Integer1_decode_xer, OK_Integer1_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_OK_Integer1_tags_1, sizeof(asn_DEF_OK_Integer1_tags_1) @@ -134,6 +136,7 @@ asn_TYPE_descriptor_t asn_DEF_OK_Integer1 = { asn_DEF_OK_Integer1_tags_1, /* Same as above */ sizeof(asn_DEF_OK_Integer1_tags_1) /sizeof(asn_DEF_OK_Integer1_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -199,6 +202,8 @@ OK_Integer2_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_NativeInteger.uper_encoder; td->oer_decoder = asn_DEF_NativeInteger.oer_decoder; td->oer_encoder = asn_DEF_NativeInteger.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_NativeInteger.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -266,8 +271,8 @@ asn_TYPE_descriptor_t asn_DEF_OK_Integer2 = { OK_Integer2_encode_der, OK_Integer2_decode_xer, OK_Integer2_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_OK_Integer2_tags_1, sizeof(asn_DEF_OK_Integer2_tags_1) @@ -275,6 +280,7 @@ asn_TYPE_descriptor_t asn_DEF_OK_Integer2 = { asn_DEF_OK_Integer2_tags_1, /* Same as above */ sizeof(asn_DEF_OK_Integer2_tags_1) /sizeof(asn_DEF_OK_Integer2_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -340,6 +346,8 @@ OK_Integer3_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_NativeInteger.uper_encoder; td->oer_decoder = asn_DEF_NativeInteger.oer_decoder; td->oer_encoder = asn_DEF_NativeInteger.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_NativeInteger.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -407,8 +415,8 @@ asn_TYPE_descriptor_t asn_DEF_OK_Integer3 = { OK_Integer3_encode_der, OK_Integer3_decode_xer, OK_Integer3_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_OK_Integer3_tags_1, sizeof(asn_DEF_OK_Integer3_tags_1) @@ -416,6 +424,7 @@ asn_TYPE_descriptor_t asn_DEF_OK_Integer3 = { asn_DEF_OK_Integer3_tags_1, /* Same as above */ sizeof(asn_DEF_OK_Integer3_tags_1) /sizeof(asn_DEF_OK_Integer3_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -481,6 +490,8 @@ OK_Integer4_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_NativeInteger.uper_encoder; td->oer_decoder = asn_DEF_NativeInteger.oer_decoder; td->oer_encoder = asn_DEF_NativeInteger.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_NativeInteger.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -548,8 +559,8 @@ asn_TYPE_descriptor_t asn_DEF_OK_Integer4 = { OK_Integer4_encode_der, OK_Integer4_decode_xer, OK_Integer4_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_OK_Integer4_tags_1, sizeof(asn_DEF_OK_Integer4_tags_1) @@ -557,6 +568,7 @@ asn_TYPE_descriptor_t asn_DEF_OK_Integer4 = { asn_DEF_OK_Integer4_tags_1, /* Same as above */ sizeof(asn_DEF_OK_Integer4_tags_1) /sizeof(asn_DEF_OK_Integer4_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ @@ -622,6 +634,8 @@ NO_Integer5_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_NativeInteger.uper_encoder; td->oer_decoder = asn_DEF_NativeInteger.oer_decoder; td->oer_encoder = asn_DEF_NativeInteger.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_NativeInteger.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -689,8 +703,8 @@ asn_TYPE_descriptor_t asn_DEF_NO_Integer5 = { NO_Integer5_encode_der, NO_Integer5_decode_xer, NO_Integer5_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_NO_Integer5_tags_1, sizeof(asn_DEF_NO_Integer5_tags_1) @@ -698,6 +712,7 @@ asn_TYPE_descriptor_t asn_DEF_NO_Integer5 = { asn_DEF_NO_Integer5_tags_1, /* Same as above */ sizeof(asn_DEF_NO_Integer5_tags_1) /sizeof(asn_DEF_NO_Integer5_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* No members */ 0 /* No specifics */ diff --git a/tests/92-circular-loops-OK.asn1.-Pfindirect-choice b/tests/92-circular-loops-OK.asn1.-Pfindirect-choice index cf327980..9ab79e91 100644 --- a/tests/92-circular-loops-OK.asn1.-Pfindirect-choice +++ b/tests/92-circular-loops-OK.asn1.-Pfindirect-choice @@ -52,6 +52,7 @@ static asn_TYPE_member_t asn_MBR_Everything_1[] = { .tag_mode = +1, /* EXPLICIT tag at current level */ .type = &asn_DEF_Choice1, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "ch1" @@ -61,6 +62,7 @@ static asn_TYPE_member_t asn_MBR_Everything_1[] = { .tag_mode = +1, /* EXPLICIT tag at current level */ .type = &asn_DEF_Choice2, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "ch2" @@ -70,6 +72,7 @@ static asn_TYPE_member_t asn_MBR_Everything_1[] = { .tag_mode = +1, /* EXPLICIT tag at current level */ .type = &asn_DEF_Choice3, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "ch3" @@ -79,6 +82,7 @@ static asn_TYPE_member_t asn_MBR_Everything_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_Set, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "set" @@ -88,6 +92,7 @@ static asn_TYPE_member_t asn_MBR_Everything_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_Alpha, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "a" @@ -97,6 +102,7 @@ static asn_TYPE_member_t asn_MBR_Everything_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_Beta, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "b" @@ -106,6 +112,7 @@ static asn_TYPE_member_t asn_MBR_Everything_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_Gamma, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "g" @@ -115,6 +122,7 @@ static asn_TYPE_member_t asn_MBR_Everything_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_OneTwo, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "ot" @@ -124,6 +132,7 @@ static asn_TYPE_member_t asn_MBR_Everything_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_TwoThree, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "tt" @@ -133,6 +142,7 @@ static asn_TYPE_member_t asn_MBR_Everything_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_ThreeOne, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "to" @@ -172,8 +182,8 @@ asn_TYPE_descriptor_t asn_DEF_Everything = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Everything_tags_1, sizeof(asn_DEF_Everything_tags_1) @@ -181,6 +191,7 @@ asn_TYPE_descriptor_t asn_DEF_Everything = { asn_DEF_Everything_tags_1, /* Same as above */ sizeof(asn_DEF_Everything_tags_1) /sizeof(asn_DEF_Everything_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_Everything_1, 10, /* Elements count */ @@ -238,6 +249,7 @@ static asn_TYPE_member_t asn_MBR_Choice1_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_Everything, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "something" @@ -247,6 +259,7 @@ static asn_TYPE_member_t asn_MBR_Choice1_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_Everything, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "some2" @@ -276,13 +289,14 @@ asn_TYPE_descriptor_t asn_DEF_Choice1 = { CHOICE_encode_der, CHOICE_decode_xer, CHOICE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ CHOICE_outmost_tag, 0, /* No effective tags (pointer) */ 0, /* No effective tags (count) */ 0, /* No tags (pointer) */ 0, /* No tags (count) */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_Choice1_1, 2, /* Elements count */ @@ -342,6 +356,7 @@ static asn_TYPE_member_t asn_MBR_Choice2_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_TypeRef, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "typeref" @@ -351,6 +366,7 @@ static asn_TYPE_member_t asn_MBR_Choice2_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_Everything, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "some3" @@ -380,13 +396,14 @@ asn_TYPE_descriptor_t asn_DEF_Choice2 = { CHOICE_encode_der, CHOICE_decode_xer, CHOICE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ CHOICE_outmost_tag, 0, /* No effective tags (pointer) */ 0, /* No effective tags (count) */ 0, /* No tags (pointer) */ 0, /* No tags (count) */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_Choice2_1, 2, /* Elements count */ @@ -456,6 +473,7 @@ static asn_TYPE_member_t asn_MBR_a_2[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_Everything, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "aa" @@ -488,8 +506,8 @@ asn_TYPE_descriptor_t asn_DEF_a_2 = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_a_tags_2, sizeof(asn_DEF_a_tags_2) @@ -497,6 +515,7 @@ asn_TYPE_descriptor_t asn_DEF_a_2 = { asn_DEF_a_tags_2, /* Same as above */ sizeof(asn_DEF_a_tags_2) /sizeof(asn_DEF_a_tags_2[0]), /* 2 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_a_2, 1, /* Elements count */ @@ -509,6 +528,7 @@ static asn_TYPE_member_t asn_MBR_c_5[] = { .tag_mode = 0, .type = &asn_DEF_Choice3, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "" @@ -534,8 +554,8 @@ asn_TYPE_descriptor_t asn_DEF_c_5 = { SEQUENCE_OF_encode_der, SEQUENCE_OF_decode_xer, SEQUENCE_OF_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_c_tags_5, sizeof(asn_DEF_c_tags_5) @@ -543,6 +563,7 @@ asn_TYPE_descriptor_t asn_DEF_c_5 = { asn_DEF_c_tags_5, /* Same as above */ sizeof(asn_DEF_c_tags_5) /sizeof(asn_DEF_c_tags_5[0]), /* 2 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_c_5, 1, /* Single element */ @@ -555,6 +576,7 @@ static asn_TYPE_member_t asn_MBR_Choice3_1[] = { .tag_mode = 0, .type = &asn_DEF_a_2, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "a" @@ -564,6 +586,7 @@ static asn_TYPE_member_t asn_MBR_Choice3_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_Everything, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "b" @@ -573,6 +596,7 @@ static asn_TYPE_member_t asn_MBR_Choice3_1[] = { .tag_mode = 0, .type = &asn_DEF_c_5, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "c" @@ -603,13 +627,14 @@ asn_TYPE_descriptor_t asn_DEF_Choice3 = { CHOICE_encode_der, CHOICE_decode_xer, CHOICE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ CHOICE_outmost_tag, 0, /* No effective tags (pointer) */ 0, /* No effective tags (count) */ 0, /* No tags (pointer) */ 0, /* No tags (count) */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_Choice3_1, 3, /* Elements count */ @@ -672,6 +697,7 @@ static asn_TYPE_member_t asn_MBR_Member_2[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_NativeInteger, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "int" @@ -681,6 +707,7 @@ static asn_TYPE_member_t asn_MBR_Member_2[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_Set, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "set" @@ -690,6 +717,7 @@ static asn_TYPE_member_t asn_MBR_Member_2[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_Sequence, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "seq" @@ -699,6 +727,7 @@ static asn_TYPE_member_t asn_MBR_Member_2[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_Set, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "set2" @@ -708,6 +737,7 @@ static asn_TYPE_member_t asn_MBR_Member_2[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_Set, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "set3" @@ -743,8 +773,8 @@ asn_TYPE_descriptor_t asn_DEF_Member_2 = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Member_tags_2, sizeof(asn_DEF_Member_tags_2) @@ -752,6 +782,7 @@ asn_TYPE_descriptor_t asn_DEF_Member_2 = { asn_DEF_Member_tags_2, /* Same as above */ sizeof(asn_DEF_Member_tags_2) /sizeof(asn_DEF_Member_tags_2[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_Member_2, 5, /* Elements count */ @@ -764,6 +795,7 @@ static asn_TYPE_member_t asn_MBR_Set_1[] = { .tag_mode = 0, .type = &asn_DEF_Member_2, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "" @@ -787,8 +819,8 @@ asn_TYPE_descriptor_t asn_DEF_Set = { SET_OF_encode_der, SET_OF_decode_xer, SET_OF_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Set_tags_1, sizeof(asn_DEF_Set_tags_1) @@ -796,6 +828,7 @@ asn_TYPE_descriptor_t asn_DEF_Set = { asn_DEF_Set_tags_1, /* Same as above */ sizeof(asn_DEF_Set_tags_1) /sizeof(asn_DEF_Set_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_Set_1, 1, /* Single element */ @@ -846,6 +879,7 @@ static asn_TYPE_member_t asn_MBR_Sequence_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_NativeInteger, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "a" @@ -855,6 +889,7 @@ static asn_TYPE_member_t asn_MBR_Sequence_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_Sequence, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "seq" @@ -864,6 +899,7 @@ static asn_TYPE_member_t asn_MBR_Sequence_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_NativeInteger, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "b" @@ -873,6 +909,7 @@ static asn_TYPE_member_t asn_MBR_Sequence_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_Set, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "set" @@ -906,8 +943,8 @@ asn_TYPE_descriptor_t asn_DEF_Sequence = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Sequence_tags_1, sizeof(asn_DEF_Sequence_tags_1) @@ -915,6 +952,7 @@ asn_TYPE_descriptor_t asn_DEF_Sequence = { asn_DEF_Sequence_tags_1, /* Same as above */ sizeof(asn_DEF_Sequence_tags_1) /sizeof(asn_DEF_Sequence_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_Sequence_1, 4, /* Elements count */ @@ -968,6 +1006,8 @@ TypeRef_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_Sequence.uper_encoder; td->oer_decoder = asn_DEF_Sequence.oer_decoder; td->oer_encoder = asn_DEF_Sequence.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_Sequence.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_Sequence.per_constraints; td->elements = asn_DEF_Sequence.elements; @@ -1035,8 +1075,8 @@ asn_TYPE_descriptor_t asn_DEF_TypeRef = { TypeRef_encode_der, TypeRef_decode_xer, TypeRef_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_TypeRef_tags_1, sizeof(asn_DEF_TypeRef_tags_1) @@ -1044,6 +1084,7 @@ asn_TYPE_descriptor_t asn_DEF_TypeRef = { asn_DEF_TypeRef_tags_1, /* Same as above */ sizeof(asn_DEF_TypeRef_tags_1) /sizeof(asn_DEF_TypeRef_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* Defined elsewhere */ 0 /* No specifics */ @@ -1089,6 +1130,7 @@ static asn_TYPE_member_t asn_MBR_b_3[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_Beta, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "b" @@ -1121,8 +1163,8 @@ asn_TYPE_descriptor_t asn_DEF_b_3 = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_b_tags_3, sizeof(asn_DEF_b_tags_3) @@ -1130,6 +1172,7 @@ asn_TYPE_descriptor_t asn_DEF_b_3 = { asn_DEF_b_tags_3, /* Same as above */ sizeof(asn_DEF_b_tags_3) /sizeof(asn_DEF_b_tags_3[0]), /* 2 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_b_3, 1, /* Elements count */ @@ -1142,6 +1185,7 @@ static asn_TYPE_member_t asn_MBR_Alpha_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_Beta, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "a" @@ -1151,6 +1195,7 @@ static asn_TYPE_member_t asn_MBR_Alpha_1[] = { .tag_mode = 0, .type = &asn_DEF_b_3, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "b" @@ -1182,8 +1227,8 @@ asn_TYPE_descriptor_t asn_DEF_Alpha = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Alpha_tags_1, sizeof(asn_DEF_Alpha_tags_1) @@ -1191,6 +1236,7 @@ asn_TYPE_descriptor_t asn_DEF_Alpha = { asn_DEF_Alpha_tags_1, /* Same as above */ sizeof(asn_DEF_Alpha_tags_1) /sizeof(asn_DEF_Alpha_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_Alpha_1, 2, /* Elements count */ @@ -1234,6 +1280,7 @@ static asn_TYPE_member_t asn_MBR_Beta_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_Alpha, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "b" @@ -1243,6 +1290,7 @@ static asn_TYPE_member_t asn_MBR_Beta_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_Gamma, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "g" @@ -1274,8 +1322,8 @@ asn_TYPE_descriptor_t asn_DEF_Beta = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Beta_tags_1, sizeof(asn_DEF_Beta_tags_1) @@ -1283,6 +1331,7 @@ asn_TYPE_descriptor_t asn_DEF_Beta = { asn_DEF_Beta_tags_1, /* Same as above */ sizeof(asn_DEF_Beta_tags_1) /sizeof(asn_DEF_Beta_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_Beta_1, 2, /* Elements count */ @@ -1329,6 +1378,7 @@ static asn_TYPE_member_t asn_MBR_Gamma_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_TwoThree, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "o" @@ -1338,6 +1388,7 @@ static asn_TYPE_member_t asn_MBR_Gamma_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_Alpha, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "a" @@ -1347,6 +1398,7 @@ static asn_TYPE_member_t asn_MBR_Gamma_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_Beta, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "b" @@ -1379,8 +1431,8 @@ asn_TYPE_descriptor_t asn_DEF_Gamma = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Gamma_tags_1, sizeof(asn_DEF_Gamma_tags_1) @@ -1388,6 +1440,7 @@ asn_TYPE_descriptor_t asn_DEF_Gamma = { asn_DEF_Gamma_tags_1, /* Same as above */ sizeof(asn_DEF_Gamma_tags_1) /sizeof(asn_DEF_Gamma_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_Gamma_1, 3, /* Elements count */ @@ -1442,6 +1495,7 @@ static asn_TYPE_member_t asn_MBR_OneTwo_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_TwoThree, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "m12" @@ -1477,8 +1531,8 @@ asn_TYPE_descriptor_t asn_DEF_OneTwo = { SET_encode_der, SET_decode_xer, SET_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_OneTwo_tags_1, sizeof(asn_DEF_OneTwo_tags_1) @@ -1486,6 +1540,7 @@ asn_TYPE_descriptor_t asn_DEF_OneTwo = { asn_DEF_OneTwo_tags_1, /* Same as above */ sizeof(asn_DEF_OneTwo_tags_1) /sizeof(asn_DEF_OneTwo_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_OneTwo_1, 1, /* Elements count */ @@ -1540,6 +1595,7 @@ static asn_TYPE_member_t asn_MBR_TwoThree_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_ThreeOne, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "m23" @@ -1575,8 +1631,8 @@ asn_TYPE_descriptor_t asn_DEF_TwoThree = { SET_encode_der, SET_decode_xer, SET_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_TwoThree_tags_1, sizeof(asn_DEF_TwoThree_tags_1) @@ -1584,6 +1640,7 @@ asn_TYPE_descriptor_t asn_DEF_TwoThree = { asn_DEF_TwoThree_tags_1, /* Same as above */ sizeof(asn_DEF_TwoThree_tags_1) /sizeof(asn_DEF_TwoThree_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_TwoThree_1, 1, /* Elements count */ @@ -1642,6 +1699,7 @@ static asn_TYPE_member_t asn_MBR_ThreeOne_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_OneTwo, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "m31" @@ -1651,6 +1709,7 @@ static asn_TYPE_member_t asn_MBR_ThreeOne_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_Gamma, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "g" @@ -1687,8 +1746,8 @@ asn_TYPE_descriptor_t asn_DEF_ThreeOne = { SET_encode_der, SET_decode_xer, SET_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_ThreeOne_tags_1, sizeof(asn_DEF_ThreeOne_tags_1) @@ -1696,6 +1755,7 @@ asn_TYPE_descriptor_t asn_DEF_ThreeOne = { asn_DEF_ThreeOne_tags_1, /* Same as above */ sizeof(asn_DEF_ThreeOne_tags_1) /sizeof(asn_DEF_ThreeOne_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_ThreeOne_1, 2, /* Elements count */ diff --git a/tests/92-circular-loops-OK.asn1.-Pfwide-types b/tests/92-circular-loops-OK.asn1.-Pfwide-types index 000da2cd..03779e22 100644 --- a/tests/92-circular-loops-OK.asn1.-Pfwide-types +++ b/tests/92-circular-loops-OK.asn1.-Pfwide-types @@ -52,6 +52,7 @@ static asn_TYPE_member_t asn_MBR_Everything_1[] = { .tag_mode = +1, /* EXPLICIT tag at current level */ .type = &asn_DEF_Choice1, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "ch1" @@ -61,6 +62,7 @@ static asn_TYPE_member_t asn_MBR_Everything_1[] = { .tag_mode = +1, /* EXPLICIT tag at current level */ .type = &asn_DEF_Choice2, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "ch2" @@ -70,6 +72,7 @@ static asn_TYPE_member_t asn_MBR_Everything_1[] = { .tag_mode = +1, /* EXPLICIT tag at current level */ .type = &asn_DEF_Choice3, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "ch3" @@ -79,6 +82,7 @@ static asn_TYPE_member_t asn_MBR_Everything_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_Set, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "set" @@ -88,6 +92,7 @@ static asn_TYPE_member_t asn_MBR_Everything_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_Alpha, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "a" @@ -97,6 +102,7 @@ static asn_TYPE_member_t asn_MBR_Everything_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_Beta, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "b" @@ -106,6 +112,7 @@ static asn_TYPE_member_t asn_MBR_Everything_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_Gamma, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "g" @@ -115,6 +122,7 @@ static asn_TYPE_member_t asn_MBR_Everything_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_OneTwo, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "ot" @@ -124,6 +132,7 @@ static asn_TYPE_member_t asn_MBR_Everything_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_TwoThree, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "tt" @@ -133,6 +142,7 @@ static asn_TYPE_member_t asn_MBR_Everything_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_ThreeOne, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "to" @@ -172,8 +182,8 @@ asn_TYPE_descriptor_t asn_DEF_Everything = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Everything_tags_1, sizeof(asn_DEF_Everything_tags_1) @@ -181,6 +191,7 @@ asn_TYPE_descriptor_t asn_DEF_Everything = { asn_DEF_Everything_tags_1, /* Same as above */ sizeof(asn_DEF_Everything_tags_1) /sizeof(asn_DEF_Everything_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_Everything_1, 10, /* Elements count */ @@ -238,6 +249,7 @@ static asn_TYPE_member_t asn_MBR_Choice1_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_Everything, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "something" @@ -247,6 +259,7 @@ static asn_TYPE_member_t asn_MBR_Choice1_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_Everything, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "some2" @@ -276,13 +289,14 @@ asn_TYPE_descriptor_t asn_DEF_Choice1 = { CHOICE_encode_der, CHOICE_decode_xer, CHOICE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ CHOICE_outmost_tag, 0, /* No effective tags (pointer) */ 0, /* No effective tags (count) */ 0, /* No tags (pointer) */ 0, /* No tags (count) */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_Choice1_1, 2, /* Elements count */ @@ -341,6 +355,7 @@ static asn_TYPE_member_t asn_MBR_Choice2_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_TypeRef, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "typeref" @@ -350,6 +365,7 @@ static asn_TYPE_member_t asn_MBR_Choice2_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_Everything, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "some3" @@ -379,13 +395,14 @@ asn_TYPE_descriptor_t asn_DEF_Choice2 = { CHOICE_encode_der, CHOICE_decode_xer, CHOICE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ CHOICE_outmost_tag, 0, /* No effective tags (pointer) */ 0, /* No effective tags (count) */ 0, /* No tags (pointer) */ 0, /* No tags (count) */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_Choice2_1, 2, /* Elements count */ @@ -455,6 +472,7 @@ static asn_TYPE_member_t asn_MBR_a_2[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_Everything, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "aa" @@ -487,8 +505,8 @@ asn_TYPE_descriptor_t asn_DEF_a_2 = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_a_tags_2, sizeof(asn_DEF_a_tags_2) @@ -496,6 +514,7 @@ asn_TYPE_descriptor_t asn_DEF_a_2 = { asn_DEF_a_tags_2, /* Same as above */ sizeof(asn_DEF_a_tags_2) /sizeof(asn_DEF_a_tags_2[0]), /* 2 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_a_2, 1, /* Elements count */ @@ -508,6 +527,7 @@ static asn_TYPE_member_t asn_MBR_c_5[] = { .tag_mode = 0, .type = &asn_DEF_Choice3, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "" @@ -533,8 +553,8 @@ asn_TYPE_descriptor_t asn_DEF_c_5 = { SEQUENCE_OF_encode_der, SEQUENCE_OF_decode_xer, SEQUENCE_OF_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_c_tags_5, sizeof(asn_DEF_c_tags_5) @@ -542,6 +562,7 @@ asn_TYPE_descriptor_t asn_DEF_c_5 = { asn_DEF_c_tags_5, /* Same as above */ sizeof(asn_DEF_c_tags_5) /sizeof(asn_DEF_c_tags_5[0]), /* 2 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_c_5, 1, /* Single element */ @@ -554,6 +575,7 @@ static asn_TYPE_member_t asn_MBR_Choice3_1[] = { .tag_mode = 0, .type = &asn_DEF_a_2, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "a" @@ -563,6 +585,7 @@ static asn_TYPE_member_t asn_MBR_Choice3_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_Everything, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "b" @@ -572,6 +595,7 @@ static asn_TYPE_member_t asn_MBR_Choice3_1[] = { .tag_mode = 0, .type = &asn_DEF_c_5, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "c" @@ -602,13 +626,14 @@ asn_TYPE_descriptor_t asn_DEF_Choice3 = { CHOICE_encode_der, CHOICE_decode_xer, CHOICE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ CHOICE_outmost_tag, 0, /* No effective tags (pointer) */ 0, /* No effective tags (count) */ 0, /* No tags (pointer) */ 0, /* No tags (count) */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_Choice3_1, 3, /* Elements count */ @@ -671,6 +696,7 @@ static asn_TYPE_member_t asn_MBR_Member_2[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "int" @@ -680,6 +706,7 @@ static asn_TYPE_member_t asn_MBR_Member_2[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_Set, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "set" @@ -689,6 +716,7 @@ static asn_TYPE_member_t asn_MBR_Member_2[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_Sequence, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "seq" @@ -698,6 +726,7 @@ static asn_TYPE_member_t asn_MBR_Member_2[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_Set, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "set2" @@ -707,6 +736,7 @@ static asn_TYPE_member_t asn_MBR_Member_2[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_Set, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "set3" @@ -742,8 +772,8 @@ asn_TYPE_descriptor_t asn_DEF_Member_2 = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Member_tags_2, sizeof(asn_DEF_Member_tags_2) @@ -751,6 +781,7 @@ asn_TYPE_descriptor_t asn_DEF_Member_2 = { asn_DEF_Member_tags_2, /* Same as above */ sizeof(asn_DEF_Member_tags_2) /sizeof(asn_DEF_Member_tags_2[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_Member_2, 5, /* Elements count */ @@ -763,6 +794,7 @@ static asn_TYPE_member_t asn_MBR_Set_1[] = { .tag_mode = 0, .type = &asn_DEF_Member_2, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "" @@ -786,8 +818,8 @@ asn_TYPE_descriptor_t asn_DEF_Set = { SET_OF_encode_der, SET_OF_decode_xer, SET_OF_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Set_tags_1, sizeof(asn_DEF_Set_tags_1) @@ -795,6 +827,7 @@ asn_TYPE_descriptor_t asn_DEF_Set = { asn_DEF_Set_tags_1, /* Same as above */ sizeof(asn_DEF_Set_tags_1) /sizeof(asn_DEF_Set_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_Set_1, 1, /* Single element */ @@ -845,6 +878,7 @@ static asn_TYPE_member_t asn_MBR_Sequence_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "a" @@ -854,6 +888,7 @@ static asn_TYPE_member_t asn_MBR_Sequence_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_Sequence, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "seq" @@ -863,6 +898,7 @@ static asn_TYPE_member_t asn_MBR_Sequence_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "b" @@ -872,6 +908,7 @@ static asn_TYPE_member_t asn_MBR_Sequence_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_Set, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "set" @@ -905,8 +942,8 @@ asn_TYPE_descriptor_t asn_DEF_Sequence = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Sequence_tags_1, sizeof(asn_DEF_Sequence_tags_1) @@ -914,6 +951,7 @@ asn_TYPE_descriptor_t asn_DEF_Sequence = { asn_DEF_Sequence_tags_1, /* Same as above */ sizeof(asn_DEF_Sequence_tags_1) /sizeof(asn_DEF_Sequence_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_Sequence_1, 4, /* Elements count */ @@ -967,6 +1005,8 @@ TypeRef_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->uper_encoder = asn_DEF_Sequence.uper_encoder; td->oer_decoder = asn_DEF_Sequence.oer_decoder; td->oer_encoder = asn_DEF_Sequence.oer_encoder; + if(!td->oer_constraints) + td->oer_constraints = asn_DEF_Sequence.oer_constraints; if(!td->per_constraints) td->per_constraints = asn_DEF_Sequence.per_constraints; td->elements = asn_DEF_Sequence.elements; @@ -1034,8 +1074,8 @@ asn_TYPE_descriptor_t asn_DEF_TypeRef = { TypeRef_encode_der, TypeRef_decode_xer, TypeRef_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_TypeRef_tags_1, sizeof(asn_DEF_TypeRef_tags_1) @@ -1043,6 +1083,7 @@ asn_TYPE_descriptor_t asn_DEF_TypeRef = { asn_DEF_TypeRef_tags_1, /* Same as above */ sizeof(asn_DEF_TypeRef_tags_1) /sizeof(asn_DEF_TypeRef_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ 0, 0, /* Defined elsewhere */ 0 /* No specifics */ @@ -1088,6 +1129,7 @@ static asn_TYPE_member_t asn_MBR_b_3[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_Beta, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "b" @@ -1120,8 +1162,8 @@ asn_TYPE_descriptor_t asn_DEF_b_3 = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_b_tags_3, sizeof(asn_DEF_b_tags_3) @@ -1129,6 +1171,7 @@ asn_TYPE_descriptor_t asn_DEF_b_3 = { asn_DEF_b_tags_3, /* Same as above */ sizeof(asn_DEF_b_tags_3) /sizeof(asn_DEF_b_tags_3[0]), /* 2 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_b_3, 1, /* Elements count */ @@ -1141,6 +1184,7 @@ static asn_TYPE_member_t asn_MBR_Alpha_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_Beta, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "a" @@ -1150,6 +1194,7 @@ static asn_TYPE_member_t asn_MBR_Alpha_1[] = { .tag_mode = 0, .type = &asn_DEF_b_3, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "b" @@ -1181,8 +1226,8 @@ asn_TYPE_descriptor_t asn_DEF_Alpha = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Alpha_tags_1, sizeof(asn_DEF_Alpha_tags_1) @@ -1190,6 +1235,7 @@ asn_TYPE_descriptor_t asn_DEF_Alpha = { asn_DEF_Alpha_tags_1, /* Same as above */ sizeof(asn_DEF_Alpha_tags_1) /sizeof(asn_DEF_Alpha_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_Alpha_1, 2, /* Elements count */ @@ -1233,6 +1279,7 @@ static asn_TYPE_member_t asn_MBR_Beta_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_Alpha, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "b" @@ -1242,6 +1289,7 @@ static asn_TYPE_member_t asn_MBR_Beta_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_Gamma, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "g" @@ -1273,8 +1321,8 @@ asn_TYPE_descriptor_t asn_DEF_Beta = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Beta_tags_1, sizeof(asn_DEF_Beta_tags_1) @@ -1282,6 +1330,7 @@ asn_TYPE_descriptor_t asn_DEF_Beta = { asn_DEF_Beta_tags_1, /* Same as above */ sizeof(asn_DEF_Beta_tags_1) /sizeof(asn_DEF_Beta_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_Beta_1, 2, /* Elements count */ @@ -1328,6 +1377,7 @@ static asn_TYPE_member_t asn_MBR_Gamma_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_TwoThree, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "o" @@ -1337,6 +1387,7 @@ static asn_TYPE_member_t asn_MBR_Gamma_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_Alpha, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "a" @@ -1346,6 +1397,7 @@ static asn_TYPE_member_t asn_MBR_Gamma_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_Beta, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "b" @@ -1378,8 +1430,8 @@ asn_TYPE_descriptor_t asn_DEF_Gamma = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Gamma_tags_1, sizeof(asn_DEF_Gamma_tags_1) @@ -1387,6 +1439,7 @@ asn_TYPE_descriptor_t asn_DEF_Gamma = { asn_DEF_Gamma_tags_1, /* Same as above */ sizeof(asn_DEF_Gamma_tags_1) /sizeof(asn_DEF_Gamma_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_Gamma_1, 3, /* Elements count */ @@ -1441,6 +1494,7 @@ static asn_TYPE_member_t asn_MBR_OneTwo_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_TwoThree, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "m12" @@ -1476,8 +1530,8 @@ asn_TYPE_descriptor_t asn_DEF_OneTwo = { SET_encode_der, SET_decode_xer, SET_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_OneTwo_tags_1, sizeof(asn_DEF_OneTwo_tags_1) @@ -1485,6 +1539,7 @@ asn_TYPE_descriptor_t asn_DEF_OneTwo = { asn_DEF_OneTwo_tags_1, /* Same as above */ sizeof(asn_DEF_OneTwo_tags_1) /sizeof(asn_DEF_OneTwo_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_OneTwo_1, 1, /* Elements count */ @@ -1539,6 +1594,7 @@ static asn_TYPE_member_t asn_MBR_TwoThree_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_ThreeOne, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "m23" @@ -1574,8 +1630,8 @@ asn_TYPE_descriptor_t asn_DEF_TwoThree = { SET_encode_der, SET_decode_xer, SET_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_TwoThree_tags_1, sizeof(asn_DEF_TwoThree_tags_1) @@ -1583,6 +1639,7 @@ asn_TYPE_descriptor_t asn_DEF_TwoThree = { asn_DEF_TwoThree_tags_1, /* Same as above */ sizeof(asn_DEF_TwoThree_tags_1) /sizeof(asn_DEF_TwoThree_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_TwoThree_1, 1, /* Elements count */ @@ -1641,6 +1698,7 @@ static asn_TYPE_member_t asn_MBR_ThreeOne_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_OneTwo, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "m31" @@ -1650,6 +1708,7 @@ static asn_TYPE_member_t asn_MBR_ThreeOne_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_Gamma, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "g" @@ -1686,8 +1745,8 @@ asn_TYPE_descriptor_t asn_DEF_ThreeOne = { SET_encode_der, SET_decode_xer, SET_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_ThreeOne_tags_1, sizeof(asn_DEF_ThreeOne_tags_1) @@ -1695,6 +1754,7 @@ asn_TYPE_descriptor_t asn_DEF_ThreeOne = { asn_DEF_ThreeOne_tags_1, /* Same as above */ sizeof(asn_DEF_ThreeOne_tags_1) /sizeof(asn_DEF_ThreeOne_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_ThreeOne_1, 2, /* Elements count */ diff --git a/tests/93-asn1c-controls-OK.asn1.-Pfwide-types b/tests/93-asn1c-controls-OK.asn1.-Pfwide-types index b99a5d5d..736fe5f3 100644 --- a/tests/93-asn1c-controls-OK.asn1.-Pfwide-types +++ b/tests/93-asn1c-controls-OK.asn1.-Pfwide-types @@ -26,6 +26,7 @@ static asn_TYPE_member_t asn_MBR_Sequence_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "ainl" @@ -35,6 +36,7 @@ static asn_TYPE_member_t asn_MBR_Sequence_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "aptr" @@ -66,8 +68,8 @@ asn_TYPE_descriptor_t asn_DEF_Sequence = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Sequence_tags_1, sizeof(asn_DEF_Sequence_tags_1) @@ -75,6 +77,7 @@ asn_TYPE_descriptor_t asn_DEF_Sequence = { asn_DEF_Sequence_tags_1, /* Same as above */ sizeof(asn_DEF_Sequence_tags_1) /sizeof(asn_DEF_Sequence_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_Sequence_1, 2, /* Elements count */ @@ -132,6 +135,7 @@ static asn_TYPE_member_t asn_MBR_Set_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_Sequence, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "ainl" @@ -141,6 +145,7 @@ static asn_TYPE_member_t asn_MBR_Set_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_Sequence, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "aptr" @@ -177,8 +182,8 @@ asn_TYPE_descriptor_t asn_DEF_Set = { SET_encode_der, SET_decode_xer, SET_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Set_tags_1, sizeof(asn_DEF_Set_tags_1) @@ -186,6 +191,7 @@ asn_TYPE_descriptor_t asn_DEF_Set = { asn_DEF_Set_tags_1, /* Same as above */ sizeof(asn_DEF_Set_tags_1) /sizeof(asn_DEF_Set_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_Set_1, 2, /* Elements count */ @@ -249,6 +255,7 @@ static asn_TYPE_member_t asn_MBR_setof_2[] = { .tag_mode = 0, .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "" @@ -274,8 +281,8 @@ asn_TYPE_descriptor_t asn_DEF_setof_2 = { SET_OF_encode_der, SET_OF_decode_xer, SET_OF_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_setof_tags_2, sizeof(asn_DEF_setof_tags_2) @@ -283,6 +290,7 @@ asn_TYPE_descriptor_t asn_DEF_setof_2 = { asn_DEF_setof_tags_2, /* Same as above */ sizeof(asn_DEF_setof_tags_2) /sizeof(asn_DEF_setof_tags_2[0]), /* 2 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_setof_2, 1, /* Single element */ @@ -295,6 +303,7 @@ static asn_TYPE_member_t asn_MBR_Choice_1[] = { .tag_mode = 0, .type = &asn_DEF_setof_2, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "setof" @@ -304,6 +313,7 @@ static asn_TYPE_member_t asn_MBR_Choice_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_Sequence, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "aptr" @@ -313,6 +323,7 @@ static asn_TYPE_member_t asn_MBR_Choice_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_Sequence, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "ainl" @@ -343,13 +354,14 @@ asn_TYPE_descriptor_t asn_DEF_Choice = { CHOICE_encode_der, CHOICE_decode_xer, CHOICE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ CHOICE_outmost_tag, 0, /* No effective tags (pointer) */ 0, /* No effective tags (count) */ 0, /* No tags (pointer) */ 0, /* No tags (count) */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_Choice_1, 3, /* Elements count */ diff --git a/tests/94-set-optionals-OK.asn1.-P b/tests/94-set-optionals-OK.asn1.-P index 1280e69a..7f602d84 100644 --- a/tests/94-set-optionals-OK.asn1.-P +++ b/tests/94-set-optionals-OK.asn1.-P @@ -61,6 +61,7 @@ static asn_TYPE_member_t asn_MBR_TestSet_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_VisibleString, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "m0" @@ -70,6 +71,7 @@ static asn_TYPE_member_t asn_MBR_TestSet_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_VisibleString, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "m1" @@ -79,6 +81,7 @@ static asn_TYPE_member_t asn_MBR_TestSet_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_VisibleString, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "m2" @@ -88,6 +91,7 @@ static asn_TYPE_member_t asn_MBR_TestSet_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_VisibleString, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "m3" @@ -97,6 +101,7 @@ static asn_TYPE_member_t asn_MBR_TestSet_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_VisibleString, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "m4" @@ -106,6 +111,7 @@ static asn_TYPE_member_t asn_MBR_TestSet_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_VisibleString, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "m5" @@ -115,6 +121,7 @@ static asn_TYPE_member_t asn_MBR_TestSet_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_VisibleString, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "m6" @@ -124,6 +131,7 @@ static asn_TYPE_member_t asn_MBR_TestSet_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_VisibleString, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "m7" @@ -133,6 +141,7 @@ static asn_TYPE_member_t asn_MBR_TestSet_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_VisibleString, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "m8" @@ -142,6 +151,7 @@ static asn_TYPE_member_t asn_MBR_TestSet_1[] = { .tag_mode = -1, /* IMPLICIT tag at current level */ .type = &asn_DEF_VisibleString, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "m9" @@ -187,8 +197,8 @@ asn_TYPE_descriptor_t asn_DEF_TestSet = { SET_encode_der, SET_decode_xer, SET_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_TestSet_tags_1, sizeof(asn_DEF_TestSet_tags_1) @@ -196,6 +206,7 @@ asn_TYPE_descriptor_t asn_DEF_TestSet = { asn_DEF_TestSet_tags_1, /* Same as above */ sizeof(asn_DEF_TestSet_tags_1) /sizeof(asn_DEF_TestSet_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_TestSet_1, 10, /* Elements count */ diff --git a/tests/95-choice-per-order-OK.asn1.-Pfwide-types b/tests/95-choice-per-order-OK.asn1.-Pfwide-types index 95af883b..8813f3e5 100644 --- a/tests/95-choice-per-order-OK.asn1.-Pfwide-types +++ b/tests/95-choice-per-order-OK.asn1.-Pfwide-types @@ -64,6 +64,7 @@ static asn_TYPE_member_t asn_MBR_ch_4[] = { .tag_mode = 0, .type = &asn_DEF_NULL, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "null" @@ -73,6 +74,7 @@ static asn_TYPE_member_t asn_MBR_ch_4[] = { .tag_mode = 0, .type = &asn_DEF_INTEGER, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "int" @@ -103,13 +105,14 @@ asn_TYPE_descriptor_t asn_DEF_ch_4 = { CHOICE_encode_der, CHOICE_decode_xer, CHOICE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ CHOICE_outmost_tag, 0, /* No effective tags (pointer) */ 0, /* No effective tags (count) */ 0, /* No tags (pointer) */ 0, /* No tags (count) */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_ch_4, 2, /* Elements count */ @@ -122,6 +125,7 @@ static asn_TYPE_member_t asn_MBR_Choice_1[] = { .tag_mode = 0, .type = &asn_DEF_RELATIVE_OID, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "roid" @@ -131,6 +135,7 @@ static asn_TYPE_member_t asn_MBR_Choice_1[] = { .tag_mode = 0, .type = &asn_DEF_BIT_STRING, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "bitstr" @@ -140,6 +145,7 @@ static asn_TYPE_member_t asn_MBR_Choice_1[] = { .tag_mode = 0, .type = &asn_DEF_ch_4, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "ch" @@ -149,6 +155,7 @@ static asn_TYPE_member_t asn_MBR_Choice_1[] = { .tag_mode = 0, .type = &asn_DEF_BOOLEAN, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "bool" @@ -181,13 +188,14 @@ asn_TYPE_descriptor_t asn_DEF_Choice = { CHOICE_encode_der, CHOICE_decode_xer, CHOICE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ CHOICE_outmost_tag, 0, /* No effective tags (pointer) */ 0, /* No effective tags (count) */ 0, /* No tags (pointer) */ 0, /* No tags (count) */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_Choice_1, 4, /* Elements count */ @@ -234,6 +242,7 @@ static asn_TYPE_member_t asn_MBR_Choice2_1[] = { .tag_mode = +1, /* EXPLICIT tag at current level */ .type = &asn_DEF_BIT_STRING, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "bitstr" @@ -243,6 +252,7 @@ static asn_TYPE_member_t asn_MBR_Choice2_1[] = { .tag_mode = +1, /* EXPLICIT tag at current level */ .type = &asn_DEF_RELATIVE_OID, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "roid" @@ -272,13 +282,14 @@ asn_TYPE_descriptor_t asn_DEF_Choice2 = { CHOICE_encode_der, CHOICE_decode_xer, CHOICE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ CHOICE_outmost_tag, 0, /* No effective tags (pointer) */ 0, /* No effective tags (count) */ 0, /* No tags (pointer) */ 0, /* No tags (count) */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_Choice2_1, 2, /* Elements count */ diff --git a/tests/95-choice-per-order-OK.asn1.-Pgen-PER b/tests/95-choice-per-order-OK.asn1.-Pgen-PER index 5a30ea22..86589186 100644 --- a/tests/95-choice-per-order-OK.asn1.-Pgen-PER +++ b/tests/95-choice-per-order-OK.asn1.-Pgen-PER @@ -77,6 +77,7 @@ static asn_TYPE_member_t asn_MBR_ch_4[] = { .tag_mode = 0, .type = &asn_DEF_NULL, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* No PER visible constraints */ .default_value = 0, .name = "null" @@ -86,6 +87,7 @@ static asn_TYPE_member_t asn_MBR_ch_4[] = { .tag_mode = 0, .type = &asn_DEF_NativeInteger, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* No PER visible constraints */ .default_value = 0, .name = "int" @@ -117,14 +119,15 @@ asn_TYPE_descriptor_t asn_DEF_ch_4 = { CHOICE_encode_der, CHOICE_decode_xer, CHOICE_encode_xer, + 0, 0, /* No OER support, use "-gen-OER" to enable */ CHOICE_decode_uper, CHOICE_encode_uper, - 0, 0, /* No OER support, use "-gen-OER" to enable */ CHOICE_outmost_tag, 0, /* No effective tags (pointer) */ 0, /* No effective tags (count) */ 0, /* No tags (pointer) */ 0, /* No tags (count) */ + 0, /* No OER visible constraints */ &asn_PER_type_ch_constr_4, asn_MBR_ch_4, 2, /* Elements count */ @@ -137,6 +140,7 @@ static asn_TYPE_member_t asn_MBR_Choice_1[] = { .tag_mode = 0, .type = &asn_DEF_RELATIVE_OID, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* No PER visible constraints */ .default_value = 0, .name = "roid" @@ -146,6 +150,7 @@ static asn_TYPE_member_t asn_MBR_Choice_1[] = { .tag_mode = 0, .type = &asn_DEF_BIT_STRING, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* No PER visible constraints */ .default_value = 0, .name = "bitstr" @@ -155,6 +160,7 @@ static asn_TYPE_member_t asn_MBR_Choice_1[] = { .tag_mode = 0, .type = &asn_DEF_ch_4, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* No PER visible constraints */ .default_value = 0, .name = "ch" @@ -164,6 +170,7 @@ static asn_TYPE_member_t asn_MBR_Choice_1[] = { .tag_mode = 0, .type = &asn_DEF_BOOLEAN, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* No PER visible constraints */ .default_value = 0, .name = "bool" @@ -197,14 +204,15 @@ asn_TYPE_descriptor_t asn_DEF_Choice = { CHOICE_encode_der, CHOICE_decode_xer, CHOICE_encode_xer, + 0, 0, /* No OER support, use "-gen-OER" to enable */ CHOICE_decode_uper, CHOICE_encode_uper, - 0, 0, /* No OER support, use "-gen-OER" to enable */ CHOICE_outmost_tag, 0, /* No effective tags (pointer) */ 0, /* No effective tags (count) */ 0, /* No tags (pointer) */ 0, /* No tags (count) */ + 0, /* No OER visible constraints */ &asn_PER_type_Choice_constr_1, asn_MBR_Choice_1, 4, /* Elements count */ @@ -259,6 +267,7 @@ static asn_TYPE_member_t asn_MBR_Choice2_1[] = { .tag_mode = +1, /* EXPLICIT tag at current level */ .type = &asn_DEF_BIT_STRING, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* No PER visible constraints */ .default_value = 0, .name = "bitstr" @@ -268,6 +277,7 @@ static asn_TYPE_member_t asn_MBR_Choice2_1[] = { .tag_mode = +1, /* EXPLICIT tag at current level */ .type = &asn_DEF_RELATIVE_OID, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* No PER visible constraints */ .default_value = 0, .name = "roid" @@ -297,14 +307,15 @@ asn_TYPE_descriptor_t asn_DEF_Choice2 = { CHOICE_encode_der, CHOICE_decode_xer, CHOICE_encode_xer, + 0, 0, /* No OER support, use "-gen-OER" to enable */ CHOICE_decode_uper, CHOICE_encode_uper, - 0, 0, /* No OER support, use "-gen-OER" to enable */ CHOICE_outmost_tag, 0, /* No effective tags (pointer) */ 0, /* No effective tags (count) */ 0, /* No tags (pointer) */ 0, /* No tags (count) */ + 0, /* No OER visible constraints */ &asn_PER_type_Choice2_constr_1, asn_MBR_Choice2_1, 2, /* Elements count */ diff --git a/tests/98-attribute-class-OK.asn1.-P b/tests/98-attribute-class-OK.asn1.-P index 7203b828..ad70a9af 100644 --- a/tests/98-attribute-class-OK.asn1.-P +++ b/tests/98-attribute-class-OK.asn1.-P @@ -49,6 +49,7 @@ static asn_TYPE_member_t asn_MBR_Attribute_1[] = { .tag_mode = 0, .type = &asn_DEF_RELATIVE_OID, .memb_constraints = memb_identifier_constraint_1, + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "identifier" @@ -58,6 +59,7 @@ static asn_TYPE_member_t asn_MBR_Attribute_1[] = { .tag_mode = 0, .type = &asn_DEF_IA5String, .memb_constraints = 0, /* Defer constraints checking to the member type */ + .oer_constraints = 0, /* OER is not compiled, use -gen-OER */ .per_constraints = 0, /* PER is not compiled, use -gen-PER */ .default_value = 0, .name = "siAttributeValue" @@ -89,8 +91,8 @@ asn_TYPE_descriptor_t asn_DEF_Attribute = { SEQUENCE_encode_der, SEQUENCE_decode_xer, SEQUENCE_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, 0, /* No OER support, use "-gen-OER" to enable */ + 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ asn_DEF_Attribute_tags_1, sizeof(asn_DEF_Attribute_tags_1) @@ -98,6 +100,7 @@ asn_TYPE_descriptor_t asn_DEF_Attribute = { asn_DEF_Attribute_tags_1, /* Same as above */ sizeof(asn_DEF_Attribute_tags_1) /sizeof(asn_DEF_Attribute_tags_1[0]), /* 1 */ + 0, /* No OER visible constraints */ 0, /* No PER visible constraints */ asn_MBR_Attribute_1, 2, /* Elements count */