Merge pull request #144 from v0-e/jer-decoder

JER decoder
mouse07410 · Nov 29, 2023 · 3751425 · 3751425
2 parents 23e6769 + 47c81e8
commit 3751425
Show file tree

Hide file tree

Showing 97 changed files with 3,543 additions and 6 deletions.
diff --git a/asn1-tools/unber/libasn1_unber_tool.c b/asn1-tools/unber/libasn1_unber_tool.c
@@ -53,6 +53,7 @@
 #include <RELATIVE-OID_rfill.c>
 #include <asn_codecs_prim.c>
 #include <asn_codecs_prim_ber.c>
+#include <asn_codecs_prim_jer.c>
 #include <asn_codecs_prim_xer.c>
 #include <asn1p_integer.c>
 #include <asn_internal.c>
@@ -824,13 +825,40 @@ xer_decode_general(const asn_codec_ctx_t *opt_codec_ctx, asn_struct_ctx_t *ctx,
     return rv;
 }
 
+asn_dec_rval_t
+jer_decode_general(const asn_codec_ctx_t *opt_codec_ctx, asn_struct_ctx_t *ctx,
+                   void *struct_key, const char *json_key, const void *buf_ptr,
+                   size_t size,
+                   int (*otd)(void *struct_key, const void *chunk_buf,
+                              size_t chunk_size),
+                   ssize_t (*br)(void *struct_key, const void *chunk_buf,
+                                 size_t chunk_size, int have_more)) {
+    asn_dec_rval_t rv = {0, 0};
+    (void)opt_codec_ctx;
+    (void)ctx;
+    (void)struct_key;
+    (void)json_key;
+    (void)buf_ptr;
+    (void)size;
+    (void)otd;
+    (void)br;
+    return rv;
+}
+
 size_t
 xer_whitespace_span(const void *chunk_buf, size_t chunk_size) {
     (void)chunk_buf;
     (void)chunk_size;
     return 0;
 }
 
