diff options
54 files changed, 669 insertions, 8 deletions
diff --git a/asn1c/asn1c.c b/asn1c/asn1c.c index 4b466b5f..a068d4d6 100644 --- a/asn1c/asn1c.c +++ b/asn1c/asn1c.c @@ -118,6 +118,8 @@ main(int ac, char **av) { case 'g': if(strcmp(optarg, "en-PER") == 0) { asn1_compiler_flags |= A1C_GEN_PER; + } else if(strcmp(optarg, "en-OER") == 0) { + asn1_compiler_flags |= A1C_GEN_OER; } else { fprintf(stderr, "-g%s: Invalid argument\n", optarg); exit(EX_USAGE); @@ -487,7 +489,8 @@ usage(const char *av0) { " -fwide-types Use INTEGER_t instead of \"long\" by default, etc.\n" "\n" -" -gen-PER Generate PER support code\n" +" -gen-OER Generate OER (X.696) support code\n" +" -gen-PER Generate PER (X.691) support code\n" " -pdu={all|auto|Type} Generate PDU table (discover PDUs automatically)\n" "\n" diff --git a/doc/docsrc/asn1c-usage.tex b/doc/docsrc/asn1c-usage.tex index 20f60ec0..5f8d7067 100644 --- a/doc/docsrc/asn1c-usage.tex +++ b/doc/docsrc/asn1c-usage.tex @@ -203,7 +203,7 @@ RectangleTest ASN.1 module defined in the beginning of this document). decoders and other useful routines. There will be quite a few of them, some of them are not even always necessary, but the overall amount of code after compilation will be rather small anyway. -\item A \emph{converter-sample.c} file containing the \emph{int main()} function with a fully functioning decoder. It can convert a given PDU between BER, XER and possibly PER (if -gen-PER option to asn1c was in effect). At some point you will want to replace this file with your own file containing the \emph{int main()} function. +\item A \emph{converter-sample.c} file containing the \emph{int main()} function with a fully functioning decoder. It can convert a given PDU between BER, XER and possibly OER and PER (if -gen-OER or -gen-PER options to asn1c were in effect). At some point you will want to replace this file with your own file containing the \emph{int main()} function. \item A \emph{Makefile.am.sample} file mentioning all the files created at the earlier steps. This file is suitable for either automake suite or the plain `make` utility. Just rename it into \emph{Makefile}. @@ -270,6 +270,7 @@ may produce a shorter executable.}\\ {\ttfamily -fwide-types} & {\small Use the wide integer types (INTEGER\_t, REAL\_t) instead of machine's native data types (long, double). }\\\\ \textbf{Codecs Generation Options} & \textbf{Description}\\ \midrule +{\ttfamily -gen-OER} & {\small Generate the Octet Encoding Rules (OER) support code.}\\ {\ttfamily -gen-PER} & {\small Generate the Packed Encoding Rules (PER) support code.}\\ {\ttfamily -pdu=\{\textbf{all}|\textbf{auto}|\emph{Type}\}} & {\small Create a PDU table for specified types, or discover the Protocol Data Units automatically. In case of \texttt{-pdu=\textbf{all}}, all ASN.1 types defined in all modules wil form a PDU table. In case of \texttt{-pdu=\textbf{auto}}, all types not referenced by any other type will form a PDU table. If \texttt{\emph{Type}} is an ASN.1 type identifier, it is added to a PDU table. The last form may be specified multiple times.}\\ \\ diff --git a/libasn1compiler/asn1c_C.c b/libasn1compiler/asn1c_C.c index d8f60c3a..f13563be 100644 --- a/libasn1compiler/asn1c_C.c +++ b/libasn1compiler/asn1c_C.c @@ -1340,6 +1340,8 @@ asn1c_lang_C_type_SIMPLE_TYPE(arg_t *arg) { OUT("td->xer_encoder = asn_DEF_%s.xer_encoder;\n", type_name); OUT("td->uper_decoder = asn_DEF_%s.uper_decoder;\n", type_name); OUT("td->uper_encoder = asn_DEF_%s.uper_encoder;\n", type_name); + OUT("td->oer_decoder = asn_DEF_%s.oer_decoder;\n", type_name); + OUT("td->oer_encoder = asn_DEF_%s.oer_encoder;\n", type_name); if(!terminal && !tags_count) { OUT("/* The next four lines are here because of -fknown-extern-type */\n"); OUT("td->tags = asn_DEF_%s.tags;\n", type_name); @@ -2558,6 +2560,12 @@ 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) { diff --git a/libasn1compiler/asn1compiler.h b/libasn1compiler/asn1compiler.h index 827bc924..8e656b53 100644 --- a/libasn1compiler/asn1compiler.h +++ b/libasn1compiler/asn1compiler.h @@ -56,11 +56,7 @@ enum asn1c_flags { * Symlink support files rather than copy them. */ A1C_LINK_SKELETONS = 0x0800, - /* - * -gen-PER - * Generate PER support code - */ - A1C_GEN_PER = 0x1000, + /* * -pdu={all|auto|Type} * Generate PDU table @@ -77,7 +73,17 @@ enum asn1c_flags { * -fline-refs * Include ASN.1 module's line numbers in comments. */ - A1C_LINE_REFS = 0x20000 + A1C_LINE_REFS = 0x20000, + /* + * -gen-OER + * Generate Octet Encoding Rules support code + */ + A1C_GEN_OER = 0x40000, + /* + * -gen-PER + * Generate Packed Encoding Rules support code + */ + A1C_GEN_PER = 0x80000, }; /* diff --git a/tests/03-enum-OK.asn1.-Pfwide-types b/tests/03-enum-OK.asn1.-Pfwide-types index 076ae0f7..7150662b 100644 --- a/tests/03-enum-OK.asn1.-Pfwide-types +++ b/tests/03-enum-OK.asn1.-Pfwide-types @@ -55,6 +55,8 @@ Enum1_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_ENUMERATED.xer_encoder; td->uper_decoder = asn_DEF_ENUMERATED.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_ENUMERATED.per_constraints; td->elements = asn_DEF_ENUMERATED.elements; @@ -219,6 +221,8 @@ Enum2_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_ENUMERATED.xer_encoder; td->uper_decoder = asn_DEF_ENUMERATED.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_ENUMERATED.per_constraints; td->elements = asn_DEF_ENUMERATED.elements; @@ -385,6 +389,8 @@ Enum3_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_ENUMERATED.xer_encoder; td->uper_decoder = asn_DEF_ENUMERATED.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_ENUMERATED.per_constraints; td->elements = asn_DEF_ENUMERATED.elements; @@ -544,6 +550,8 @@ Enum4_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_ENUMERATED.xer_encoder; td->uper_decoder = asn_DEF_ENUMERATED.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_ENUMERATED.per_constraints; td->elements = asn_DEF_ENUMERATED.elements; @@ -704,6 +712,8 @@ Enum5_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_ENUMERATED.xer_encoder; td->uper_decoder = asn_DEF_ENUMERATED.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_ENUMERATED.per_constraints; td->elements = asn_DEF_ENUMERATED.elements; diff --git a/tests/104-param-1-OK.asn1.-Pfwide-types b/tests/104-param-1-OK.asn1.-Pfwide-types index 1094f42d..f9947caa 100644 --- a/tests/104-param-1-OK.asn1.-Pfwide-types +++ b/tests/104-param-1-OK.asn1.-Pfwide-types @@ -58,6 +58,7 @@ asn_TYPE_descriptor_t asn_DEF_Collection_16P0 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_Collection_16P0_tags_1, sizeof(asn_DEF_Collection_16P0_tags_1) @@ -101,6 +102,7 @@ asn_TYPE_descriptor_t asn_DEF_Collection_16P1 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_Collection_16P1_tags_3, sizeof(asn_DEF_Collection_16P1_tags_3) @@ -183,6 +185,7 @@ asn_TYPE_descriptor_t asn_DEF_Bunch = { 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, /* Use generic outmost tag fetcher */ asn_DEF_Bunch_tags_1, sizeof(asn_DEF_Bunch_tags_1) diff --git a/tests/105-param-2-OK.asn1.-Pfwide-types b/tests/105-param-2-OK.asn1.-Pfwide-types index a2c13c97..aa9a5ff7 100644 --- a/tests/105-param-2-OK.asn1.-Pfwide-types +++ b/tests/105-param-2-OK.asn1.-Pfwide-types @@ -84,6 +84,7 @@ asn_TYPE_descriptor_t asn_DEF_SIGNED_16P0 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_SIGNED_16P0_tags_1, sizeof(asn_DEF_SIGNED_16P0_tags_1) @@ -140,6 +141,7 @@ asn_TYPE_descriptor_t asn_DEF_signed_4 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_signed_tags_4, sizeof(asn_DEF_signed_tags_4) @@ -190,6 +192,7 @@ asn_TYPE_descriptor_t asn_DEF_SIGNED_16P1 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_SIGNED_16P1_tags_3, sizeof(asn_DEF_SIGNED_16P1_tags_3) @@ -248,6 +251,8 @@ SignedREAL_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_SIGNED_16P0.xer_encoder; td->uper_decoder = asn_DEF_SIGNED_16P0.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_SIGNED_16P0.per_constraints; td->elements = asn_DEF_SIGNED_16P0.elements; @@ -316,6 +321,7 @@ asn_TYPE_descriptor_t asn_DEF_SignedREAL = { 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, /* Use generic outmost tag fetcher */ asn_DEF_SignedREAL_tags_1, sizeof(asn_DEF_SignedREAL_tags_1) @@ -373,6 +379,8 @@ SignedSET_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_SIGNED_16P1.xer_encoder; td->uper_decoder = asn_DEF_SIGNED_16P1.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_SIGNED_16P1.per_constraints; td->elements = asn_DEF_SIGNED_16P1.elements; @@ -441,6 +449,7 @@ asn_TYPE_descriptor_t asn_DEF_SignedSET = { 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, /* Use generic outmost tag fetcher */ asn_DEF_SignedSET_tags_1, sizeof(asn_DEF_SignedSET_tags_1) diff --git a/tests/106-param-constr-OK.asn1.-P b/tests/106-param-constr-OK.asn1.-P index 9155bf6a..e1a703d8 100644 --- a/tests/106-param-constr-OK.asn1.-P +++ b/tests/106-param-constr-OK.asn1.-P @@ -174,6 +174,7 @@ asn_TYPE_descriptor_t asn_DEF_Narrow_15P0 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_Narrow_15P0_tags_1, sizeof(asn_DEF_Narrow_15P0_tags_1) @@ -232,6 +233,8 @@ NarrowInteger_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_Narrow_15P0.xer_encoder; td->uper_decoder = asn_DEF_Narrow_15P0.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_Narrow_15P0.per_constraints; td->elements = asn_DEF_Narrow_15P0.elements; @@ -300,6 +303,7 @@ asn_TYPE_descriptor_t asn_DEF_NarrowInteger = { 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, /* Use generic outmost tag fetcher */ asn_DEF_NarrowInteger_tags_1, sizeof(asn_DEF_NarrowInteger_tags_1) diff --git a/tests/108-param-constr-3-OK.asn1.-Pfwide-types b/tests/108-param-constr-3-OK.asn1.-Pfwide-types index 8599d4b6..6242725a 100644 --- a/tests/108-param-constr-3-OK.asn1.-Pfwide-types +++ b/tests/108-param-constr-3-OK.asn1.-Pfwide-types @@ -66,6 +66,8 @@ MinMax_16P0_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_INTEGER.xer_encoder; td->uper_decoder = asn_DEF_INTEGER.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_INTEGER.per_constraints; td->elements = asn_DEF_INTEGER.elements; @@ -134,6 +136,7 @@ asn_TYPE_descriptor_t asn_DEF_MinMax_16P0 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_MinMax_16P0_tags_1, sizeof(asn_DEF_MinMax_16P0_tags_1) @@ -214,6 +217,8 @@ ThreePlus_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_MinMax_16P0.xer_encoder; td->uper_decoder = asn_DEF_MinMax_16P0.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_MinMax_16P0.per_constraints; td->elements = asn_DEF_MinMax_16P0.elements; @@ -282,6 +287,7 @@ asn_TYPE_descriptor_t asn_DEF_ThreePlus = { 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, /* Use generic outmost tag fetcher */ asn_DEF_ThreePlus_tags_1, sizeof(asn_DEF_ThreePlus_tags_1) diff --git a/tests/110-param-3-OK.asn1.-Pfwide-types b/tests/110-param-3-OK.asn1.-Pfwide-types index f4587d15..2aa16df1 100644 --- a/tests/110-param-3-OK.asn1.-Pfwide-types +++ b/tests/110-param-3-OK.asn1.-Pfwide-types @@ -64,6 +64,8 @@ field_7_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_ENUMERATED.xer_encoder; td->uper_decoder = asn_DEF_ENUMERATED.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_ENUMERATED.per_constraints; td->elements = asn_DEF_ENUMERATED.elements; @@ -175,6 +177,7 @@ asn_TYPE_descriptor_t asn_DEF_Flag_16P0 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_Flag_16P0_tags_1, sizeof(asn_DEF_Flag_16P0_tags_1) @@ -242,6 +245,7 @@ asn_TYPE_descriptor_t asn_DEF_field_7 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_field_tags_7, sizeof(asn_DEF_field_tags_7) @@ -291,6 +295,7 @@ asn_TYPE_descriptor_t asn_DEF_Flag_16P1 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_Flag_16P1_tags_6, sizeof(asn_DEF_Flag_16P1_tags_6) @@ -349,6 +354,8 @@ IntegerColorFlag_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_Flag_16P0.xer_encoder; td->uper_decoder = asn_DEF_Flag_16P0.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_Flag_16P0.per_constraints; td->elements = asn_DEF_Flag_16P0.elements; @@ -417,6 +424,7 @@ asn_TYPE_descriptor_t asn_DEF_IntegerColorFlag = { 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, /* Use generic outmost tag fetcher */ asn_DEF_IntegerColorFlag_tags_1, sizeof(asn_DEF_IntegerColorFlag_tags_1) @@ -474,6 +482,8 @@ EnumeratedColorFlag_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_Flag_16P1.xer_encoder; td->uper_decoder = asn_DEF_Flag_16P1.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_Flag_16P1.per_constraints; td->elements = asn_DEF_Flag_16P1.elements; @@ -542,6 +552,7 @@ asn_TYPE_descriptor_t asn_DEF_EnumeratedColorFlag = { 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, /* Use generic outmost tag fetcher */ asn_DEF_EnumeratedColorFlag_tags_1, sizeof(asn_DEF_EnumeratedColorFlag_tags_1) diff --git a/tests/119-per-strings-OK.asn1.-Pgen-PER b/tests/119-per-strings-OK.asn1.-Pgen-PER index f0d876ec..f33b65c2 100644 --- a/tests/119-per-strings-OK.asn1.-Pgen-PER +++ b/tests/119-per-strings-OK.asn1.-Pgen-PER @@ -1214,6 +1214,7 @@ asn_TYPE_descriptor_t asn_DEF_many_2 = { SEQUENCE_OF_encode_xer, 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) @@ -1567,6 +1568,7 @@ asn_TYPE_descriptor_t asn_DEF_PDU = { SEQUENCE_encode_xer, 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) diff --git a/tests/125-bitstring-constraint-OK.asn1.-P b/tests/125-bitstring-constraint-OK.asn1.-P index c464138d..8e105aeb 100644 --- a/tests/125-bitstring-constraint-OK.asn1.-P +++ b/tests/125-bitstring-constraint-OK.asn1.-P @@ -66,6 +66,8 @@ T_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_BIT_STRING.xer_encoder; td->uper_decoder = asn_DEF_BIT_STRING.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_BIT_STRING.per_constraints; td->elements = asn_DEF_BIT_STRING.elements; @@ -134,6 +136,7 @@ asn_TYPE_descriptor_t asn_DEF_T = { 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, /* Use generic outmost tag fetcher */ asn_DEF_T_tags_1, sizeof(asn_DEF_T_tags_1) diff --git a/tests/126-per-extensions-OK.asn1.-Pgen-PER b/tests/126-per-extensions-OK.asn1.-Pgen-PER index 0f53a295..cb587f8e 100644 --- a/tests/126-per-extensions-OK.asn1.-Pgen-PER +++ b/tests/126-per-extensions-OK.asn1.-Pgen-PER @@ -106,6 +106,7 @@ asn_TYPE_descriptor_t asn_DEF_PDU = { SEQUENCE_encode_xer, 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) @@ -206,6 +207,7 @@ asn_TYPE_descriptor_t asn_DEF_Singleton = { SEQUENCE_encode_xer, 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) @@ -324,6 +326,7 @@ asn_TYPE_descriptor_t asn_DEF_PDU_2 = { CHOICE_encode_xer, 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) */ diff --git a/tests/127-per-long-OK.asn1.-Pgen-PER b/tests/127-per-long-OK.asn1.-Pgen-PER index dd9389a1..8fae05f1 100644 --- a/tests/127-per-long-OK.asn1.-Pgen-PER +++ b/tests/127-per-long-OK.asn1.-Pgen-PER @@ -55,6 +55,8 @@ unsigned32_4_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_NativeInteger.xer_encoder; td->uper_decoder = asn_DEF_NativeInteger.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -161,6 +163,8 @@ unsplit32_5_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_NativeInteger.xer_encoder; td->uper_decoder = asn_DEF_NativeInteger.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -376,6 +380,7 @@ asn_TYPE_descriptor_t asn_DEF_unsigned32_4 = { unsigned32_4_encode_xer, 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) @@ -410,6 +415,7 @@ asn_TYPE_descriptor_t asn_DEF_unsplit32_5 = { unsplit32_5_encode_xer, 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) @@ -490,6 +496,7 @@ asn_TYPE_descriptor_t asn_DEF_T = { SEQUENCE_encode_xer, 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) diff --git a/tests/131-per-empty-OK.asn1.-Pgen-PER b/tests/131-per-empty-OK.asn1.-Pgen-PER index aa6587ea..233b82db 100644 --- a/tests/131-per-empty-OK.asn1.-Pgen-PER +++ b/tests/131-per-empty-OK.asn1.-Pgen-PER @@ -41,6 +41,7 @@ asn_TYPE_descriptor_t asn_DEF_T = { SEQUENCE_encode_xer, 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) diff --git a/tests/134-per-long-OK.asn1.-Pgen-PER b/tests/134-per-long-OK.asn1.-Pgen-PER index da96a067..432bcdb5 100644 --- a/tests/134-per-long-OK.asn1.-Pgen-PER +++ b/tests/134-per-long-OK.asn1.-Pgen-PER @@ -240,6 +240,7 @@ asn_TYPE_descriptor_t asn_DEF_T = { SEQUENCE_encode_xer, 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) diff --git a/tests/19-param-OK.asn1.-Pfwide-types b/tests/19-param-OK.asn1.-Pfwide-types index 822c9933..e60b7ddb 100644 --- a/tests/19-param-OK.asn1.-Pfwide-types +++ b/tests/19-param-OK.asn1.-Pfwide-types @@ -123,6 +123,7 @@ asn_TYPE_descriptor_t asn_DEF_toBeSigned_2 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_toBeSigned_tags_2, sizeof(asn_DEF_toBeSigned_tags_2) @@ -193,6 +194,7 @@ asn_TYPE_descriptor_t asn_DEF_SIGNED_15P0 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_SIGNED_15P0_tags_1, sizeof(asn_DEF_SIGNED_15P0_tags_1) @@ -251,6 +253,8 @@ Certificate_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_SIGNED_15P0.xer_encoder; td->uper_decoder = asn_DEF_SIGNED_15P0.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_SIGNED_15P0.per_constraints; td->elements = asn_DEF_SIGNED_15P0.elements; @@ -319,6 +323,7 @@ asn_TYPE_descriptor_t asn_DEF_Certificate = { 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, /* Use generic outmost tag fetcher */ asn_DEF_Certificate_tags_1, sizeof(asn_DEF_Certificate_tags_1) @@ -390,6 +395,7 @@ asn_TYPE_descriptor_t asn_DEF_Name = { 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, /* Use generic outmost tag fetcher */ asn_DEF_Name_tags_1, sizeof(asn_DEF_Name_tags_1) @@ -510,6 +516,7 @@ asn_TYPE_descriptor_t asn_DEF_RelativeDistinguishedName = { 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, /* Use generic outmost tag fetcher */ asn_DEF_RelativeDistinguishedName_tags_1, sizeof(asn_DEF_RelativeDistinguishedName_tags_1) diff --git a/tests/22-tags-OK.asn1.-Pfwide-types b/tests/22-tags-OK.asn1.-Pfwide-types index 50c0e017..3b46bcbb 100644 --- a/tests/22-tags-OK.asn1.-Pfwide-types +++ b/tests/22-tags-OK.asn1.-Pfwide-types @@ -87,6 +87,7 @@ asn_TYPE_descriptor_t asn_DEF_b_3 = { 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 */ CHOICE_outmost_tag, 0, /* No effective tags (pointer) */ 0, /* No effective tags (count) */ @@ -155,6 +156,7 @@ asn_TYPE_descriptor_t asn_DEF_T1 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_T1_tags_1, sizeof(asn_DEF_T1_tags_1) diff --git a/tests/30-set-OK.asn1.-Pfwide-types b/tests/30-set-OK.asn1.-Pfwide-types index 060a0cc2..887d1c9a 100644 --- a/tests/30-set-OK.asn1.-Pfwide-types +++ b/tests/30-set-OK.asn1.-Pfwide-types @@ -105,6 +105,7 @@ asn_TYPE_descriptor_t asn_DEF_T = { 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, /* Use generic outmost tag fetcher */ asn_DEF_T_tags_1, sizeof(asn_DEF_T_tags_1) diff --git a/tests/31-set-of-OK.asn1.-Pfwide-types b/tests/31-set-of-OK.asn1.-Pfwide-types index 743d731c..87077dd2 100644 --- a/tests/31-set-of-OK.asn1.-Pfwide-types +++ b/tests/31-set-of-OK.asn1.-Pfwide-types @@ -57,6 +57,7 @@ asn_TYPE_descriptor_t asn_DEF_Forest = { 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, /* Use generic outmost tag fetcher */ asn_DEF_Forest_tags_1, sizeof(asn_DEF_Forest_tags_1) @@ -139,6 +140,7 @@ asn_TYPE_descriptor_t asn_DEF_Tree = { 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, /* Use generic outmost tag fetcher */ asn_DEF_Tree_tags_1, sizeof(asn_DEF_Tree_tags_1) @@ -277,6 +279,7 @@ asn_TYPE_descriptor_t asn_DEF_trees_2 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_trees_tags_2, sizeof(asn_DEF_trees_tags_2) @@ -328,6 +331,7 @@ asn_TYPE_descriptor_t asn_DEF_Member_5 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_Member_tags_5, sizeof(asn_DEF_Member_tags_5) @@ -373,6 +377,7 @@ asn_TYPE_descriptor_t asn_DEF_anything_4 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_anything_tags_4, sizeof(asn_DEF_anything_tags_4) @@ -432,6 +437,7 @@ asn_TYPE_descriptor_t asn_DEF_other_9 = { 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 */ CHOICE_outmost_tag, 0, /* No effective tags (pointer) */ 0, /* No effective tags (count) */ @@ -511,6 +517,7 @@ asn_TYPE_descriptor_t asn_DEF_Stuff = { 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, /* Use generic outmost tag fetcher */ asn_DEF_Stuff_tags_1, sizeof(asn_DEF_Stuff_tags_1) diff --git a/tests/32-sequence-of-OK.asn1.-P b/tests/32-sequence-of-OK.asn1.-P index a6c31067..9ed90a1d 100644 --- a/tests/32-sequence-of-OK.asn1.-P +++ b/tests/32-sequence-of-OK.asn1.-P @@ -57,6 +57,7 @@ asn_TYPE_descriptor_t asn_DEF_Programming = { 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, /* Use generic outmost tag fetcher */ asn_DEF_Programming_tags_1, sizeof(asn_DEF_Programming_tags_1) @@ -129,6 +130,7 @@ asn_TYPE_descriptor_t asn_DEF_Fault = { 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, /* Use generic outmost tag fetcher */ asn_DEF_Fault_tags_1, sizeof(asn_DEF_Fault_tags_1) @@ -188,6 +190,7 @@ asn_TYPE_descriptor_t asn_DEF_Error = { 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, /* Use generic outmost tag fetcher */ asn_DEF_Error_tags_1, sizeof(asn_DEF_Error_tags_1) @@ -269,6 +272,7 @@ asn_TYPE_descriptor_t asn_DEF_seqOfMan_3 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_seqOfMan_tags_3, sizeof(asn_DEF_seqOfMan_tags_3) @@ -329,6 +333,7 @@ asn_TYPE_descriptor_t asn_DEF_SeqWithMandatory = { 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, /* Use generic outmost tag fetcher */ asn_DEF_SeqWithMandatory_tags_1, sizeof(asn_DEF_SeqWithMandatory_tags_1) @@ -411,6 +416,7 @@ asn_TYPE_descriptor_t asn_DEF_seqOfOpt_3 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_seqOfOpt_tags_3, sizeof(asn_DEF_seqOfOpt_tags_3) @@ -471,6 +477,7 @@ asn_TYPE_descriptor_t asn_DEF_SeqWithOptional = { 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, /* Use generic outmost tag fetcher */ asn_DEF_SeqWithOptional_tags_1, sizeof(asn_DEF_SeqWithOptional_tags_1) diff --git a/tests/37-indirect-choice-OK.asn1.-Pfwide-types b/tests/37-indirect-choice-OK.asn1.-Pfwide-types index 88b7ca66..6fb69e50 100644 --- a/tests/37-indirect-choice-OK.asn1.-Pfwide-types +++ b/tests/37-indirect-choice-OK.asn1.-Pfwide-types @@ -103,6 +103,7 @@ asn_TYPE_descriptor_t asn_DEF_T = { 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 */ CHOICE_outmost_tag, 0, /* No effective tags (pointer) */ 0, /* No effective tags (count) */ @@ -193,6 +194,7 @@ asn_TYPE_descriptor_t asn_DEF_Choice1 = { 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 */ CHOICE_outmost_tag, 0, /* No effective tags (pointer) */ 0, /* No effective tags (count) */ @@ -311,6 +313,7 @@ asn_TYPE_descriptor_t asn_DEF_Choice2 = { 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 */ CHOICE_outmost_tag, asn_DEF_Choice2_tags_1, sizeof(asn_DEF_Choice2_tags_1) @@ -369,6 +372,8 @@ Choice3_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_Choice2.xer_encoder; td->uper_decoder = asn_DEF_Choice2.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_Choice2.per_constraints; td->elements = asn_DEF_Choice2.elements; @@ -438,6 +443,7 @@ asn_TYPE_descriptor_t asn_DEF_Choice3 = { 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 */ CHOICE_outmost_tag, asn_DEF_Choice3_tags_1, sizeof(asn_DEF_Choice3_tags_1) @@ -495,6 +501,8 @@ Choice4_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_Choice2.xer_encoder; td->uper_decoder = asn_DEF_Choice2.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_Choice2.per_constraints; td->elements = asn_DEF_Choice2.elements; @@ -564,6 +572,7 @@ asn_TYPE_descriptor_t asn_DEF_Choice4 = { 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 */ CHOICE_outmost_tag, asn_DEF_Choice4_tags_1, sizeof(asn_DEF_Choice4_tags_1) @@ -621,6 +630,8 @@ Choice5_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_Choice2.xer_encoder; td->uper_decoder = asn_DEF_Choice2.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_Choice2.per_constraints; td->elements = asn_DEF_Choice2.elements; @@ -689,6 +700,7 @@ asn_TYPE_descriptor_t asn_DEF_Choice5 = { 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 */ CHOICE_outmost_tag, asn_DEF_Choice5_tags_1, sizeof(asn_DEF_Choice5_tags_1) @@ -746,6 +758,8 @@ Choice6_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_Choice1.xer_encoder; td->uper_decoder = asn_DEF_Choice1.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_Choice1.per_constraints; td->elements = asn_DEF_Choice1.elements; @@ -811,6 +825,7 @@ asn_TYPE_descriptor_t asn_DEF_Choice6 = { 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 */ CHOICE_outmost_tag, 0, /* No effective tags (pointer) */ 0, /* No effective tags (count) */ diff --git a/tests/39-sequence-of-OK.asn1.-Pfwide-types b/tests/39-sequence-of-OK.asn1.-Pfwide-types index 1a47de9c..4b4c82d2 100644 --- a/tests/39-sequence-of-OK.asn1.-Pfwide-types +++ b/tests/39-sequence-of-OK.asn1.-Pfwide-types @@ -66,6 +66,7 @@ asn_TYPE_descriptor_t asn_DEF_collection_3 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_collection_tags_3, sizeof(asn_DEF_collection_tags_3) @@ -126,6 +127,7 @@ asn_TYPE_descriptor_t asn_DEF_T = { 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, /* Use generic outmost tag fetcher */ asn_DEF_T_tags_1, sizeof(asn_DEF_T_tags_1) @@ -209,6 +211,7 @@ asn_TYPE_descriptor_t asn_DEF_T2 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_T2_tags_1, sizeof(asn_DEF_T2_tags_1) diff --git a/tests/42-real-life-OK.asn1.-PR b/tests/42-real-life-OK.asn1.-PR index 28c2ce0b..a07a81e2 100644 --- a/tests/42-real-life-OK.asn1.-PR +++ b/tests/42-real-life-OK.asn1.-PR @@ -99,6 +99,7 @@ asn_TYPE_descriptor_t asn_DEF_varsets_3 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_varsets_tags_3, sizeof(asn_DEF_varsets_tags_3) @@ -159,6 +160,7 @@ asn_TYPE_descriptor_t asn_DEF_LogLine = { 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, /* Use generic outmost tag fetcher */ asn_DEF_LogLine_tags_1, sizeof(asn_DEF_LogLine_tags_1) @@ -266,6 +268,7 @@ asn_TYPE_descriptor_t asn_DEF_vparts_2 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_vparts_tags_2, sizeof(asn_DEF_vparts_tags_2) @@ -326,6 +329,7 @@ asn_TYPE_descriptor_t asn_DEF_VariablePartSet = { 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, /* Use generic outmost tag fetcher */ asn_DEF_VariablePartSet_tags_1, sizeof(asn_DEF_VariablePartSet_tags_1) @@ -456,6 +460,7 @@ asn_TYPE_descriptor_t asn_DEF_vset_2 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_vset_tags_2, sizeof(asn_DEF_vset_tags_2) @@ -517,6 +522,7 @@ asn_TYPE_descriptor_t asn_DEF_vrange_4 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_vrange_tags_4, sizeof(asn_DEF_vrange_tags_4) @@ -575,6 +581,7 @@ asn_TYPE_descriptor_t asn_DEF_VariablePart = { 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 */ CHOICE_outmost_tag, 0, /* No effective tags (pointer) */ 0, /* No effective tags (count) */ @@ -666,6 +673,8 @@ accept_as_2_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_NativeEnumerated.xer_encoder; td->uper_decoder = asn_DEF_NativeEnumerated.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_NativeEnumerated.per_constraints; td->elements = asn_DEF_NativeEnumerated.elements; @@ -756,6 +765,7 @@ asn_TYPE_descriptor_t asn_DEF_accept_as_2 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_accept_as_tags_2, sizeof(asn_DEF_accept_as_tags_2) @@ -799,6 +809,7 @@ asn_TYPE_descriptor_t asn_DEF_email_9 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_email_tags_9, sizeof(asn_DEF_email_tags_9) @@ -860,6 +871,7 @@ asn_TYPE_descriptor_t asn_DEF_notify_7 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_notify_tags_7, sizeof(asn_DEF_notify_tags_7) @@ -920,6 +932,7 @@ asn_TYPE_descriptor_t asn_DEF_ActionItem = { 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, /* Use generic outmost tag fetcher */ asn_DEF_ActionItem_tags_1, sizeof(asn_DEF_ActionItem_tags_1) diff --git a/tests/43-recursion-OK.asn1.-Pfwide-types b/tests/43-recursion-OK.asn1.-Pfwide-types index e29bc0f1..36b891c6 100644 --- a/tests/43-recursion-OK.asn1.-Pfwide-types +++ b/tests/43-recursion-OK.asn1.-Pfwide-types @@ -75,6 +75,7 @@ asn_TYPE_descriptor_t asn_DEF_t_member1_2 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_t_member1_tags_2, sizeof(asn_DEF_t_member1_tags_2) @@ -119,6 +120,7 @@ asn_TYPE_descriptor_t asn_DEF_t_member2_4 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_t_member2_tags_4, sizeof(asn_DEF_t_member2_tags_4) @@ -199,6 +201,7 @@ asn_TYPE_descriptor_t asn_DEF_Test_structure_1 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_Test_structure_1_tags_1, sizeof(asn_DEF_Test_structure_1_tags_1) @@ -296,6 +299,7 @@ asn_TYPE_descriptor_t asn_DEF_or_3 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_or_tags_3, sizeof(asn_DEF_or_tags_3) @@ -374,6 +378,7 @@ asn_TYPE_descriptor_t asn_DEF_Choice_1 = { 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 */ CHOICE_outmost_tag, 0, /* No effective tags (pointer) */ 0, /* No effective tags (count) */ @@ -469,6 +474,7 @@ asn_TYPE_descriptor_t asn_DEF_Test_structure_2 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_Test_structure_2_tags_1, sizeof(asn_DEF_Test_structure_2_tags_1) @@ -566,6 +572,7 @@ asn_TYPE_descriptor_t asn_DEF_Test_structure_3 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_Test_structure_3_tags_1, sizeof(asn_DEF_Test_structure_3_tags_1) diff --git a/tests/44-choice-in-sequence-OK.asn1.-P b/tests/44-choice-in-sequence-OK.asn1.-P index 1c5e4c22..3d9b08cf 100644 --- a/tests/44-choice-in-sequence-OK.asn1.-P +++ b/tests/44-choice-in-sequence-OK.asn1.-P @@ -116,6 +116,7 @@ asn_TYPE_descriptor_t asn_DEF_e_6 = { 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 */ CHOICE_outmost_tag, 0, /* No effective tags (pointer) */ 0, /* No effective tags (count) */ @@ -173,6 +174,7 @@ asn_TYPE_descriptor_t asn_DEF_h_9 = { 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 */ CHOICE_outmost_tag, 0, /* No effective tags (pointer) */ 0, /* No effective tags (count) */ @@ -251,6 +253,7 @@ asn_TYPE_descriptor_t asn_DEF_b_3 = { 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 */ CHOICE_outmost_tag, 0, /* No effective tags (pointer) */ 0, /* No effective tags (count) */ @@ -314,6 +317,7 @@ asn_TYPE_descriptor_t asn_DEF_T = { 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, /* Use generic outmost tag fetcher */ asn_DEF_T_tags_1, sizeof(asn_DEF_T_tags_1) diff --git a/tests/46-redefine-OK.asn1.-PR b/tests/46-redefine-OK.asn1.-PR index 23475b40..694e259e 100644 --- a/tests/46-redefine-OK.asn1.-PR +++ b/tests/46-redefine-OK.asn1.-PR @@ -43,6 +43,8 @@ PrimitiveType_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_OCTET_STRING.xer_encoder; td->uper_decoder = asn_DEF_OCTET_STRING.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_OCTET_STRING.per_constraints; td->elements = asn_DEF_OCTET_STRING.elements; @@ -111,6 +113,7 @@ asn_TYPE_descriptor_t asn_DEF_PrimitiveType = { 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, /* Use generic outmost tag fetcher */ asn_DEF_PrimitiveType_tags_1, sizeof(asn_DEF_PrimitiveType_tags_1) @@ -181,6 +184,7 @@ asn_TYPE_descriptor_t asn_DEF_ConstructedType = { 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, /* Use generic outmost tag fetcher */ asn_DEF_ConstructedType_tags_1, sizeof(asn_DEF_ConstructedType_tags_1) @@ -239,6 +243,8 @@ T_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_ConstructedType.xer_encoder; td->uper_decoder = asn_DEF_ConstructedType.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_ConstructedType.per_constraints; td->elements = asn_DEF_ConstructedType.elements; @@ -308,6 +314,7 @@ asn_TYPE_descriptor_t asn_DEF_T = { 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, /* Use generic outmost tag fetcher */ asn_DEF_T_tags_1, sizeof(asn_DEF_T_tags_1) diff --git a/tests/47-set-ext-OK.asn1.-Pfwide-types b/tests/47-set-ext-OK.asn1.-Pfwide-types index d7cbf09e..b6858814 100644 --- a/tests/47-set-ext-OK.asn1.-Pfwide-types +++ b/tests/47-set-ext-OK.asn1.-Pfwide-types @@ -79,6 +79,7 @@ asn_TYPE_descriptor_t asn_DEF_T1 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_T1_tags_1, sizeof(asn_DEF_T1_tags_1) @@ -173,6 +174,7 @@ asn_TYPE_descriptor_t asn_DEF_T2 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_T2_tags_1, sizeof(asn_DEF_T2_tags_1) @@ -258,6 +260,7 @@ asn_TYPE_descriptor_t asn_DEF_T3 = { 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 */ CHOICE_outmost_tag, 0, /* No effective tags (pointer) */ 0, /* No effective tags (count) */ @@ -341,6 +344,7 @@ asn_TYPE_descriptor_t asn_DEF_T4 = { 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 */ CHOICE_outmost_tag, 0, /* No effective tags (pointer) */ 0, /* No effective tags (count) */ diff --git a/tests/50-constraint-OK.asn1.-Pfwide-types b/tests/50-constraint-OK.asn1.-Pfwide-types index dfce62b0..75b3698e 100644 --- a/tests/50-constraint-OK.asn1.-Pfwide-types +++ b/tests/50-constraint-OK.asn1.-Pfwide-types @@ -43,6 +43,8 @@ Int1_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_INTEGER.xer_encoder; td->uper_decoder = asn_DEF_INTEGER.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_INTEGER.per_constraints; td->elements = asn_DEF_INTEGER.elements; @@ -111,6 +113,7 @@ asn_TYPE_descriptor_t asn_DEF_Int1 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_Int1_tags_1, sizeof(asn_DEF_Int1_tags_1) @@ -187,6 +190,8 @@ Int2_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_Int1.xer_encoder; td->uper_decoder = asn_DEF_Int1.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_Int1.per_constraints; td->elements = asn_DEF_Int1.elements; @@ -255,6 +260,7 @@ asn_TYPE_descriptor_t asn_DEF_Int2 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_Int2_tags_1, sizeof(asn_DEF_Int2_tags_1) @@ -335,6 +341,8 @@ Int3_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_Int2.xer_encoder; td->uper_decoder = asn_DEF_Int2.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_Int2.per_constraints; td->elements = asn_DEF_Int2.elements; @@ -403,6 +411,7 @@ asn_TYPE_descriptor_t asn_DEF_Int3 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_Int3_tags_1, sizeof(asn_DEF_Int3_tags_1) @@ -483,6 +492,8 @@ Int4_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_Int3.xer_encoder; td->uper_decoder = asn_DEF_Int3.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_Int3.per_constraints; td->elements = asn_DEF_Int3.elements; @@ -551,6 +562,7 @@ asn_TYPE_descriptor_t asn_DEF_Int4 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_Int4_tags_1, sizeof(asn_DEF_Int4_tags_1) @@ -631,6 +643,8 @@ Int5_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_Int4.xer_encoder; td->uper_decoder = asn_DEF_Int4.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_Int4.per_constraints; td->elements = asn_DEF_Int4.elements; @@ -699,6 +713,7 @@ asn_TYPE_descriptor_t asn_DEF_Int5 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_Int5_tags_1, sizeof(asn_DEF_Int5_tags_1) @@ -779,6 +794,8 @@ ExtensibleExtensions_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_INTEGER.xer_encoder; td->uper_decoder = asn_DEF_INTEGER.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_INTEGER.per_constraints; td->elements = asn_DEF_INTEGER.elements; @@ -847,6 +864,7 @@ asn_TYPE_descriptor_t asn_DEF_ExtensibleExtensions = { 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, /* Use generic outmost tag fetcher */ asn_DEF_ExtensibleExtensions_tags_1, sizeof(asn_DEF_ExtensibleExtensions_tags_1) @@ -904,6 +922,8 @@ Str1_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_IA5String.xer_encoder; td->uper_decoder = asn_DEF_IA5String.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_IA5String.per_constraints; td->elements = asn_DEF_IA5String.elements; @@ -972,6 +992,7 @@ asn_TYPE_descriptor_t asn_DEF_Str1 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_Str1_tags_1, sizeof(asn_DEF_Str1_tags_1) @@ -1064,6 +1085,8 @@ Str2_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_Str1.xer_encoder; td->uper_decoder = asn_DEF_Str1.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_Str1.per_constraints; td->elements = asn_DEF_Str1.elements; @@ -1132,6 +1155,7 @@ asn_TYPE_descriptor_t asn_DEF_Str2 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_Str2_tags_1, sizeof(asn_DEF_Str2_tags_1) @@ -1235,6 +1259,8 @@ Str3_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_Str2.xer_encoder; td->uper_decoder = asn_DEF_Str2.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_Str2.per_constraints; td->elements = asn_DEF_Str2.elements; @@ -1303,6 +1329,7 @@ asn_TYPE_descriptor_t asn_DEF_Str3 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_Str3_tags_1, sizeof(asn_DEF_Str3_tags_1) @@ -1392,6 +1419,8 @@ Str4_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_IA5String.xer_encoder; td->uper_decoder = asn_DEF_IA5String.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_IA5String.per_constraints; td->elements = asn_DEF_IA5String.elements; @@ -1460,6 +1489,7 @@ asn_TYPE_descriptor_t asn_DEF_Str4 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_Str4_tags_1, sizeof(asn_DEF_Str4_tags_1) @@ -1549,6 +1579,8 @@ PER_Visible_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_IA5String.xer_encoder; td->uper_decoder = asn_DEF_IA5String.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_IA5String.per_constraints; td->elements = asn_DEF_IA5String.elements; @@ -1617,6 +1649,7 @@ asn_TYPE_descriptor_t asn_DEF_PER_Visible = { 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, /* Use generic outmost tag fetcher */ asn_DEF_PER_Visible_tags_1, sizeof(asn_DEF_PER_Visible_tags_1) @@ -1706,6 +1739,8 @@ PER_Visible_2_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_PER_Visible.xer_encoder; td->uper_decoder = asn_DEF_PER_Visible.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_PER_Visible.per_constraints; td->elements = asn_DEF_PER_Visible.elements; @@ -1774,6 +1809,7 @@ asn_TYPE_descriptor_t asn_DEF_PER_Visible_2 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_PER_Visible_2_tags_1, sizeof(asn_DEF_PER_Visible_2_tags_1) @@ -1863,6 +1899,8 @@ Not_PER_Visible_1_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_PER_Visible.xer_encoder; td->uper_decoder = asn_DEF_PER_Visible.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_PER_Visible.per_constraints; td->elements = asn_DEF_PER_Visible.elements; @@ -1931,6 +1969,7 @@ asn_TYPE_descriptor_t asn_DEF_Not_PER_Visible_1 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_Not_PER_Visible_1_tags_1, sizeof(asn_DEF_Not_PER_Visible_1_tags_1) @@ -2020,6 +2059,8 @@ Not_PER_Visible_2_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_PER_Visible.xer_encoder; td->uper_decoder = asn_DEF_PER_Visible.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_PER_Visible.per_constraints; td->elements = asn_DEF_PER_Visible.elements; @@ -2088,6 +2129,7 @@ asn_TYPE_descriptor_t asn_DEF_Not_PER_Visible_2 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_Not_PER_Visible_2_tags_1, sizeof(asn_DEF_Not_PER_Visible_2_tags_1) @@ -2177,6 +2219,8 @@ Not_PER_Visible_3_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_PER_Visible.xer_encoder; td->uper_decoder = asn_DEF_PER_Visible.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_PER_Visible.per_constraints; td->elements = asn_DEF_PER_Visible.elements; @@ -2245,6 +2289,7 @@ asn_TYPE_descriptor_t asn_DEF_Not_PER_Visible_3 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_Not_PER_Visible_3_tags_1, sizeof(asn_DEF_Not_PER_Visible_3_tags_1) @@ -2337,6 +2382,8 @@ SIZE_but_not_FROM_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_PER_Visible.xer_encoder; td->uper_decoder = asn_DEF_PER_Visible.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_PER_Visible.per_constraints; td->elements = asn_DEF_PER_Visible.elements; @@ -2405,6 +2452,7 @@ asn_TYPE_descriptor_t asn_DEF_SIZE_but_not_FROM = { 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, /* Use generic outmost tag fetcher */ asn_DEF_SIZE_but_not_FROM_tags_1, sizeof(asn_DEF_SIZE_but_not_FROM_tags_1) @@ -2497,6 +2545,8 @@ SIZE_and_FROM_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_PER_Visible.xer_encoder; td->uper_decoder = asn_DEF_PER_Visible.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_PER_Visible.per_constraints; td->elements = asn_DEF_PER_Visible.elements; @@ -2565,6 +2615,7 @@ asn_TYPE_descriptor_t asn_DEF_SIZE_and_FROM = { 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, /* Use generic outmost tag fetcher */ asn_DEF_SIZE_and_FROM_tags_1, sizeof(asn_DEF_SIZE_and_FROM_tags_1) @@ -2654,6 +2705,8 @@ Neither_SIZE_nor_FROM_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_PER_Visible.xer_encoder; td->uper_decoder = asn_DEF_PER_Visible.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_PER_Visible.per_constraints; td->elements = asn_DEF_PER_Visible.elements; @@ -2722,6 +2775,7 @@ asn_TYPE_descriptor_t asn_DEF_Neither_SIZE_nor_FROM = { 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, /* Use generic outmost tag fetcher */ asn_DEF_Neither_SIZE_nor_FROM_tags_1, sizeof(asn_DEF_Neither_SIZE_nor_FROM_tags_1) @@ -2805,6 +2859,8 @@ Utf8_4_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_UTF8String.xer_encoder; td->uper_decoder = asn_DEF_UTF8String.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_UTF8String.per_constraints; td->elements = asn_DEF_UTF8String.elements; @@ -2873,6 +2929,7 @@ asn_TYPE_descriptor_t asn_DEF_Utf8_4 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_Utf8_4_tags_1, sizeof(asn_DEF_Utf8_4_tags_1) @@ -2984,6 +3041,8 @@ Utf8_3_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_Utf8_2.xer_encoder; td->uper_decoder = asn_DEF_Utf8_2.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_Utf8_2.per_constraints; td->elements = asn_DEF_Utf8_2.elements; @@ -3052,6 +3111,7 @@ asn_TYPE_descriptor_t asn_DEF_Utf8_3 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_Utf8_3_tags_1, sizeof(asn_DEF_Utf8_3_tags_1) @@ -3133,6 +3193,8 @@ Utf8_2_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_Utf8_1.xer_encoder; td->uper_decoder = asn_DEF_Utf8_1.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_Utf8_1.per_constraints; td->elements = asn_DEF_Utf8_1.elements; @@ -3201,6 +3263,7 @@ asn_TYPE_descriptor_t asn_DEF_Utf8_2 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_Utf8_2_tags_1, sizeof(asn_DEF_Utf8_2_tags_1) @@ -3258,6 +3321,8 @@ Utf8_1_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_UTF8String.xer_encoder; td->uper_decoder = asn_DEF_UTF8String.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_UTF8String.per_constraints; td->elements = asn_DEF_UTF8String.elements; @@ -3326,6 +3391,7 @@ asn_TYPE_descriptor_t asn_DEF_Utf8_1 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_Utf8_1_tags_1, sizeof(asn_DEF_Utf8_1_tags_1) @@ -3430,6 +3496,8 @@ VisibleIdentifier_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_Identifier.xer_encoder; td->uper_decoder = asn_DEF_Identifier.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_Identifier.per_constraints; td->elements = asn_DEF_Identifier.elements; @@ -3498,6 +3566,7 @@ asn_TYPE_descriptor_t asn_DEF_VisibleIdentifier = { 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, /* Use generic outmost tag fetcher */ asn_DEF_VisibleIdentifier_tags_1, sizeof(asn_DEF_VisibleIdentifier_tags_1) @@ -3581,6 +3650,8 @@ enum_c_6_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_ENUMERATED.xer_encoder; td->uper_decoder = asn_DEF_ENUMERATED.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_ENUMERATED.per_constraints; td->elements = asn_DEF_ENUMERATED.elements; @@ -3802,6 +3873,7 @@ asn_TYPE_descriptor_t asn_DEF_enum_c_6 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_enum_c_tags_6, sizeof(asn_DEF_enum_c_tags_6) @@ -3911,6 +3983,7 @@ asn_TYPE_descriptor_t asn_DEF_Sequence = { 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, /* Use generic outmost tag fetcher */ asn_DEF_Sequence_tags_1, sizeof(asn_DEF_Sequence_tags_1) @@ -3983,6 +4056,7 @@ asn_TYPE_descriptor_t asn_DEF_SequenceOf = { 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, /* Use generic outmost tag fetcher */ asn_DEF_SequenceOf_tags_1, sizeof(asn_DEF_SequenceOf_tags_1) @@ -4048,6 +4122,8 @@ Enum0_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_ENUMERATED.xer_encoder; td->uper_decoder = asn_DEF_ENUMERATED.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_ENUMERATED.per_constraints; td->elements = asn_DEF_ENUMERATED.elements; @@ -4133,6 +4209,7 @@ asn_TYPE_descriptor_t asn_DEF_Enum0 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_Enum0_tags_1, sizeof(asn_DEF_Enum0_tags_1) @@ -4214,6 +4291,8 @@ Enum1_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_NativeEnumerated.xer_encoder; td->uper_decoder = asn_DEF_NativeEnumerated.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_NativeEnumerated.per_constraints; td->elements = asn_DEF_NativeEnumerated.elements; @@ -4299,6 +4378,7 @@ asn_TYPE_descriptor_t asn_DEF_Enum1 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_Enum1_tags_1, sizeof(asn_DEF_Enum1_tags_1) @@ -4403,6 +4483,8 @@ Identifier_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_VisibleString.xer_encoder; td->uper_decoder = asn_DEF_VisibleString.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_VisibleString.per_constraints; td->elements = asn_DEF_VisibleString.elements; @@ -4471,6 +4553,7 @@ asn_TYPE_descriptor_t asn_DEF_Identifier = { 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, /* Use generic outmost tag fetcher */ asn_DEF_Identifier_tags_1, sizeof(asn_DEF_Identifier_tags_1) diff --git a/tests/50-constraint-OK.asn1.-Pgen-PER b/tests/50-constraint-OK.asn1.-Pgen-PER index 8565ed50..3ac7a514 100644 --- a/tests/50-constraint-OK.asn1.-Pgen-PER +++ b/tests/50-constraint-OK.asn1.-Pgen-PER @@ -45,6 +45,8 @@ Int1_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_NativeInteger.xer_encoder; td->uper_decoder = asn_DEF_NativeInteger.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -129,6 +131,7 @@ asn_TYPE_descriptor_t asn_DEF_Int1 = { Int1_encode_xer, 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) @@ -205,6 +208,8 @@ Int2_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_Int1.xer_encoder; td->uper_decoder = asn_DEF_Int1.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_Int1.per_constraints; td->elements = asn_DEF_Int1.elements; @@ -297,6 +302,7 @@ asn_TYPE_descriptor_t asn_DEF_Int2 = { Int2_encode_xer, 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) @@ -373,6 +379,8 @@ Int3_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_Int2.xer_encoder; td->uper_decoder = asn_DEF_Int2.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_Int2.per_constraints; td->elements = asn_DEF_Int2.elements; @@ -465,6 +473,7 @@ asn_TYPE_descriptor_t asn_DEF_Int3 = { Int3_encode_xer, 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) @@ -541,6 +550,8 @@ Int4_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_Int3.xer_encoder; td->uper_decoder = asn_DEF_Int3.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_Int3.per_constraints; td->elements = asn_DEF_Int3.elements; @@ -633,6 +644,7 @@ asn_TYPE_descriptor_t asn_DEF_Int4 = { Int4_encode_xer, 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) @@ -709,6 +721,8 @@ Int5_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_Int4.xer_encoder; td->uper_decoder = asn_DEF_Int4.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_Int4.per_constraints; td->elements = asn_DEF_Int4.elements; @@ -801,6 +815,7 @@ asn_TYPE_descriptor_t asn_DEF_Int5 = { Int5_encode_xer, 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) @@ -877,6 +892,8 @@ ExtensibleExtensions_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_NativeInteger.xer_encoder; td->uper_decoder = asn_DEF_NativeInteger.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -969,6 +986,7 @@ asn_TYPE_descriptor_t asn_DEF_ExtensibleExtensions = { ExtensibleExtensions_encode_xer, 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) @@ -1028,6 +1046,8 @@ Str1_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_IA5String.xer_encoder; td->uper_decoder = asn_DEF_IA5String.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_IA5String.per_constraints; td->elements = asn_DEF_IA5String.elements; @@ -1112,6 +1132,7 @@ asn_TYPE_descriptor_t asn_DEF_Str1 = { Str1_encode_xer, 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) @@ -1206,6 +1227,8 @@ Str2_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_Str1.xer_encoder; td->uper_decoder = asn_DEF_Str1.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_Str1.per_constraints; td->elements = asn_DEF_Str1.elements; @@ -1298,6 +1321,7 @@ asn_TYPE_descriptor_t asn_DEF_Str2 = { Str2_encode_xer, 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) @@ -1416,6 +1440,8 @@ Str3_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_Str2.xer_encoder; td->uper_decoder = asn_DEF_Str2.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_Str2.per_constraints; td->elements = asn_DEF_Str2.elements; @@ -1509,6 +1535,7 @@ asn_TYPE_descriptor_t asn_DEF_Str3 = { Str3_encode_xer, 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) @@ -1600,6 +1627,8 @@ Str4_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_IA5String.xer_encoder; td->uper_decoder = asn_DEF_IA5String.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_IA5String.per_constraints; td->elements = asn_DEF_IA5String.elements; @@ -1692,6 +1721,7 @@ asn_TYPE_descriptor_t asn_DEF_Str4 = { Str4_encode_xer, 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) @@ -1783,6 +1813,8 @@ PER_Visible_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_IA5String.xer_encoder; td->uper_decoder = asn_DEF_IA5String.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_IA5String.per_constraints; td->elements = asn_DEF_IA5String.elements; @@ -1875,6 +1907,7 @@ asn_TYPE_descriptor_t asn_DEF_PER_Visible = { PER_Visible_encode_xer, 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) @@ -1966,6 +1999,8 @@ PER_Visible_2_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_PER_Visible.xer_encoder; td->uper_decoder = asn_DEF_PER_Visible.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_PER_Visible.per_constraints; td->elements = asn_DEF_PER_Visible.elements; @@ -2058,6 +2093,7 @@ asn_TYPE_descriptor_t asn_DEF_PER_Visible_2 = { PER_Visible_2_encode_xer, 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) @@ -2149,6 +2185,8 @@ Not_PER_Visible_1_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_PER_Visible.xer_encoder; td->uper_decoder = asn_DEF_PER_Visible.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_PER_Visible.per_constraints; td->elements = asn_DEF_PER_Visible.elements; @@ -2241,6 +2279,7 @@ asn_TYPE_descriptor_t asn_DEF_Not_PER_Visible_1 = { Not_PER_Visible_1_encode_xer, 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) @@ -2332,6 +2371,8 @@ Not_PER_Visible_2_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_PER_Visible.xer_encoder; td->uper_decoder = asn_DEF_PER_Visible.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_PER_Visible.per_constraints; td->elements = asn_DEF_PER_Visible.elements; @@ -2424,6 +2465,7 @@ asn_TYPE_descriptor_t asn_DEF_Not_PER_Visible_2 = { Not_PER_Visible_2_encode_xer, 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) @@ -2515,6 +2557,8 @@ Not_PER_Visible_3_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_PER_Visible.xer_encoder; td->uper_decoder = asn_DEF_PER_Visible.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_PER_Visible.per_constraints; td->elements = asn_DEF_PER_Visible.elements; @@ -2607,6 +2651,7 @@ asn_TYPE_descriptor_t asn_DEF_Not_PER_Visible_3 = { Not_PER_Visible_3_encode_xer, 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) @@ -2701,6 +2746,8 @@ SIZE_but_not_FROM_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_PER_Visible.xer_encoder; td->uper_decoder = asn_DEF_PER_Visible.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_PER_Visible.per_constraints; td->elements = asn_DEF_PER_Visible.elements; @@ -2793,6 +2840,7 @@ asn_TYPE_descriptor_t asn_DEF_SIZE_but_not_FROM = { SIZE_but_not_FROM_encode_xer, 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) @@ -2887,6 +2935,8 @@ SIZE_and_FROM_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_PER_Visible.xer_encoder; td->uper_decoder = asn_DEF_PER_Visible.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_PER_Visible.per_constraints; td->elements = asn_DEF_PER_Visible.elements; @@ -2979,6 +3029,7 @@ asn_TYPE_descriptor_t asn_DEF_SIZE_and_FROM = { SIZE_and_FROM_encode_xer, 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) @@ -3070,6 +3121,8 @@ Neither_SIZE_nor_FROM_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_PER_Visible.xer_encoder; td->uper_decoder = asn_DEF_PER_Visible.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_PER_Visible.per_constraints; td->elements = asn_DEF_PER_Visible.elements; @@ -3162,6 +3215,7 @@ asn_TYPE_descriptor_t asn_DEF_Neither_SIZE_nor_FROM = { Neither_SIZE_nor_FROM_encode_xer, 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) @@ -3247,6 +3301,8 @@ Utf8_4_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_UTF8String.xer_encoder; td->uper_decoder = asn_DEF_UTF8String.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_UTF8String.per_constraints; td->elements = asn_DEF_UTF8String.elements; @@ -3339,6 +3395,7 @@ asn_TYPE_descriptor_t asn_DEF_Utf8_4 = { Utf8_4_encode_xer, 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) @@ -3452,6 +3509,8 @@ Utf8_3_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_Utf8_2.xer_encoder; td->uper_decoder = asn_DEF_Utf8_2.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_Utf8_2.per_constraints; td->elements = asn_DEF_Utf8_2.elements; @@ -3544,6 +3603,7 @@ asn_TYPE_descriptor_t asn_DEF_Utf8_3 = { Utf8_3_encode_xer, 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) @@ -3627,6 +3687,8 @@ Utf8_2_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_Utf8_1.xer_encoder; td->uper_decoder = asn_DEF_Utf8_1.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_Utf8_1.per_constraints; td->elements = asn_DEF_Utf8_1.elements; @@ -3719,6 +3781,7 @@ asn_TYPE_descriptor_t asn_DEF_Utf8_2 = { Utf8_2_encode_xer, 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) @@ -3778,6 +3841,8 @@ Utf8_1_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_UTF8String.xer_encoder; td->uper_decoder = asn_DEF_UTF8String.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_UTF8String.per_constraints; td->elements = asn_DEF_UTF8String.elements; @@ -3862,6 +3927,7 @@ asn_TYPE_descriptor_t asn_DEF_Utf8_1 = { Utf8_1_encode_xer, 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) @@ -3975,6 +4041,8 @@ VisibleIdentifier_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_Identifier.xer_encoder; td->uper_decoder = asn_DEF_Identifier.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_Identifier.per_constraints; td->elements = asn_DEF_Identifier.elements; @@ -4059,6 +4127,7 @@ asn_TYPE_descriptor_t asn_DEF_VisibleIdentifier = { VisibleIdentifier_encode_xer, 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) @@ -4142,6 +4211,8 @@ enum_c_6_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_NativeEnumerated.xer_encoder; td->uper_decoder = asn_DEF_NativeEnumerated.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_NativeEnumerated.per_constraints; td->elements = asn_DEF_NativeEnumerated.elements; @@ -4382,6 +4453,7 @@ asn_TYPE_descriptor_t asn_DEF_enum_c_6 = { enum_c_6_encode_xer, 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) @@ -4494,6 +4566,7 @@ asn_TYPE_descriptor_t asn_DEF_Sequence = { SEQUENCE_encode_xer, 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) @@ -4575,6 +4648,7 @@ asn_TYPE_descriptor_t asn_DEF_SequenceOf = { SEQUENCE_OF_encode_xer, 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) @@ -4642,6 +4716,8 @@ Enum0_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_NativeEnumerated.xer_encoder; td->uper_decoder = asn_DEF_NativeEnumerated.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_NativeEnumerated.per_constraints; td->elements = asn_DEF_NativeEnumerated.elements; @@ -4751,6 +4827,7 @@ asn_TYPE_descriptor_t asn_DEF_Enum0 = { Enum0_encode_xer, 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) @@ -4834,6 +4911,8 @@ Enum1_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_NativeEnumerated.xer_encoder; td->uper_decoder = asn_DEF_NativeEnumerated.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_NativeEnumerated.per_constraints; td->elements = asn_DEF_NativeEnumerated.elements; @@ -4943,6 +5022,7 @@ asn_TYPE_descriptor_t asn_DEF_Enum1 = { Enum1_encode_xer, 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) @@ -5066,6 +5146,8 @@ Identifier_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_VisibleString.xer_encoder; td->uper_decoder = asn_DEF_VisibleString.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_VisibleString.per_constraints; td->elements = asn_DEF_VisibleString.elements; @@ -5159,6 +5241,7 @@ asn_TYPE_descriptor_t asn_DEF_Identifier = { Identifier_encode_xer, 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) diff --git a/tests/59-choice-extended-OK.asn1.-Pfwide-types b/tests/59-choice-extended-OK.asn1.-Pfwide-types index 246a0cdf..39445d0a 100644 --- a/tests/59-choice-extended-OK.asn1.-Pfwide-types +++ b/tests/59-choice-extended-OK.asn1.-Pfwide-types @@ -104,6 +104,7 @@ asn_TYPE_descriptor_t asn_DEF_Choice = { 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 */ CHOICE_outmost_tag, asn_DEF_Choice_tags_1, sizeof(asn_DEF_Choice_tags_1) diff --git a/tests/60-any-OK.asn1.-Pfwide-types b/tests/60-any-OK.asn1.-Pfwide-types index ea10d245..635be8e9 100644 --- a/tests/60-any-OK.asn1.-Pfwide-types +++ b/tests/60-any-OK.asn1.-Pfwide-types @@ -67,6 +67,7 @@ asn_TYPE_descriptor_t asn_DEF_T1 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_T1_tags_1, sizeof(asn_DEF_T1_tags_1) @@ -150,6 +151,7 @@ asn_TYPE_descriptor_t asn_DEF_T2 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_T2_tags_1, sizeof(asn_DEF_T2_tags_1) @@ -228,6 +230,7 @@ asn_TYPE_descriptor_t asn_DEF_T3 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_T3_tags_1, sizeof(asn_DEF_T3_tags_1) diff --git a/tests/65-multi-tag-OK.asn1.-Pfnative-types b/tests/65-multi-tag-OK.asn1.-Pfnative-types index df1e4b7f..8e416e44 100644 --- a/tests/65-multi-tag-OK.asn1.-Pfnative-types +++ b/tests/65-multi-tag-OK.asn1.-Pfnative-types @@ -43,6 +43,8 @@ T1_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_T2.xer_encoder; td->uper_decoder = asn_DEF_T2.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_T2.per_constraints; td->elements = asn_DEF_T2.elements; @@ -122,6 +124,7 @@ asn_TYPE_descriptor_t asn_DEF_T1 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_T1_tags_1, sizeof(asn_DEF_T1_tags_1) @@ -179,6 +182,8 @@ T2_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_T3.xer_encoder; td->uper_decoder = asn_DEF_T3.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_T3.per_constraints; td->elements = asn_DEF_T3.elements; @@ -256,6 +261,7 @@ asn_TYPE_descriptor_t asn_DEF_T2 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_T2_tags_1, sizeof(asn_DEF_T2_tags_1) @@ -313,6 +319,8 @@ T3_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_T4.xer_encoder; td->uper_decoder = asn_DEF_T4.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_T4.per_constraints; td->elements = asn_DEF_T4.elements; @@ -388,6 +396,7 @@ asn_TYPE_descriptor_t asn_DEF_T3 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_T3_tags_1, sizeof(asn_DEF_T3_tags_1) @@ -445,6 +454,8 @@ T4_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_T5.xer_encoder; td->uper_decoder = asn_DEF_T5.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_T5.per_constraints; td->elements = asn_DEF_T5.elements; @@ -515,6 +526,7 @@ asn_TYPE_descriptor_t asn_DEF_T4 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_T4_tags_1, sizeof(asn_DEF_T4_tags_1) @@ -572,6 +584,8 @@ T5_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_T6.xer_encoder; td->uper_decoder = asn_DEF_T6.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_T6.per_constraints; td->elements = asn_DEF_T6.elements; @@ -641,6 +655,7 @@ asn_TYPE_descriptor_t asn_DEF_T5 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_T5_tags_1, sizeof(asn_DEF_T5_tags_1) @@ -698,6 +713,8 @@ T6_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_NativeReal.xer_encoder; td->uper_decoder = asn_DEF_NativeReal.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_NativeReal.per_constraints; td->elements = asn_DEF_NativeReal.elements; @@ -766,6 +783,7 @@ asn_TYPE_descriptor_t asn_DEF_T6 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_T6_tags_1, sizeof(asn_DEF_T6_tags_1) @@ -823,6 +841,8 @@ T_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_Ts.xer_encoder; td->uper_decoder = asn_DEF_Ts.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_Ts.per_constraints; td->elements = asn_DEF_Ts.elements; @@ -893,6 +913,7 @@ asn_TYPE_descriptor_t asn_DEF_T = { 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, /* Use generic outmost tag fetcher */ asn_DEF_T_tags_1, sizeof(asn_DEF_T_tags_1) @@ -987,6 +1008,7 @@ asn_TYPE_descriptor_t asn_DEF_Ts = { 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, /* Use generic outmost tag fetcher */ asn_DEF_Ts_tags_1, sizeof(asn_DEF_Ts_tags_1) diff --git a/tests/65-multi-tag-OK.asn1.-Pfwide-types b/tests/65-multi-tag-OK.asn1.-Pfwide-types index 1ef1cd94..897e6431 100644 --- a/tests/65-multi-tag-OK.asn1.-Pfwide-types +++ b/tests/65-multi-tag-OK.asn1.-Pfwide-types @@ -43,6 +43,8 @@ T1_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_T2.xer_encoder; td->uper_decoder = asn_DEF_T2.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_T2.per_constraints; td->elements = asn_DEF_T2.elements; @@ -122,6 +124,7 @@ asn_TYPE_descriptor_t asn_DEF_T1 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_T1_tags_1, sizeof(asn_DEF_T1_tags_1) @@ -179,6 +182,8 @@ T2_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_T3.xer_encoder; td->uper_decoder = asn_DEF_T3.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_T3.per_constraints; td->elements = asn_DEF_T3.elements; @@ -256,6 +261,7 @@ asn_TYPE_descriptor_t asn_DEF_T2 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_T2_tags_1, sizeof(asn_DEF_T2_tags_1) @@ -313,6 +319,8 @@ T3_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_T4.xer_encoder; td->uper_decoder = asn_DEF_T4.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_T4.per_constraints; td->elements = asn_DEF_T4.elements; @@ -388,6 +396,7 @@ asn_TYPE_descriptor_t asn_DEF_T3 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_T3_tags_1, sizeof(asn_DEF_T3_tags_1) @@ -445,6 +454,8 @@ T4_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_T5.xer_encoder; td->uper_decoder = asn_DEF_T5.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_T5.per_constraints; td->elements = asn_DEF_T5.elements; @@ -515,6 +526,7 @@ asn_TYPE_descriptor_t asn_DEF_T4 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_T4_tags_1, sizeof(asn_DEF_T4_tags_1) @@ -572,6 +584,8 @@ T5_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_T6.xer_encoder; td->uper_decoder = asn_DEF_T6.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_T6.per_constraints; td->elements = asn_DEF_T6.elements; @@ -641,6 +655,7 @@ asn_TYPE_descriptor_t asn_DEF_T5 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_T5_tags_1, sizeof(asn_DEF_T5_tags_1) @@ -698,6 +713,8 @@ T6_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_REAL.xer_encoder; td->uper_decoder = asn_DEF_REAL.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_REAL.per_constraints; td->elements = asn_DEF_REAL.elements; @@ -766,6 +783,7 @@ asn_TYPE_descriptor_t asn_DEF_T6 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_T6_tags_1, sizeof(asn_DEF_T6_tags_1) @@ -823,6 +841,8 @@ T_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_Ts.xer_encoder; td->uper_decoder = asn_DEF_Ts.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_Ts.per_constraints; td->elements = asn_DEF_Ts.elements; @@ -893,6 +913,7 @@ asn_TYPE_descriptor_t asn_DEF_T = { 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, /* Use generic outmost tag fetcher */ asn_DEF_T_tags_1, sizeof(asn_DEF_T_tags_1) @@ -987,6 +1008,7 @@ asn_TYPE_descriptor_t asn_DEF_Ts = { 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, /* Use generic outmost tag fetcher */ asn_DEF_Ts_tags_1, sizeof(asn_DEF_Ts_tags_1) diff --git a/tests/66-ref-simple-OK.asn1.-Pfwide-types b/tests/66-ref-simple-OK.asn1.-Pfwide-types index 6f2d8a22..d5f1d4b4 100644 --- a/tests/66-ref-simple-OK.asn1.-Pfwide-types +++ b/tests/66-ref-simple-OK.asn1.-Pfwide-types @@ -50,6 +50,7 @@ asn_TYPE_descriptor_t asn_DEF_T = { 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, /* Use generic outmost tag fetcher */ asn_DEF_T_tags_1, sizeof(asn_DEF_T_tags_1) @@ -116,6 +117,8 @@ SimpleType_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_ENUMERATED.xer_encoder; td->uper_decoder = asn_DEF_ENUMERATED.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_ENUMERATED.per_constraints; td->elements = asn_DEF_ENUMERATED.elements; @@ -203,6 +206,7 @@ asn_TYPE_descriptor_t asn_DEF_SimpleType = { 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, /* Use generic outmost tag fetcher */ asn_DEF_SimpleType_tags_1, sizeof(asn_DEF_SimpleType_tags_1) diff --git a/tests/69-reserved-words-OK.asn1.-Pfwide-types b/tests/69-reserved-words-OK.asn1.-Pfwide-types index a6f7a2a7..0f5b3f8d 100644 --- a/tests/69-reserved-words-OK.asn1.-Pfwide-types +++ b/tests/69-reserved-words-OK.asn1.-Pfwide-types @@ -104,6 +104,7 @@ asn_TYPE_descriptor_t asn_DEF_class_4 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_class_tags_4, sizeof(asn_DEF_class_tags_4) @@ -183,6 +184,7 @@ asn_TYPE_descriptor_t asn_DEF_T = { 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, /* Use generic outmost tag fetcher */ asn_DEF_T_tags_1, sizeof(asn_DEF_T_tags_1) diff --git a/tests/70-xer-test-OK.asn1.-Pfwide-types b/tests/70-xer-test-OK.asn1.-Pfwide-types index 6655a57e..5038fcd6 100644 --- a/tests/70-xer-test-OK.asn1.-Pfwide-types +++ b/tests/70-xer-test-OK.asn1.-Pfwide-types @@ -252,6 +252,7 @@ asn_TYPE_descriptor_t asn_DEF_PDU = { 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 */ CHOICE_outmost_tag, 0, /* No effective tags (pointer) */ 0, /* No effective tags (count) */ @@ -364,6 +365,7 @@ asn_TYPE_descriptor_t asn_DEF_Sequence = { 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, /* Use generic outmost tag fetcher */ asn_DEF_Sequence_tags_1, sizeof(asn_DEF_Sequence_tags_1) @@ -467,6 +469,7 @@ asn_TYPE_descriptor_t asn_DEF_Set = { 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, /* Use generic outmost tag fetcher */ asn_DEF_Set_tags_1, sizeof(asn_DEF_Set_tags_1) @@ -550,6 +553,8 @@ enum_4_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_ENUMERATED.xer_encoder; td->uper_decoder = asn_DEF_ENUMERATED.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_ENUMERATED.per_constraints; td->elements = asn_DEF_ENUMERATED.elements; @@ -637,6 +642,7 @@ asn_TYPE_descriptor_t asn_DEF_enum_4 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_enum_tags_4, sizeof(asn_DEF_enum_tags_4) @@ -701,6 +707,7 @@ asn_TYPE_descriptor_t asn_DEF_ExtensibleSet = { 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, /* Use generic outmost tag fetcher */ asn_DEF_ExtensibleSet_tags_1, sizeof(asn_DEF_ExtensibleSet_tags_1) @@ -800,6 +807,7 @@ asn_TYPE_descriptor_t asn_DEF_ExtensibleSequence = { 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, /* Use generic outmost tag fetcher */ asn_DEF_ExtensibleSequence_tags_1, sizeof(asn_DEF_ExtensibleSequence_tags_1) @@ -887,6 +895,7 @@ asn_TYPE_descriptor_t asn_DEF_ExtensibleSequence2 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_ExtensibleSequence2_tags_1, sizeof(asn_DEF_ExtensibleSequence2_tags_1) @@ -952,6 +961,7 @@ asn_TYPE_descriptor_t asn_DEF_SetOfNULL = { 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, /* Use generic outmost tag fetcher */ asn_DEF_SetOfNULL_tags_1, sizeof(asn_DEF_SetOfNULL_tags_1) @@ -1017,6 +1027,7 @@ asn_TYPE_descriptor_t asn_DEF_SetOfREAL = { 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, /* Use generic outmost tag fetcher */ asn_DEF_SetOfREAL_tags_1, sizeof(asn_DEF_SetOfREAL_tags_1) @@ -1083,6 +1094,8 @@ Member_2_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_ENUMERATED.xer_encoder; td->uper_decoder = asn_DEF_ENUMERATED.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_ENUMERATED.per_constraints; td->elements = asn_DEF_ENUMERATED.elements; @@ -1169,6 +1182,7 @@ asn_TYPE_descriptor_t asn_DEF_Member_2 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_Member_tags_2, sizeof(asn_DEF_Member_tags_2) @@ -1211,6 +1225,7 @@ asn_TYPE_descriptor_t asn_DEF_SetOfEnums = { 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, /* Use generic outmost tag fetcher */ asn_DEF_SetOfEnums_tags_1, sizeof(asn_DEF_SetOfEnums_tags_1) @@ -1276,6 +1291,7 @@ asn_TYPE_descriptor_t asn_DEF_NamedSetOfNULL = { 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, /* Use generic outmost tag fetcher */ asn_DEF_NamedSetOfNULL_tags_1, sizeof(asn_DEF_NamedSetOfNULL_tags_1) @@ -1341,6 +1357,7 @@ asn_TYPE_descriptor_t asn_DEF_NamedSetOfREAL = { 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, /* Use generic outmost tag fetcher */ asn_DEF_NamedSetOfREAL_tags_1, sizeof(asn_DEF_NamedSetOfREAL_tags_1) @@ -1407,6 +1424,8 @@ name_2_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_ENUMERATED.xer_encoder; td->uper_decoder = asn_DEF_ENUMERATED.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_ENUMERATED.per_constraints; td->elements = asn_DEF_ENUMERATED.elements; @@ -1493,6 +1512,7 @@ asn_TYPE_descriptor_t asn_DEF_name_2 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_name_tags_2, sizeof(asn_DEF_name_tags_2) @@ -1535,6 +1555,7 @@ asn_TYPE_descriptor_t asn_DEF_NamedSetOfEnums = { 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, /* Use generic outmost tag fetcher */ asn_DEF_NamedSetOfEnums_tags_1, sizeof(asn_DEF_NamedSetOfEnums_tags_1) @@ -1600,6 +1621,7 @@ asn_TYPE_descriptor_t asn_DEF_SequenceOf = { 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, /* Use generic outmost tag fetcher */ asn_DEF_SequenceOf_tags_1, sizeof(asn_DEF_SequenceOf_tags_1) @@ -1665,6 +1687,7 @@ asn_TYPE_descriptor_t asn_DEF_SeqOfZuka = { 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, /* Use generic outmost tag fetcher */ asn_DEF_SeqOfZuka_tags_1, sizeof(asn_DEF_SeqOfZuka_tags_1) @@ -1737,6 +1760,7 @@ asn_TYPE_descriptor_t asn_DEF_SetOfChoice = { 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, /* Use generic outmost tag fetcher */ asn_DEF_SetOfChoice_tags_1, sizeof(asn_DEF_SetOfChoice_tags_1) @@ -1809,6 +1833,7 @@ asn_TYPE_descriptor_t asn_DEF_NamedSetOfChoice = { 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, /* Use generic outmost tag fetcher */ asn_DEF_NamedSetOfChoice_tags_1, sizeof(asn_DEF_NamedSetOfChoice_tags_1) @@ -1901,6 +1926,7 @@ asn_TYPE_descriptor_t asn_DEF_SimpleChoice = { 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 */ CHOICE_outmost_tag, 0, /* No effective tags (pointer) */ 0, /* No effective tags (count) */ diff --git a/tests/72-same-names-OK.asn1.-Pfwide-types b/tests/72-same-names-OK.asn1.-Pfwide-types index 70fa4409..bcf07a4d 100644 --- a/tests/72-same-names-OK.asn1.-Pfwide-types +++ b/tests/72-same-names-OK.asn1.-Pfwide-types @@ -81,6 +81,7 @@ asn_TYPE_descriptor_t asn_DEF_Member_2 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_Member_tags_2, sizeof(asn_DEF_Member_tags_2) @@ -124,6 +125,7 @@ asn_TYPE_descriptor_t asn_DEF_Type = { 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, /* Use generic outmost tag fetcher */ asn_DEF_Type_tags_1, sizeof(asn_DEF_Type_tags_1) @@ -228,6 +230,7 @@ asn_TYPE_descriptor_t asn_DEF_another_name_3 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_another_name_tags_3, sizeof(asn_DEF_another_name_tags_3) @@ -277,6 +280,7 @@ asn_TYPE_descriptor_t asn_DEF_one_name_2 = { 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 */ CHOICE_outmost_tag, 0, /* No effective tags (pointer) */ 0, /* No effective tags (count) */ @@ -325,6 +329,7 @@ asn_TYPE_descriptor_t asn_DEF_Type1 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_Type1_tags_1, sizeof(asn_DEF_Type1_tags_1) @@ -526,6 +531,7 @@ asn_TYPE_descriptor_t asn_DEF_another_name_3 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_another_name_tags_3, sizeof(asn_DEF_another_name_tags_3) @@ -577,6 +583,7 @@ asn_TYPE_descriptor_t asn_DEF_one_name_2 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_one_name_tags_2, sizeof(asn_DEF_one_name_tags_2) @@ -638,6 +645,7 @@ asn_TYPE_descriptor_t asn_DEF_another_name_8 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_another_name_tags_8, sizeof(asn_DEF_another_name_tags_8) @@ -694,6 +702,7 @@ asn_TYPE_descriptor_t asn_DEF_two_name_7 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_two_name_tags_7, sizeof(asn_DEF_two_name_tags_7) @@ -752,6 +761,7 @@ asn_TYPE_descriptor_t asn_DEF_Type2 = { 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 */ CHOICE_outmost_tag, 0, /* No effective tags (pointer) */ 0, /* No effective tags (count) */ diff --git a/tests/73-circular-OK.asn1.-Pfwide-types b/tests/73-circular-OK.asn1.-Pfwide-types index 24c9dd9d..e64d2af0 100644 --- a/tests/73-circular-OK.asn1.-Pfwide-types +++ b/tests/73-circular-OK.asn1.-Pfwide-types @@ -64,6 +64,7 @@ asn_TYPE_descriptor_t asn_DEF_data_2 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_data_tags_2, sizeof(asn_DEF_data_tags_2) @@ -114,6 +115,7 @@ asn_TYPE_descriptor_t asn_DEF_Type = { 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, /* Use generic outmost tag fetcher */ asn_DEF_Type_tags_1, sizeof(asn_DEF_Type_tags_1) @@ -172,6 +174,8 @@ EpytRef_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_Epyt.xer_encoder; td->uper_decoder = asn_DEF_Epyt.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_Epyt.per_constraints; td->elements = asn_DEF_Epyt.elements; @@ -240,6 +244,7 @@ asn_TYPE_descriptor_t asn_DEF_EpytRef = { 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, /* Use generic outmost tag fetcher */ asn_DEF_EpytRef_tags_1, sizeof(asn_DEF_EpytRef_tags_1) @@ -322,6 +327,7 @@ asn_TYPE_descriptor_t asn_DEF_stype_2 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_stype_tags_2, sizeof(asn_DEF_stype_tags_2) @@ -392,6 +398,7 @@ asn_TYPE_descriptor_t asn_DEF_Epyt = { 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, /* Use generic outmost tag fetcher */ asn_DEF_Epyt_tags_1, sizeof(asn_DEF_Epyt_tags_1) @@ -596,6 +603,7 @@ asn_TYPE_descriptor_t asn_DEF_senums_4 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_senums_tags_4, sizeof(asn_DEF_senums_tags_4) @@ -691,6 +699,7 @@ asn_TYPE_descriptor_t asn_DEF_Ypet = { 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, /* Use generic outmost tag fetcher */ asn_DEF_Ypet_tags_1, sizeof(asn_DEF_Ypet_tags_1) @@ -756,6 +765,8 @@ EnumType_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_ENUMERATED.xer_encoder; td->uper_decoder = asn_DEF_ENUMERATED.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_ENUMERATED.per_constraints; td->elements = asn_DEF_ENUMERATED.elements; @@ -841,6 +852,7 @@ asn_TYPE_descriptor_t asn_DEF_EnumType = { 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, /* Use generic outmost tag fetcher */ asn_DEF_EnumType_tags_1, sizeof(asn_DEF_EnumType_tags_1) diff --git a/tests/84-param-tags-OK.asn1.-Pfwide-types b/tests/84-param-tags-OK.asn1.-Pfwide-types index decc513c..73dc8bc4 100644 --- a/tests/84-param-tags-OK.asn1.-Pfwide-types +++ b/tests/84-param-tags-OK.asn1.-Pfwide-types @@ -110,6 +110,7 @@ asn_TYPE_descriptor_t asn_DEF_TestType_16P0 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_TestType_16P0_tags_1, sizeof(asn_DEF_TestType_16P0_tags_1) @@ -178,6 +179,7 @@ asn_TYPE_descriptor_t asn_DEF_TestType_16P1 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_TestType_16P1_tags_3, sizeof(asn_DEF_TestType_16P1_tags_3) @@ -269,6 +271,7 @@ asn_TYPE_descriptor_t asn_DEF_TestChoice = { 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 */ CHOICE_outmost_tag, 0, /* No effective tags (pointer) */ 0, /* No effective tags (count) */ @@ -399,6 +402,7 @@ asn_TYPE_descriptor_t asn_DEF_AutoType_34P0 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_AutoType_34P0_tags_1, sizeof(asn_DEF_AutoType_34P0_tags_1) @@ -449,6 +453,7 @@ asn_TYPE_descriptor_t asn_DEF_AutoType_34P1 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_AutoType_34P1_tags_3, sizeof(asn_DEF_AutoType_34P1_tags_3) @@ -540,6 +545,7 @@ asn_TYPE_descriptor_t asn_DEF_AutoChoice = { 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 */ CHOICE_outmost_tag, 0, /* No effective tags (pointer) */ 0, /* No effective tags (count) */ diff --git a/tests/88-integer-enum-OK.asn1.-Pfwide-types b/tests/88-integer-enum-OK.asn1.-Pfwide-types index 9b19c156..d387aa72 100644 --- a/tests/88-integer-enum-OK.asn1.-Pfwide-types +++ b/tests/88-integer-enum-OK.asn1.-Pfwide-types @@ -50,6 +50,8 @@ T_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_INTEGER.xer_encoder; td->uper_decoder = asn_DEF_INTEGER.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_INTEGER.per_constraints; td->elements = asn_DEF_INTEGER.elements; @@ -118,6 +120,7 @@ asn_TYPE_descriptor_t asn_DEF_T = { 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, /* Use generic outmost tag fetcher */ asn_DEF_T_tags_1, sizeof(asn_DEF_T_tags_1) diff --git a/tests/89-bit-string-enum-OK.asn1.-Pfcompound-names b/tests/89-bit-string-enum-OK.asn1.-Pfcompound-names index cbd2b96a..f796c514 100644 --- a/tests/89-bit-string-enum-OK.asn1.-Pfcompound-names +++ b/tests/89-bit-string-enum-OK.asn1.-Pfcompound-names @@ -68,6 +68,7 @@ asn_TYPE_descriptor_t asn_DEF_T = { 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 */ CHOICE_outmost_tag, 0, /* No effective tags (pointer) */ 0, /* No effective tags (count) */ diff --git a/tests/89-bit-string-enum-OK.asn1.-Pfwide-types b/tests/89-bit-string-enum-OK.asn1.-Pfwide-types index 3c4ea404..45aa9f8b 100644 --- a/tests/89-bit-string-enum-OK.asn1.-Pfwide-types +++ b/tests/89-bit-string-enum-OK.asn1.-Pfwide-types @@ -68,6 +68,7 @@ asn_TYPE_descriptor_t asn_DEF_T = { 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 */ CHOICE_outmost_tag, 0, /* No effective tags (pointer) */ 0, /* No effective tags (count) */ diff --git a/tests/90-cond-int-type-OK.asn1.-P b/tests/90-cond-int-type-OK.asn1.-P index 7ccb4a8b..f1e60ca6 100644 --- a/tests/90-cond-int-type-OK.asn1.-P +++ b/tests/90-cond-int-type-OK.asn1.-P @@ -43,6 +43,8 @@ CN_IntegerUnlimited_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_NativeInteger.xer_encoder; td->uper_decoder = asn_DEF_NativeInteger.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -111,6 +113,7 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerUnlimited = { 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, /* Use generic outmost tag fetcher */ asn_DEF_CN_IntegerUnlimited_tags_1, sizeof(asn_DEF_CN_IntegerUnlimited_tags_1) @@ -181,6 +184,8 @@ CN_IntegerMinMax_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_NativeInteger.xer_encoder; td->uper_decoder = asn_DEF_NativeInteger.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -249,6 +254,7 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerMinMax = { 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, /* Use generic outmost tag fetcher */ asn_DEF_CN_IntegerMinMax_tags_1, sizeof(asn_DEF_CN_IntegerMinMax_tags_1) @@ -323,6 +329,8 @@ CN_IntegerMinLow_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_NativeInteger.xer_encoder; td->uper_decoder = asn_DEF_NativeInteger.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -391,6 +399,7 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerMinLow = { 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, /* Use generic outmost tag fetcher */ asn_DEF_CN_IntegerMinLow_tags_1, sizeof(asn_DEF_CN_IntegerMinLow_tags_1) @@ -471,6 +480,8 @@ NO_IntegerMinHigh_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_INTEGER.xer_encoder; td->uper_decoder = asn_DEF_INTEGER.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_INTEGER.per_constraints; td->elements = asn_DEF_INTEGER.elements; @@ -539,6 +550,7 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerMinHigh = { 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, /* Use generic outmost tag fetcher */ asn_DEF_NO_IntegerMinHigh_tags_1, sizeof(asn_DEF_NO_IntegerMinHigh_tags_1) @@ -613,6 +625,8 @@ NO_IntegerLowHigh_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_NativeInteger.xer_encoder; td->uper_decoder = asn_DEF_NativeInteger.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -686,6 +700,7 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerLowHigh = { 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, /* Use generic outmost tag fetcher */ asn_DEF_NO_IntegerLowHigh_tags_1, sizeof(asn_DEF_NO_IntegerLowHigh_tags_1) @@ -760,6 +775,8 @@ CN_IntegerLowMax_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_NativeInteger.xer_encoder; td->uper_decoder = asn_DEF_NativeInteger.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -828,6 +845,7 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerLowMax = { 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, /* Use generic outmost tag fetcher */ asn_DEF_CN_IntegerLowMax_tags_1, sizeof(asn_DEF_CN_IntegerLowMax_tags_1) @@ -908,6 +926,8 @@ NO_IntegerHighMax_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_INTEGER.xer_encoder; td->uper_decoder = asn_DEF_INTEGER.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_INTEGER.per_constraints; td->elements = asn_DEF_INTEGER.elements; @@ -976,6 +996,7 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerHighMax = { 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, /* Use generic outmost tag fetcher */ asn_DEF_NO_IntegerHighMax_tags_1, sizeof(asn_DEF_NO_IntegerHighMax_tags_1) @@ -1056,6 +1077,8 @@ NO_IntegerLowestMax_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_INTEGER.xer_encoder; td->uper_decoder = asn_DEF_INTEGER.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_INTEGER.per_constraints; td->elements = asn_DEF_INTEGER.elements; @@ -1124,6 +1147,7 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerLowestMax = { 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, /* Use generic outmost tag fetcher */ asn_DEF_NO_IntegerLowestMax_tags_1, sizeof(asn_DEF_NO_IntegerLowestMax_tags_1) @@ -1198,6 +1222,8 @@ NO_IntegerOutRange_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_NativeInteger.xer_encoder; td->uper_decoder = asn_DEF_NativeInteger.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -1271,6 +1297,7 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerOutRange = { 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, /* Use generic outmost tag fetcher */ asn_DEF_NO_IntegerOutRange_tags_1, sizeof(asn_DEF_NO_IntegerOutRange_tags_1) @@ -1345,6 +1372,8 @@ NO_IntegerOutValue_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_NativeInteger.xer_encoder; td->uper_decoder = asn_DEF_NativeInteger.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -1418,6 +1447,7 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerOutValue = { 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, /* Use generic outmost tag fetcher */ asn_DEF_NO_IntegerOutValue_tags_1, sizeof(asn_DEF_NO_IntegerOutValue_tags_1) @@ -1492,6 +1522,8 @@ OK_IntegerInRange1_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_NativeInteger.xer_encoder; td->uper_decoder = asn_DEF_NativeInteger.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -1560,6 +1592,7 @@ asn_TYPE_descriptor_t asn_DEF_OK_IntegerInRange1 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_OK_IntegerInRange1_tags_1, sizeof(asn_DEF_OK_IntegerInRange1_tags_1) @@ -1634,6 +1667,8 @@ OK_IntegerInRange2_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_NativeInteger.xer_encoder; td->uper_decoder = asn_DEF_NativeInteger.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -1702,6 +1737,7 @@ asn_TYPE_descriptor_t asn_DEF_OK_IntegerInRange2 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_OK_IntegerInRange2_tags_1, sizeof(asn_DEF_OK_IntegerInRange2_tags_1) @@ -1776,6 +1812,8 @@ OK_IntegerInRange3_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_NativeInteger.xer_encoder; td->uper_decoder = asn_DEF_NativeInteger.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -1844,6 +1882,7 @@ asn_TYPE_descriptor_t asn_DEF_OK_IntegerInRange3 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_OK_IntegerInRange3_tags_1, sizeof(asn_DEF_OK_IntegerInRange3_tags_1) @@ -1918,6 +1957,8 @@ OK_IntegerInRange4_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_NativeInteger.xer_encoder; td->uper_decoder = asn_DEF_NativeInteger.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -1986,6 +2027,7 @@ asn_TYPE_descriptor_t asn_DEF_OK_IntegerInRange4 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_OK_IntegerInRange4_tags_1, sizeof(asn_DEF_OK_IntegerInRange4_tags_1) @@ -2060,6 +2102,8 @@ OK_IntegerInRange5_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_NativeInteger.xer_encoder; td->uper_decoder = asn_DEF_NativeInteger.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -2128,6 +2172,7 @@ asn_TYPE_descriptor_t asn_DEF_OK_IntegerInRange5 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_OK_IntegerInRange5_tags_1, sizeof(asn_DEF_OK_IntegerInRange5_tags_1) @@ -2193,6 +2238,8 @@ NO_IntegerInRange6_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_NativeInteger.xer_encoder; td->uper_decoder = asn_DEF_NativeInteger.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -2266,6 +2313,7 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerInRange6 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_NO_IntegerInRange6_tags_1, sizeof(asn_DEF_NO_IntegerInRange6_tags_1) @@ -2330,6 +2378,8 @@ CN_IntegerEnumerated1_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_NativeInteger.xer_encoder; td->uper_decoder = asn_DEF_NativeInteger.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -2398,6 +2448,7 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerEnumerated1 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_CN_IntegerEnumerated1_tags_1, sizeof(asn_DEF_CN_IntegerEnumerated1_tags_1) @@ -2462,6 +2513,8 @@ NO_IntegerEnumerated2_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_INTEGER.xer_encoder; td->uper_decoder = asn_DEF_INTEGER.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_INTEGER.per_constraints; td->elements = asn_DEF_INTEGER.elements; @@ -2530,6 +2583,7 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerEnumerated2 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_NO_IntegerEnumerated2_tags_1, sizeof(asn_DEF_NO_IntegerEnumerated2_tags_1) diff --git a/tests/90-cond-int-type-OK.asn1.-Pfwide-types b/tests/90-cond-int-type-OK.asn1.-Pfwide-types index 1cb32315..b2ba2972 100644 --- a/tests/90-cond-int-type-OK.asn1.-Pfwide-types +++ b/tests/90-cond-int-type-OK.asn1.-Pfwide-types @@ -43,6 +43,8 @@ CN_IntegerUnlimited_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_INTEGER.xer_encoder; td->uper_decoder = asn_DEF_INTEGER.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_INTEGER.per_constraints; td->elements = asn_DEF_INTEGER.elements; @@ -111,6 +113,7 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerUnlimited = { 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, /* Use generic outmost tag fetcher */ asn_DEF_CN_IntegerUnlimited_tags_1, sizeof(asn_DEF_CN_IntegerUnlimited_tags_1) @@ -183,6 +186,8 @@ CN_IntegerMinMax_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_INTEGER.xer_encoder; td->uper_decoder = asn_DEF_INTEGER.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_INTEGER.per_constraints; td->elements = asn_DEF_INTEGER.elements; @@ -251,6 +256,7 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerMinMax = { 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, /* Use generic outmost tag fetcher */ asn_DEF_CN_IntegerMinMax_tags_1, sizeof(asn_DEF_CN_IntegerMinMax_tags_1) @@ -331,6 +337,8 @@ CN_IntegerMinLow_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_INTEGER.xer_encoder; td->uper_decoder = asn_DEF_INTEGER.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_INTEGER.per_constraints; td->elements = asn_DEF_INTEGER.elements; @@ -399,6 +407,7 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerMinLow = { 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, /* Use generic outmost tag fetcher */ asn_DEF_CN_IntegerMinLow_tags_1, sizeof(asn_DEF_CN_IntegerMinLow_tags_1) @@ -479,6 +488,8 @@ NO_IntegerMinHigh_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_INTEGER.xer_encoder; td->uper_decoder = asn_DEF_INTEGER.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_INTEGER.per_constraints; td->elements = asn_DEF_INTEGER.elements; @@ -547,6 +558,7 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerMinHigh = { 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, /* Use generic outmost tag fetcher */ asn_DEF_NO_IntegerMinHigh_tags_1, sizeof(asn_DEF_NO_IntegerMinHigh_tags_1) @@ -621,6 +633,8 @@ NO_IntegerLowHigh_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_NativeInteger.xer_encoder; td->uper_decoder = asn_DEF_NativeInteger.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -694,6 +708,7 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerLowHigh = { 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, /* Use generic outmost tag fetcher */ asn_DEF_NO_IntegerLowHigh_tags_1, sizeof(asn_DEF_NO_IntegerLowHigh_tags_1) @@ -774,6 +789,8 @@ CN_IntegerLowMax_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_INTEGER.xer_encoder; td->uper_decoder = asn_DEF_INTEGER.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_INTEGER.per_constraints; td->elements = asn_DEF_INTEGER.elements; @@ -842,6 +859,7 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerLowMax = { 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, /* Use generic outmost tag fetcher */ asn_DEF_CN_IntegerLowMax_tags_1, sizeof(asn_DEF_CN_IntegerLowMax_tags_1) @@ -922,6 +940,8 @@ NO_IntegerHighMax_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_INTEGER.xer_encoder; td->uper_decoder = asn_DEF_INTEGER.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_INTEGER.per_constraints; td->elements = asn_DEF_INTEGER.elements; @@ -990,6 +1010,7 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerHighMax = { 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, /* Use generic outmost tag fetcher */ asn_DEF_NO_IntegerHighMax_tags_1, sizeof(asn_DEF_NO_IntegerHighMax_tags_1) @@ -1070,6 +1091,8 @@ NO_IntegerLowestMax_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_INTEGER.xer_encoder; td->uper_decoder = asn_DEF_INTEGER.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_INTEGER.per_constraints; td->elements = asn_DEF_INTEGER.elements; @@ -1138,6 +1161,7 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerLowestMax = { 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, /* Use generic outmost tag fetcher */ asn_DEF_NO_IntegerLowestMax_tags_1, sizeof(asn_DEF_NO_IntegerLowestMax_tags_1) @@ -1212,6 +1236,8 @@ NO_IntegerOutRange_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_NativeInteger.xer_encoder; td->uper_decoder = asn_DEF_NativeInteger.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -1285,6 +1311,7 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerOutRange = { 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, /* Use generic outmost tag fetcher */ asn_DEF_NO_IntegerOutRange_tags_1, sizeof(asn_DEF_NO_IntegerOutRange_tags_1) @@ -1359,6 +1386,8 @@ NO_IntegerOutValue_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_NativeInteger.xer_encoder; td->uper_decoder = asn_DEF_NativeInteger.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -1432,6 +1461,7 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerOutValue = { 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, /* Use generic outmost tag fetcher */ asn_DEF_NO_IntegerOutValue_tags_1, sizeof(asn_DEF_NO_IntegerOutValue_tags_1) @@ -1506,6 +1536,8 @@ OK_IntegerInRange1_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_NativeInteger.xer_encoder; td->uper_decoder = asn_DEF_NativeInteger.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -1574,6 +1606,7 @@ asn_TYPE_descriptor_t asn_DEF_OK_IntegerInRange1 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_OK_IntegerInRange1_tags_1, sizeof(asn_DEF_OK_IntegerInRange1_tags_1) @@ -1648,6 +1681,8 @@ OK_IntegerInRange2_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_NativeInteger.xer_encoder; td->uper_decoder = asn_DEF_NativeInteger.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -1716,6 +1751,7 @@ asn_TYPE_descriptor_t asn_DEF_OK_IntegerInRange2 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_OK_IntegerInRange2_tags_1, sizeof(asn_DEF_OK_IntegerInRange2_tags_1) @@ -1790,6 +1826,8 @@ OK_IntegerInRange3_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_NativeInteger.xer_encoder; td->uper_decoder = asn_DEF_NativeInteger.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -1858,6 +1896,7 @@ asn_TYPE_descriptor_t asn_DEF_OK_IntegerInRange3 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_OK_IntegerInRange3_tags_1, sizeof(asn_DEF_OK_IntegerInRange3_tags_1) @@ -1932,6 +1971,8 @@ OK_IntegerInRange4_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_NativeInteger.xer_encoder; td->uper_decoder = asn_DEF_NativeInteger.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -2000,6 +2041,7 @@ asn_TYPE_descriptor_t asn_DEF_OK_IntegerInRange4 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_OK_IntegerInRange4_tags_1, sizeof(asn_DEF_OK_IntegerInRange4_tags_1) @@ -2080,6 +2122,8 @@ OK_IntegerInRange5_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_INTEGER.xer_encoder; td->uper_decoder = asn_DEF_INTEGER.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_INTEGER.per_constraints; td->elements = asn_DEF_INTEGER.elements; @@ -2148,6 +2192,7 @@ asn_TYPE_descriptor_t asn_DEF_OK_IntegerInRange5 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_OK_IntegerInRange5_tags_1, sizeof(asn_DEF_OK_IntegerInRange5_tags_1) @@ -2213,6 +2258,8 @@ NO_IntegerInRange6_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_NativeInteger.xer_encoder; td->uper_decoder = asn_DEF_NativeInteger.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -2286,6 +2333,7 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerInRange6 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_NO_IntegerInRange6_tags_1, sizeof(asn_DEF_NO_IntegerInRange6_tags_1) @@ -2350,6 +2398,8 @@ CN_IntegerEnumerated1_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_INTEGER.xer_encoder; td->uper_decoder = asn_DEF_INTEGER.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_INTEGER.per_constraints; td->elements = asn_DEF_INTEGER.elements; @@ -2418,6 +2468,7 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerEnumerated1 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_CN_IntegerEnumerated1_tags_1, sizeof(asn_DEF_CN_IntegerEnumerated1_tags_1) @@ -2482,6 +2533,8 @@ NO_IntegerEnumerated2_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_INTEGER.xer_encoder; td->uper_decoder = asn_DEF_INTEGER.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_INTEGER.per_constraints; td->elements = asn_DEF_INTEGER.elements; @@ -2550,6 +2603,7 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerEnumerated2 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_NO_IntegerEnumerated2_tags_1, sizeof(asn_DEF_NO_IntegerEnumerated2_tags_1) diff --git a/tests/90-cond-int-type-OK.asn1.-Pgen-PER b/tests/90-cond-int-type-OK.asn1.-Pgen-PER index d64160d1..e429279f 100644 --- a/tests/90-cond-int-type-OK.asn1.-Pgen-PER +++ b/tests/90-cond-int-type-OK.asn1.-Pgen-PER @@ -45,6 +45,8 @@ CN_IntegerUnlimited_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_NativeInteger.xer_encoder; td->uper_decoder = asn_DEF_NativeInteger.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -129,6 +131,7 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerUnlimited = { CN_IntegerUnlimited_encode_xer, 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) @@ -201,6 +204,8 @@ CN_IntegerMinMax_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_NativeInteger.xer_encoder; td->uper_decoder = asn_DEF_NativeInteger.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -293,6 +298,7 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerMinMax = { CN_IntegerMinMax_encode_xer, 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) @@ -369,6 +375,8 @@ CN_IntegerMinLow_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_NativeInteger.xer_encoder; td->uper_decoder = asn_DEF_NativeInteger.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -461,6 +469,7 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerMinLow = { CN_IntegerMinLow_encode_xer, 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) @@ -543,6 +552,8 @@ NO_IntegerMinHigh_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_INTEGER.xer_encoder; td->uper_decoder = asn_DEF_INTEGER.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_INTEGER.per_constraints; td->elements = asn_DEF_INTEGER.elements; @@ -635,6 +646,7 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerMinHigh = { NO_IntegerMinHigh_encode_xer, 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) @@ -711,6 +723,8 @@ NO_IntegerLowHigh_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_NativeInteger.xer_encoder; td->uper_decoder = asn_DEF_NativeInteger.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -808,6 +822,7 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerLowHigh = { NO_IntegerLowHigh_encode_xer, 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) @@ -884,6 +899,8 @@ CN_IntegerLowMax_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_NativeInteger.xer_encoder; td->uper_decoder = asn_DEF_NativeInteger.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -976,6 +993,7 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerLowMax = { CN_IntegerLowMax_encode_xer, 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) @@ -1058,6 +1076,8 @@ NO_IntegerHighMax_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_INTEGER.xer_encoder; td->uper_decoder = asn_DEF_INTEGER.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_INTEGER.per_constraints; td->elements = asn_DEF_INTEGER.elements; @@ -1150,6 +1170,7 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerHighMax = { NO_IntegerHighMax_encode_xer, 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) @@ -1232,6 +1253,8 @@ NO_IntegerLowestMax_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_INTEGER.xer_encoder; td->uper_decoder = asn_DEF_INTEGER.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_INTEGER.per_constraints; td->elements = asn_DEF_INTEGER.elements; @@ -1324,6 +1347,7 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerLowestMax = { NO_IntegerLowestMax_encode_xer, 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) @@ -1400,6 +1424,8 @@ NO_IntegerOutRange_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_NativeInteger.xer_encoder; td->uper_decoder = asn_DEF_NativeInteger.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -1497,6 +1523,7 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerOutRange = { NO_IntegerOutRange_encode_xer, 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) @@ -1573,6 +1600,8 @@ NO_IntegerOutValue_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_NativeInteger.xer_encoder; td->uper_decoder = asn_DEF_NativeInteger.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -1670,6 +1699,7 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerOutValue = { NO_IntegerOutValue_encode_xer, 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) @@ -1746,6 +1776,8 @@ OK_IntegerInRange1_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_NativeInteger.xer_encoder; td->uper_decoder = asn_DEF_NativeInteger.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -1838,6 +1870,7 @@ asn_TYPE_descriptor_t asn_DEF_OK_IntegerInRange1 = { OK_IntegerInRange1_encode_xer, 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) @@ -1914,6 +1947,8 @@ OK_IntegerInRange2_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_NativeInteger.xer_encoder; td->uper_decoder = asn_DEF_NativeInteger.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -2006,6 +2041,7 @@ asn_TYPE_descriptor_t asn_DEF_OK_IntegerInRange2 = { OK_IntegerInRange2_encode_xer, 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) @@ -2082,6 +2118,8 @@ OK_IntegerInRange3_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_NativeInteger.xer_encoder; td->uper_decoder = asn_DEF_NativeInteger.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -2174,6 +2212,7 @@ asn_TYPE_descriptor_t asn_DEF_OK_IntegerInRange3 = { OK_IntegerInRange3_encode_xer, 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) @@ -2250,6 +2289,8 @@ OK_IntegerInRange4_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_NativeInteger.xer_encoder; td->uper_decoder = asn_DEF_NativeInteger.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -2342,6 +2383,7 @@ asn_TYPE_descriptor_t asn_DEF_OK_IntegerInRange4 = { OK_IntegerInRange4_encode_xer, 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) @@ -2418,6 +2460,8 @@ OK_IntegerInRange5_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_NativeInteger.xer_encoder; td->uper_decoder = asn_DEF_NativeInteger.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -2510,6 +2554,7 @@ asn_TYPE_descriptor_t asn_DEF_OK_IntegerInRange5 = { OK_IntegerInRange5_encode_xer, 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) @@ -2577,6 +2622,8 @@ NO_IntegerInRange6_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_NativeInteger.xer_encoder; td->uper_decoder = asn_DEF_NativeInteger.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -2674,6 +2721,7 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerInRange6 = { NO_IntegerInRange6_encode_xer, 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) @@ -2740,6 +2788,8 @@ CN_IntegerEnumerated1_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_NativeInteger.xer_encoder; td->uper_decoder = asn_DEF_NativeInteger.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -2824,6 +2874,7 @@ asn_TYPE_descriptor_t asn_DEF_CN_IntegerEnumerated1 = { CN_IntegerEnumerated1_encode_xer, 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) @@ -2890,6 +2941,8 @@ NO_IntegerEnumerated2_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_INTEGER.xer_encoder; td->uper_decoder = asn_DEF_INTEGER.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_INTEGER.per_constraints; td->elements = asn_DEF_INTEGER.elements; @@ -2974,6 +3027,7 @@ asn_TYPE_descriptor_t asn_DEF_NO_IntegerEnumerated2 = { NO_IntegerEnumerated2_encode_xer, 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) diff --git a/tests/91-cond-int-blessSize-OK.asn1.-Pfbless-SIZE b/tests/91-cond-int-blessSize-OK.asn1.-Pfbless-SIZE index 4870f8cd..dddd6c5f 100644 --- a/tests/91-cond-int-blessSize-OK.asn1.-Pfbless-SIZE +++ b/tests/91-cond-int-blessSize-OK.asn1.-Pfbless-SIZE @@ -56,6 +56,8 @@ OK_Integer1_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_NativeInteger.xer_encoder; td->uper_decoder = asn_DEF_NativeInteger.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -124,6 +126,7 @@ asn_TYPE_descriptor_t asn_DEF_OK_Integer1 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_OK_Integer1_tags_1, sizeof(asn_DEF_OK_Integer1_tags_1) @@ -194,6 +197,8 @@ OK_Integer2_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_NativeInteger.xer_encoder; td->uper_decoder = asn_DEF_NativeInteger.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -262,6 +267,7 @@ asn_TYPE_descriptor_t asn_DEF_OK_Integer2 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_OK_Integer2_tags_1, sizeof(asn_DEF_OK_Integer2_tags_1) @@ -332,6 +338,8 @@ OK_Integer3_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_NativeInteger.xer_encoder; td->uper_decoder = asn_DEF_NativeInteger.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -400,6 +408,7 @@ asn_TYPE_descriptor_t asn_DEF_OK_Integer3 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_OK_Integer3_tags_1, sizeof(asn_DEF_OK_Integer3_tags_1) @@ -470,6 +479,8 @@ OK_Integer4_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_NativeInteger.xer_encoder; td->uper_decoder = asn_DEF_NativeInteger.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -538,6 +549,7 @@ asn_TYPE_descriptor_t asn_DEF_OK_Integer4 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_OK_Integer4_tags_1, sizeof(asn_DEF_OK_Integer4_tags_1) @@ -608,6 +620,8 @@ NO_Integer5_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_NativeInteger.xer_encoder; td->uper_decoder = asn_DEF_NativeInteger.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_NativeInteger.per_constraints; td->elements = asn_DEF_NativeInteger.elements; @@ -676,6 +690,7 @@ asn_TYPE_descriptor_t asn_DEF_NO_Integer5 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_NO_Integer5_tags_1, sizeof(asn_DEF_NO_Integer5_tags_1) diff --git a/tests/92-circular-loops-OK.asn1.-Pfindirect-choice b/tests/92-circular-loops-OK.asn1.-Pfindirect-choice index b5de8c4e..cf327980 100644 --- a/tests/92-circular-loops-OK.asn1.-Pfindirect-choice +++ b/tests/92-circular-loops-OK.asn1.-Pfindirect-choice @@ -173,6 +173,7 @@ asn_TYPE_descriptor_t asn_DEF_Everything = { 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, /* Use generic outmost tag fetcher */ asn_DEF_Everything_tags_1, sizeof(asn_DEF_Everything_tags_1) @@ -276,6 +277,7 @@ asn_TYPE_descriptor_t asn_DEF_Choice1 = { 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 */ CHOICE_outmost_tag, 0, /* No effective tags (pointer) */ 0, /* No effective tags (count) */ @@ -379,6 +381,7 @@ asn_TYPE_descriptor_t asn_DEF_Choice2 = { 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 */ CHOICE_outmost_tag, 0, /* No effective tags (pointer) */ 0, /* No effective tags (count) */ @@ -486,6 +489,7 @@ asn_TYPE_descriptor_t asn_DEF_a_2 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_a_tags_2, sizeof(asn_DEF_a_tags_2) @@ -531,6 +535,7 @@ asn_TYPE_descriptor_t asn_DEF_c_5 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_c_tags_5, sizeof(asn_DEF_c_tags_5) @@ -599,6 +604,7 @@ asn_TYPE_descriptor_t asn_DEF_Choice3 = { 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 */ CHOICE_outmost_tag, 0, /* No effective tags (pointer) */ 0, /* No effective tags (count) */ @@ -738,6 +744,7 @@ asn_TYPE_descriptor_t asn_DEF_Member_2 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_Member_tags_2, sizeof(asn_DEF_Member_tags_2) @@ -781,6 +788,7 @@ asn_TYPE_descriptor_t asn_DEF_Set = { 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, /* Use generic outmost tag fetcher */ asn_DEF_Set_tags_1, sizeof(asn_DEF_Set_tags_1) @@ -899,6 +907,7 @@ asn_TYPE_descriptor_t asn_DEF_Sequence = { 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, /* Use generic outmost tag fetcher */ asn_DEF_Sequence_tags_1, sizeof(asn_DEF_Sequence_tags_1) @@ -957,6 +966,8 @@ TypeRef_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_Sequence.xer_encoder; td->uper_decoder = asn_DEF_Sequence.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_Sequence.per_constraints; td->elements = asn_DEF_Sequence.elements; @@ -1025,6 +1036,7 @@ asn_TYPE_descriptor_t asn_DEF_TypeRef = { 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, /* Use generic outmost tag fetcher */ asn_DEF_TypeRef_tags_1, sizeof(asn_DEF_TypeRef_tags_1) @@ -1110,6 +1122,7 @@ asn_TYPE_descriptor_t asn_DEF_b_3 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_b_tags_3, sizeof(asn_DEF_b_tags_3) @@ -1170,6 +1183,7 @@ asn_TYPE_descriptor_t asn_DEF_Alpha = { 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, /* Use generic outmost tag fetcher */ asn_DEF_Alpha_tags_1, sizeof(asn_DEF_Alpha_tags_1) @@ -1261,6 +1275,7 @@ asn_TYPE_descriptor_t asn_DEF_Beta = { 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, /* Use generic outmost tag fetcher */ asn_DEF_Beta_tags_1, sizeof(asn_DEF_Beta_tags_1) @@ -1365,6 +1380,7 @@ asn_TYPE_descriptor_t asn_DEF_Gamma = { 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, /* Use generic outmost tag fetcher */ asn_DEF_Gamma_tags_1, sizeof(asn_DEF_Gamma_tags_1) @@ -1462,6 +1478,7 @@ asn_TYPE_descriptor_t asn_DEF_OneTwo = { 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, /* Use generic outmost tag fetcher */ asn_DEF_OneTwo_tags_1, sizeof(asn_DEF_OneTwo_tags_1) @@ -1559,6 +1576,7 @@ asn_TYPE_descriptor_t asn_DEF_TwoThree = { 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, /* Use generic outmost tag fetcher */ asn_DEF_TwoThree_tags_1, sizeof(asn_DEF_TwoThree_tags_1) @@ -1670,6 +1688,7 @@ asn_TYPE_descriptor_t asn_DEF_ThreeOne = { 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, /* Use generic outmost tag fetcher */ asn_DEF_ThreeOne_tags_1, sizeof(asn_DEF_ThreeOne_tags_1) diff --git a/tests/92-circular-loops-OK.asn1.-Pfwide-types b/tests/92-circular-loops-OK.asn1.-Pfwide-types index a09a655c..000da2cd 100644 --- a/tests/92-circular-loops-OK.asn1.-Pfwide-types +++ b/tests/92-circular-loops-OK.asn1.-Pfwide-types @@ -173,6 +173,7 @@ asn_TYPE_descriptor_t asn_DEF_Everything = { 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, /* Use generic outmost tag fetcher */ asn_DEF_Everything_tags_1, sizeof(asn_DEF_Everything_tags_1) @@ -276,6 +277,7 @@ asn_TYPE_descriptor_t asn_DEF_Choice1 = { 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 */ CHOICE_outmost_tag, 0, /* No effective tags (pointer) */ 0, /* No effective tags (count) */ @@ -378,6 +380,7 @@ asn_TYPE_descriptor_t asn_DEF_Choice2 = { 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 */ CHOICE_outmost_tag, 0, /* No effective tags (pointer) */ 0, /* No effective tags (count) */ @@ -485,6 +488,7 @@ asn_TYPE_descriptor_t asn_DEF_a_2 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_a_tags_2, sizeof(asn_DEF_a_tags_2) @@ -530,6 +534,7 @@ asn_TYPE_descriptor_t asn_DEF_c_5 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_c_tags_5, sizeof(asn_DEF_c_tags_5) @@ -598,6 +603,7 @@ asn_TYPE_descriptor_t asn_DEF_Choice3 = { 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 */ CHOICE_outmost_tag, 0, /* No effective tags (pointer) */ 0, /* No effective tags (count) */ @@ -737,6 +743,7 @@ asn_TYPE_descriptor_t asn_DEF_Member_2 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_Member_tags_2, sizeof(asn_DEF_Member_tags_2) @@ -780,6 +787,7 @@ asn_TYPE_descriptor_t asn_DEF_Set = { 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, /* Use generic outmost tag fetcher */ asn_DEF_Set_tags_1, sizeof(asn_DEF_Set_tags_1) @@ -898,6 +906,7 @@ asn_TYPE_descriptor_t asn_DEF_Sequence = { 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, /* Use generic outmost tag fetcher */ asn_DEF_Sequence_tags_1, sizeof(asn_DEF_Sequence_tags_1) @@ -956,6 +965,8 @@ TypeRef_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->xer_encoder = asn_DEF_Sequence.xer_encoder; td->uper_decoder = asn_DEF_Sequence.uper_decoder; 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->per_constraints) td->per_constraints = asn_DEF_Sequence.per_constraints; td->elements = asn_DEF_Sequence.elements; @@ -1024,6 +1035,7 @@ asn_TYPE_descriptor_t asn_DEF_TypeRef = { 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, /* Use generic outmost tag fetcher */ asn_DEF_TypeRef_tags_1, sizeof(asn_DEF_TypeRef_tags_1) @@ -1109,6 +1121,7 @@ asn_TYPE_descriptor_t asn_DEF_b_3 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_b_tags_3, sizeof(asn_DEF_b_tags_3) @@ -1169,6 +1182,7 @@ asn_TYPE_descriptor_t asn_DEF_Alpha = { 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, /* Use generic outmost tag fetcher */ asn_DEF_Alpha_tags_1, sizeof(asn_DEF_Alpha_tags_1) @@ -1260,6 +1274,7 @@ asn_TYPE_descriptor_t asn_DEF_Beta = { 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, /* Use generic outmost tag fetcher */ asn_DEF_Beta_tags_1, sizeof(asn_DEF_Beta_tags_1) @@ -1364,6 +1379,7 @@ asn_TYPE_descriptor_t asn_DEF_Gamma = { 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, /* Use generic outmost tag fetcher */ asn_DEF_Gamma_tags_1, sizeof(asn_DEF_Gamma_tags_1) @@ -1461,6 +1477,7 @@ asn_TYPE_descriptor_t asn_DEF_OneTwo = { 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, /* Use generic outmost tag fetcher */ asn_DEF_OneTwo_tags_1, sizeof(asn_DEF_OneTwo_tags_1) @@ -1558,6 +1575,7 @@ asn_TYPE_descriptor_t asn_DEF_TwoThree = { 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, /* Use generic outmost tag fetcher */ asn_DEF_TwoThree_tags_1, sizeof(asn_DEF_TwoThree_tags_1) @@ -1669,6 +1687,7 @@ asn_TYPE_descriptor_t asn_DEF_ThreeOne = { 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, /* Use generic outmost tag fetcher */ asn_DEF_ThreeOne_tags_1, sizeof(asn_DEF_ThreeOne_tags_1) diff --git a/tests/93-asn1c-controls-OK.asn1.-Pfwide-types b/tests/93-asn1c-controls-OK.asn1.-Pfwide-types index 98bfbf25..b99a5d5d 100644 --- a/tests/93-asn1c-controls-OK.asn1.-Pfwide-types +++ b/tests/93-asn1c-controls-OK.asn1.-Pfwide-types @@ -67,6 +67,7 @@ asn_TYPE_descriptor_t asn_DEF_Sequence = { 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, /* Use generic outmost tag fetcher */ asn_DEF_Sequence_tags_1, sizeof(asn_DEF_Sequence_tags_1) @@ -177,6 +178,7 @@ asn_TYPE_descriptor_t asn_DEF_Set = { 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, /* Use generic outmost tag fetcher */ asn_DEF_Set_tags_1, sizeof(asn_DEF_Set_tags_1) @@ -273,6 +275,7 @@ asn_TYPE_descriptor_t asn_DEF_setof_2 = { 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, /* Use generic outmost tag fetcher */ asn_DEF_setof_tags_2, sizeof(asn_DEF_setof_tags_2) @@ -341,6 +344,7 @@ asn_TYPE_descriptor_t asn_DEF_Choice = { 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 */ CHOICE_outmost_tag, 0, /* No effective tags (pointer) */ 0, /* No effective tags (count) */ diff --git a/tests/94-set-optionals-OK.asn1.-P b/tests/94-set-optionals-OK.asn1.-P index 3d13658a..1280e69a 100644 --- a/tests/94-set-optionals-OK.asn1.-P +++ b/tests/94-set-optionals-OK.asn1.-P @@ -188,6 +188,7 @@ asn_TYPE_descriptor_t asn_DEF_TestSet = { 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, /* Use generic outmost tag fetcher */ asn_DEF_TestSet_tags_1, sizeof(asn_DEF_TestSet_tags_1) diff --git a/tests/95-choice-per-order-OK.asn1.-Pfwide-types b/tests/95-choice-per-order-OK.asn1.-Pfwide-types index c4c2d6bb..95af883b 100644 --- a/tests/95-choice-per-order-OK.asn1.-Pfwide-types +++ b/tests/95-choice-per-order-OK.asn1.-Pfwide-types @@ -104,6 +104,7 @@ asn_TYPE_descriptor_t asn_DEF_ch_4 = { 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 */ CHOICE_outmost_tag, 0, /* No effective tags (pointer) */ 0, /* No effective tags (count) */ @@ -181,6 +182,7 @@ asn_TYPE_descriptor_t asn_DEF_Choice = { 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 */ CHOICE_outmost_tag, 0, /* No effective tags (pointer) */ 0, /* No effective tags (count) */ @@ -271,6 +273,7 @@ asn_TYPE_descriptor_t asn_DEF_Choice2 = { 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 */ CHOICE_outmost_tag, 0, /* No effective tags (pointer) */ 0, /* No effective tags (count) */ diff --git a/tests/95-choice-per-order-OK.asn1.-Pgen-PER b/tests/95-choice-per-order-OK.asn1.-Pgen-PER index c658e4c3..5a30ea22 100644 --- a/tests/95-choice-per-order-OK.asn1.-Pgen-PER +++ b/tests/95-choice-per-order-OK.asn1.-Pgen-PER @@ -119,6 +119,7 @@ asn_TYPE_descriptor_t asn_DEF_ch_4 = { CHOICE_encode_xer, 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) */ @@ -198,6 +199,7 @@ asn_TYPE_descriptor_t asn_DEF_Choice = { CHOICE_encode_xer, 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) */ @@ -297,6 +299,7 @@ asn_TYPE_descriptor_t asn_DEF_Choice2 = { CHOICE_encode_xer, 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) */ diff --git a/tests/98-attribute-class-OK.asn1.-P b/tests/98-attribute-class-OK.asn1.-P index cf2f5b79..7203b828 100644 --- a/tests/98-attribute-class-OK.asn1.-P +++ b/tests/98-attribute-class-OK.asn1.-P @@ -90,6 +90,7 @@ asn_TYPE_descriptor_t asn_DEF_Attribute = { 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, /* Use generic outmost tag fetcher */ asn_DEF_Attribute_tags_1, sizeof(asn_DEF_Attribute_tags_1) |