+size_t
+jer_whitespace_span(const void *chunk_buf, size_t chunk_size) {
+    (void)chunk_buf;
+    (void)chunk_size;
+    return 0;
+}
+
 int
 OCTET_STRING_compare(const asn_TYPE_descriptor_t *td, const void *a,
                      const void *b) {

diff --git a/skeletons/ANY.c b/skeletons/ANY.c
@@ -33,9 +33,11 @@ asn_TYPE_operation_t asn_OP_ANY = {
     0,
 #endif  /* !defined(ASN_DISABLE_XER_SUPPORT) */
 #if !defined(ASN_DISABLE_JER_SUPPORT)
+    OCTET_STRING_decode_jer_hex,
     ANY_encode_jer,
 #else
     0,
+    0,
 #endif  /* !defined(ASN_DISABLE_JER_SUPPORT) */
 #if !defined(ASN_DISABLE_OER_SUPPORT)
     0,

diff --git a/skeletons/ANY.h b/skeletons/ANY.h
@@ -43,6 +43,7 @@ xer_type_encoder_f ANY_encode_xer;
 #endif  /* !defined(ASN_DISABLE_XER_SUPPORT) */
 
 #if !defined(ASN_DISABLE_JER_SUPPORT)
+jer_type_decoder_f ANY_decode_jer;
 jer_type_encoder_f ANY_encode_jer;
 #endif  /* !defined(ASN_DISABLE_JER_SUPPORT) */
 

diff --git a/skeletons/BIT_STRING.c b/skeletons/BIT_STRING.c
@@ -39,9 +39,11 @@ asn_TYPE_operation_t asn_OP_BIT_STRING = {
     0,
 #endif  /* !defined(ASN_DISABLE_XER_SUPPORT) */
 #if !defined(ASN_DISABLE_JER_SUPPORT)
+    OCTET_STRING_decode_jer_hex,
     BIT_STRING_encode_jer,
 #else
     0,
+    0,
 #endif  /* !defined(ASN_DISABLE_JER_SUPPORT) */
 #if !defined(ASN_DISABLE_OER_SUPPORT)
     BIT_STRING_decode_oer,

diff --git a/skeletons/BIT_STRING.h b/skeletons/BIT_STRING.h
@@ -45,6 +45,7 @@ xer_type_encoder_f BIT_STRING_encode_xer;
 #endif  /* !defined(ASN_DISABLE_XER_SUPPORT) */
 
 #if !defined(ASN_DISABLE_JER_SUPPORT)
+#define BIT_STRING_decode_jer OCTET_STRING_decode_jer_binary
 jer_type_encoder_f BIT_STRING_encode_jer;
 #endif  /* !defined(ASN_DISABLE_JER_SUPPORT) */
 

diff --git a/skeletons/BMPString.c b/skeletons/BMPString.c
@@ -47,9 +47,11 @@ asn_TYPE_operation_t asn_OP_BMPString = {
     0,
 #endif  /* !defined(ASN_DISABLE_XER_SUPPORT) */
 #if !defined(ASN_DISABLE_JER_SUPPORT)
+    BMPString_decode_jer,  /* Convert to UTF-8 */
     BMPString_encode_jer,  /* Convert to UTF-8 */
 #else
     0,
+    0,
 #endif  /* !defined(ASN_DISABLE_JER_SUPPORT) */
 #if !defined(ASN_DISABLE_OER_SUPPORT)
     OCTET_STRING_decode_oer,

diff --git a/skeletons/BMPString.h b/skeletons/BMPString.h
@@ -42,6 +42,7 @@ xer_type_encoder_f BMPString_encode_xer;
 #endif  /* !defined(ASN_DISABLE_XER_SUPPORT) */
 
 #if !defined(ASN_DISABLE_JER_SUPPORT)
+jer_type_decoder_f BMPString_decode_jer;
 jer_type_encoder_f BMPString_encode_jer;
 #endif  /* !defined(ASN_DISABLE_JER_SUPPORT) */
 

diff --git a/skeletons/BMPString_jer.c b/skeletons/BMPString_jer.c
@@ -7,6 +7,71 @@
 #include <BMPString.h>
 #include <UTF8String.h>
 
+asn_dec_rval_t
+BMPString_decode_jer(const asn_codec_ctx_t *opt_codec_ctx,
+                     const asn_TYPE_descriptor_t *td, void **sptr,
+                     const char *opt_mname, const void *buf_ptr, size_t size) {
+    asn_dec_rval_t rc;
+
+    rc = OCTET_STRING_decode_jer_utf8(opt_codec_ctx, td, sptr, opt_mname,
+        buf_ptr, size);
+    if(rc.code == RC_OK) {
+        /*
+         * Now we have a whole string in UTF-8 format.
+         * Convert it into UCS-2.
+         */
+        uint32_t *wcs;
+        size_t wcs_len;
+        UTF8String_t *st;
+
+        assert(*sptr);
+        st = (UTF8String_t *)*sptr;
+        assert(st->buf);
+        wcs_len = UTF8String_to_wcs(st, 0, 0);
+
+        wcs = (uint32_t *)MALLOC(4 * (wcs_len + 1));
+        if(wcs == 0 || UTF8String_to_wcs(st, wcs, wcs_len) != wcs_len) {
+            rc.code = RC_FAIL;
+            rc.consumed = 0;
+            return rc;
+        } else {
+            wcs[wcs_len] = 0;  /* nul-terminate */
+        }
+
+        if(1) {
+            /* Swap byte order and trim encoding to 2 bytes */
+            uint32_t *wc = wcs;
+            uint32_t *wc_end = wcs + wcs_len;
+            uint16_t *dstwc = (uint16_t *)wcs;
+            for(; wc < wc_end; wc++, dstwc++) {
+                uint32_t wch = *wc;
+                if(wch > 0xffff) {
+                    FREEMEM(wcs);
+                    rc.code = RC_FAIL;
+                    rc.consumed = 0;
+                    return rc;
+                }
+                *((uint8_t *)dstwc + 0) = wch >> 8;
+                *((uint8_t *)dstwc + 1) = wch;
+            }
+            dstwc = (uint16_t *)REALLOC(wcs, 2 * (wcs_len + 1));
+            if(!dstwc) {
+                FREEMEM(wcs);
+                rc.code = RC_FAIL;
+                rc.consumed = 0;
+                return rc;
+            } else {
+                dstwc[wcs_len] = 0;  /* nul-terminate */
+                wcs = (uint32_t *)(void *)dstwc;  /* Alignment OK */
+            }
+        }
+
+        FREEMEM(st->buf);
+        st->buf = (uint8_t *)wcs;
+        st->size = 2 * wcs_len;
+    }
+    return rc;
+}
 
 asn_enc_rval_t
 BMPString_encode_jer(const asn_TYPE_descriptor_t *td, const void *sptr,

diff --git a/skeletons/BOOLEAN.c b/skeletons/BOOLEAN.c
@@ -34,9 +34,11 @@ asn_TYPE_operation_t asn_OP_BOOLEAN = {
     0,
 #endif  /* !defined(ASN_DISABLE_XER_SUPPORT) */
 #if !defined(ASN_DISABLE_JER_SUPPORT)
+    BOOLEAN_decode_jer,
     BOOLEAN_encode_jer,
 #else
     0,
+    0,
 #endif  /* !defined(ASN_DISABLE_JER_SUPPORT) */
 #if !defined(ASN_DISABLE_OER_SUPPORT)
     BOOLEAN_decode_oer,

diff --git a/skeletons/BOOLEAN.h b/skeletons/BOOLEAN.h
@@ -42,6 +42,7 @@ xer_type_encoder_f BOOLEAN_encode_xer;
 #endif  /* !defined(ASN_DISABLE_XER_SUPPORT) */
 
 #if !defined(ASN_DISABLE_JER_SUPPORT)
+jer_type_decoder_f BOOLEAN_decode_jer;
 jer_type_encoder_f BOOLEAN_encode_jer;
 #endif  /* !defined(ASN_DISABLE_JER_SUPPORT) */
 

diff --git a/skeletons/BOOLEAN_jer.c b/skeletons/BOOLEAN_jer.c
@@ -8,6 +8,39 @@
 #include <BOOLEAN.h>
 #include <errno.h>
 
+/*
+ * Decode the chunk of JSON text encoding INTEGER.
+ */
+static enum jer_pbd_rval
+BOOLEAN__jer_body_decode(const asn_TYPE_descriptor_t *td, void *sptr,
+                         const void *chunk_buf, size_t chunk_size) {
+    BOOLEAN_t *st = (BOOLEAN_t *)sptr;
+    const char *p = (const char *)chunk_buf;
+
+    (void)td;
+
+    if(p[0] == 't' /* 'true' */) {
+        *st = 1;
+        return JPBD_BODY_CONSUMED;
+    } else if (p[0] == 'f' /* 'false' */) {
+        *st = 0;
+        return JPBD_BODY_CONSUMED;
+    } else {
+        return JPBD_BROKEN_ENCODING;
+    }
+}
+
+
+asn_dec_rval_t
+BOOLEAN_decode_jer(const asn_codec_ctx_t *opt_codec_ctx,
+                   const asn_TYPE_descriptor_t *td, void **sptr,
+                   const char *opt_mname, const void *buf_ptr, size_t size) {
+    return jer_decode_primitive(opt_codec_ctx, td,
+                                sptr, sizeof(BOOLEAN_t), opt_mname, buf_ptr, size,
+                                BOOLEAN__jer_body_decode);
+}
+
+
 asn_enc_rval_t
 BOOLEAN_encode_jer(const asn_TYPE_descriptor_t *td, const void *sptr,
                    int ilevel, enum jer_encoder_flags_e flags,

diff --git a/skeletons/ENUMERATED.c b/skeletons/ENUMERATED.c
@@ -35,9 +35,11 @@ asn_TYPE_operation_t asn_OP_ENUMERATED = {
     0,
 #endif  /* !defined(ASN_DISABLE_XER_SUPPORT) */
 #if !defined(ASN_DISABLE_JER_SUPPORT)
+    INTEGER_decode_jer,
     INTEGER_encode_jer,
 #else
     0,
+    0,
 #endif  /* !defined(ASN_DISABLE_JER_SUPPORT) */
 #if !defined(ASN_DISABLE_OER_SUPPORT)
     ENUMERATED_decode_oer,

diff --git a/skeletons/ENUMERATED.h b/skeletons/ENUMERATED.h
@@ -37,6 +37,7 @@ extern asn_TYPE_operation_t asn_OP_ENUMERATED;
 #endif  /* !defined(ASN_DISABLE_XER_SUPPORT) */
 
 #if !defined(ASN_DISABLE_JER_SUPPORT)
+#define ENUMERATED_decode_jer INTEGER_decode_jer
 #define ENUMERATED_encode_jer INTEGER_encode_jer
 #endif  /* !defined(ASN_DISABLE_JER_SUPPORT) */
 

diff --git a/skeletons/GeneralString.c b/skeletons/GeneralString.c
@@ -35,9 +35,11 @@ asn_TYPE_operation_t asn_OP_GeneralString = {
     0,
 #endif  /* !defined(ASN_DISABLE_XER_SUPPORT) */
 #if !defined(ASN_DISABLE_JER_SUPPORT)
+    OCTET_STRING_decode_jer_hex,
     OCTET_STRING_encode_jer,
 #else
     0,
+    0,
 #endif  /* !defined(ASN_DISABLE_JER_SUPPORT) */
 #if !defined(ASN_DISABLE_OER_SUPPORT)
     OCTET_STRING_decode_oer,

diff --git a/skeletons/GeneralString.h b/skeletons/GeneralString.h
@@ -37,6 +37,7 @@ extern asn_TYPE_operation_t asn_OP_GeneralString;
 #endif  /* !defined(ASN_DISABLE_XER_SUPPORT) */
 
 #if !defined(ASN_DISABLE_JER_SUPPORT)
+#define GeneralString_decode_jer OCTET_STRING_decode_jer_hex
 #define GeneralString_encode_jer OCTET_STRING_encode_jer
 #endif  /* !defined(ASN_DISABLE_JER_SUPPORT) */
 

diff --git a/skeletons/GeneralizedTime.c b/skeletons/GeneralizedTime.c
@@ -197,9 +197,11 @@ asn_TYPE_operation_t asn_OP_GeneralizedTime = {
     0,
 #endif  /* !defined(ASN_DISABLE_XER_SUPPORT) */
 #if !defined(ASN_DISABLE_JER_SUPPORT)
+    OCTET_STRING_decode_jer_utf8,
     GeneralizedTime_encode_jer,
 #else
     0,
+    0,
 #endif  /* !defined(ASN_DISABLE_JER_SUPPORT) */
 #if !defined(ASN_DISABLE_OER_SUPPORT)
     OCTET_STRING_decode_oer,

diff --git a/skeletons/GeneralizedTime.h b/skeletons/GeneralizedTime.h
@@ -37,6 +37,7 @@ xer_type_encoder_f GeneralizedTime_encode_xer;
 #endif  /* !defined(ASN_DISABLE_XER_SUPPORT) */
 
 #if !defined(ASN_DISABLE_JER_SUPPORT)
+#define GeneralizedTime_decode_jer OCTET_STRING_decode_jer_utf8
 jer_type_encoder_f GeneralizedTime_encode_jer;
 #endif  /* !defined(ASN_DISABLE_JER_SUPPORT) */
 

diff --git a/skeletons/GraphicString.c b/skeletons/GraphicString.c
@@ -35,6 +35,7 @@ asn_TYPE_operation_t asn_OP_GraphicString = {
     0,
 #endif  /* !defined(ASN_DISABLE_XER_SUPPORT) */
 #if !defined(ASN_DISABLE_JER_SUPPORT)
+    OCTET_STRING_decode_jer_hex,
     OCTET_STRING_encode_jer,  /* Can't expect it to be ASCII/UTF8 */
 #else
     0,

diff --git a/skeletons/GraphicString.h b/skeletons/GraphicString.h
@@ -37,6 +37,7 @@ extern asn_TYPE_operation_t asn_OP_GraphicString;
 #endif  /* !defined(ASN_DISABLE_XER_SUPPORT) */
 
 #if !defined(ASN_DISABLE_JER_SUPPORT)
+#define GraphicString_decode_jer OCTET_STRING_decode_jer
 #define GraphicString_encode_jer OCTET_STRING_encode_jer
 #endif  /* !defined(ASN_DISABLE_JER_SUPPORT) */
 

diff --git a/skeletons/IA5String.c b/skeletons/IA5String.c
@@ -42,9 +42,11 @@ asn_TYPE_operation_t asn_OP_IA5String = {
     0,
 #endif  /* !defined(ASN_DISABLE_JER_SUPPORT) */
 #if !defined(ASN_DISABLE_JER_SUPPORT)
+    OCTET_STRING_decode_jer_utf8,
     OCTET_STRING_encode_jer_utf8,
 #else
     0,
+    0,
 #endif  /* !defined(ASN_DISABLE_JER_SUPPORT) */
 #if !defined(ASN_DISABLE_OER_SUPPORT)
     OCTET_STRING_decode_oer,

diff --git a/skeletons/IA5String.h b/skeletons/IA5String.h
@@ -40,6 +40,7 @@ asn_constr_check_f IA5String_constraint;
 #endif  /* !defined(ASN_DISABLE_XER_SUPPORT) */
 
 #if !defined(ASN_DISABLE_JER_SUPPORT)
+#define IA5String_decode_jer OCTET_STRING_decode_jer_utf8
 #define IA5String_encode_jer OCTET_STRING_encode_jer_utf8
 #endif  /* !defined(ASN_DISABLE_JER_SUPPORT) */
 

diff --git a/skeletons/INTEGER.c b/skeletons/INTEGER.c
@@ -37,9 +37,11 @@ asn_TYPE_operation_t asn_OP_INTEGER = {
     0,
 #endif  /* !defined(ASN_DISABLE_XER_SUPPORT) */
 #if !defined(ASN_DISABLE_JER_SUPPORT)
+    INTEGER_decode_jer,
     INTEGER_encode_jer,
 #else
     0,
+    0,
 #endif  /* !defined(ASN_DISABLE_JER_SUPPORT) */
 #if !defined(ASN_DISABLE_OER_SUPPORT)
     INTEGER_decode_oer,  /* OER decoder */

diff --git a/skeletons/INTEGER.h b/skeletons/INTEGER.h
@@ -61,6 +61,7 @@ xer_type_encoder_f INTEGER_encode_xer;
 #endif  /* !defined(ASN_DISABLE_XER_SUPPORT) */
 
 #if !defined(ASN_DISABLE_JER_SUPPORT)
+jer_type_decoder_f INTEGER_decode_jer;
 jer_type_encoder_f INTEGER_encode_jer;
 #endif  /* !defined(ASN_DISABLE_JER_SUPPORT) */