Osmocom Open Build Service

osmo-cbc.spec Changed

@@ -17,14 +17,14 @@
 %define _lto_cflags %{nil}
 
 Name:           osmo-cbc
-Requires: osmocom-nightly = 202403252026
-Version: 0.4.2.3.da8b.202403252026
+Requires: osmocom-nightly = 202403262026
+Version: 0.4.2.4.538b.202403262026
 Release:        0
 Summary:        OsmoCBC: Osmocom's Cell Broadcast Centre for 3GPP mobile networks
 License:        AGPL-3.0-or-later
 Group:          Hardware/Mobile
 URL:            https://osmocom.org/projects/osmo-cbc
-Source: osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz
+Source: osmo-cbc_0.4.2.4.538b.202403262026.tar.gz
 Source1: rpmlintrc
 BuildRequires:  automake >= 1.9
 BuildRequires:  libtool >= 2
@@ -45,7 +45,7 @@
 OsmoCBC: Osmocom's Cell Broadcast Centre for 3GPP mobile networks.
 
 %package utils
-Requires: osmocom-nightly = 202403252026
+Requires: osmocom-nightly = 202403262026
 Summary:	CLI utility to interface osmo-cbc REST interface
 License:	MIT
 Group:		Productivity/Telephony/Utilities
@@ -54,7 +54,7 @@
 CLI utility to interface with the osmo-cbc REST interface (ECBE).
 
 %package -n libosmo-sbcap0
-Requires: osmocom-nightly = 202403252026
+Requires: osmocom-nightly = 202403262026
 Summary:	Osmocom's library to encode/decode SBc-AP messages
 Group:          System/Libraries
 
@@ -62,7 +62,7 @@
 Osmocom's library to encode/decode SBc-AP messages.
 
 %package -n libosmo-sbcap-devel
-Requires: osmocom-nightly = 202403252026
+Requires: osmocom-nightly = 202403262026
 Summary:        Development files for libosmo-sbcap
 Group:          Development/Libraries/C and C++
 Requires:       libosmo-sbcap0 = %{version}

osmo-cbc_0.4.2.3.da8b.202403252026.dsc -> osmo-cbc_0.4.2.4.538b.202403262026.dsc Changed

@@ -2,7 +2,7 @@
 Source: osmo-cbc
 Binary: osmo-cbc, osmo-cbc-utils, osmo-cbc-dbg, osmo-cbc-doc, libosmo-sbcap0, libosmo-sbcap-dev
 Architecture: any all
-Version: 0.4.2.3.da8b.202403252026
+Version: 0.4.2.4.538b.202403262026
 Maintainer: Osmocom team <openbsc@lists.osmocom.org>
 Homepage: https://projects.osmocom.org/projects/osmo-cbc
 Standards-Version: 3.9.8
@@ -17,8 +17,8 @@
  osmo-cbc-doc deb doc optional arch=all
  osmo-cbc-utils deb net extra arch=any
 Checksums-Sha1:
- 012a818a0ef963784f040af4658f4535f3102d4c 1077636 osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz
+ 9afd64d8cac384d5b82b28ca4f9a419dc59e7036 1082592 osmo-cbc_0.4.2.4.538b.202403262026.tar.gz
 Checksums-Sha256:
- 79fa54c7fad75c66f95fc747b2fe63ecab21e3e5698e901d7cabd35564e8ccb3 1077636 osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz
+ 74537822885c2c69b8c64ce27509e0da513968f59171dadb1854d3282b4cbff5 1082592 osmo-cbc_0.4.2.4.538b.202403262026.tar.gz
 Files:
- 62c68622f77fdf93af4c60e827d7ea3b 1077636 osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz
+ 08e26cd52d6efd824f64cddd7a7ac1ed 1082592 osmo-cbc_0.4.2.4.538b.202403262026.tar.gz

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/.git/HEAD -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/.git/HEAD Changed

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/.git/ORIG_HEAD -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/.git/ORIG_HEAD Changed

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/.git/index -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/.git/index Changed

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/.git/logs/HEAD -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/.git/logs/HEAD Changed

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/.git/logs/refs/heads/master -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/.git/logs/refs/heads/master Changed

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/.git/logs/refs/remotes/origin/HEAD -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/.git/logs/refs/remotes/origin/HEAD Changed

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/.git/packed-refs -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/.git/packed-refs Changed

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/.git/refs/heads/master -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/.git/refs/heads/master Changed

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/.tarball-version -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/.tarball-version Changed

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/contrib/osmo-cbc.spec.in -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/contrib/osmo-cbc.spec.in Changed

@@ -17,7 +17,7 @@
 %define _lto_cflags %{nil}
 
 Name:           osmo-cbc
-Requires: osmocom-nightly = 202403252026
+Requires: osmocom-nightly = 202403262026
 Version:        @VERSION@
 Release:        0
 Summary:        OsmoCBC: Osmocom's Cell Broadcast Centre for 3GPP mobile networks
@@ -44,7 +44,7 @@
 OsmoCBC: Osmocom's Cell Broadcast Centre for 3GPP mobile networks.
 
 %package utils
-Requires: osmocom-nightly = 202403252026
+Requires: osmocom-nightly = 202403262026
 Summary:	CLI utility to interface osmo-cbc REST interface
 License:	MIT
 Group:		Productivity/Telephony/Utilities
@@ -53,7 +53,7 @@
 CLI utility to interface with the osmo-cbc REST interface (ECBE).
 
 %package -n libosmo-sbcap0
-Requires: osmocom-nightly = 202403252026
+Requires: osmocom-nightly = 202403262026
 Summary:	Osmocom's library to encode/decode SBc-AP messages
 Group:          System/Libraries
 
@@ -61,7 +61,7 @@
 Osmocom's library to encode/decode SBc-AP messages.
 
 %package -n libosmo-sbcap-devel
-Requires: osmocom-nightly = 202403252026
+Requires: osmocom-nightly = 202403262026
 Summary:        Development files for libosmo-sbcap
 Group:          Development/Libraries/C and C++
 Requires:       libosmo-sbcap0 = %{version}

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/debian/changelog -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/debian/changelog Changed

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/debian/control -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/debian/control Changed

@@ -25,27 +25,27 @@
 Package: osmo-cbc
 Architecture: any
 Multi-Arch: foreign
-Depends: osmocom-nightly (= 202403252026), ${misc:Depends}, ${shlibs:Depends}
+Depends: osmocom-nightly (= 202403262026), ${misc:Depends}, ${shlibs:Depends}
 Description: OsmoCBC: Osmocom's Cell Broadcast Center
 
 Package: osmo-cbc-utils
 Architecture: any
 Multi-Arch: foreign
-Depends: osmocom-nightly (= 202403252026), ${misc:Depends}, ${shlibs:Depends}, python3
+Depends: osmocom-nightly (= 202403262026), ${misc:Depends}, ${shlibs:Depends}, python3
 Description: Utilities for OsmoCBC: Osmocom's Cell Broadcast Center
 
 Package: osmo-cbc-dbg
 Section: debug
 Architecture: any
 Multi-Arch: same
-Depends: osmocom-nightly (= 202403252026), osmo-cbc (= ${binary:Version}), ${misc:Depends}
+Depends: osmocom-nightly (= 202403262026), osmo-cbc (= ${binary:Version}), ${misc:Depends}
 Description: OsmoCBC: Osmocom's Cell Broadcast Center
 
 Package: osmo-cbc-doc
 Architecture: all
 Section: doc
 Priority: optional
-Depends: osmocom-nightly (= 202403252026), ${misc:Depends}
+Depends: osmocom-nightly (= 202403262026), ${misc:Depends}
 Description: ${misc:Package} PDF documentation
  Various manuals: user manual, VTY reference manual and/or
  protocol/interface manuals.
@@ -55,12 +55,12 @@
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: osmocom-nightly (= 202403252026), ${misc:Depends}, ${shlibs:Depends}
+Depends: osmocom-nightly (= 202403262026), ${misc:Depends}, ${shlibs:Depends}
 Description: libosmo-sbcap: Osmocom's library to encode/decode SBc-AP messages
 
 Package: libosmo-sbcap-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: osmocom-nightly (= 202403252026), libosmo-sbcap0 (= ${binary:Version}), ${misc:Depends}
+Depends: osmocom-nightly (= 202403262026), libosmo-sbcap0 (= ${binary:Version}), ${misc:Depends}
 Description: libosmo-sbcap: Osmocom's library to encode/decode SBc-AP messages

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/src/sbcap/Makefile.am -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/Makefile.am Changed

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/src/sbcap/gen/ANY.c -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/gen/ANY.c Changed

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/src/sbcap/gen/BIT_STRING.c -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/gen/BIT_STRING.c Changed

@@ -24,6 +24,7 @@
     0,
 #endif  /* !defined(ASN_DISABLE_PRINT_SUPPORT) */
     BIT_STRING_compare,
+    BIT_STRING_copy,
 #if !defined(ASN_DISABLE_BER_SUPPORT)
     OCTET_STRING_decode_ber,   /* Implemented in terms of OCTET STRING */
     OCTET_STRING_encode_der,   /* Implemented in terms of OCTET STRING */
@@ -39,9 +40,11 @@
     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,
@@ -211,3 +214,37 @@
         return 1;
     }
 }
+
+int
+BIT_STRING_copy(const asn_TYPE_descriptor_t *td, void **aptr,
+                const void *bptr) {
+    const asn_OCTET_STRING_specifics_t *specs = td->specifics;
+    BIT_STRING_t *a = (BIT_STRING_t *)*aptr;
+    const BIT_STRING_t *b = (const BIT_STRING_t *)bptr;
+
+    if(!b) {
+        if(a) {
+            FREEMEM(a->buf);
+            FREEMEM(a);
+            *aptr = 0;
+        }
+        return 0;
+    }
+
+    if(!a) {
+        a = *aptr = CALLOC(1, specs->struct_size);
+        if(!a) return -1;
+    }
+
+    uint8_t* buf = MALLOC(b->size + 1);
+    if(!buf) return -1;
+    memcpy(buf, b->buf, b->size);
+    bufb->size = 0;
+
+    FREEMEM(a->buf);
+    a->buf = buf;
+    a->size = b->size;
+    a->bits_unused = b->bits_unused;
+
+    return 0;
+}

osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/gen/ENUMERATED.c Added

@@ -0,0 +1,92 @@
+/*-
+ * Copyright (c) 2003, 2005, 2006 Lev Walkin <vlm@lionet.info>.
+ * All rights reserved.
+ * Redistribution and modifications are permitted subject to BSD license.
+ */
+#include <asn_internal.h>
+#include <ENUMERATED.h>
+
+/*
+ * ENUMERATED basic type description.
+ */
+static const ber_tlv_tag_t asn_DEF_ENUMERATED_tags = {
+    (ASN_TAG_CLASS_UNIVERSAL | (10 << 2))
+};
+asn_TYPE_operation_t asn_OP_ENUMERATED = {
+    ASN__PRIMITIVE_TYPE_free,
+#if !defined(ASN_DISABLE_PRINT_SUPPORT)
+    INTEGER_print,  /* Implemented in terms of INTEGER */
+#else
+    0,
+#endif  /* !defined(ASN_DISABLE_PRINT_SUPPORT) */
+    INTEGER_compare,  /* Implemented in terms of INTEGER */
+    INTEGER_copy,  /* Implemented in terms of INTEGER */
+#if !defined(ASN_DISABLE_BER_SUPPORT)
+    ber_decode_primitive,
+    INTEGER_encode_der,  /* Implemented in terms of INTEGER */
+#else
+    0,
+    0,
+#endif  /* !defined(ASN_DISABLE_BER_SUPPORT) */
+#if !defined(ASN_DISABLE_XER_SUPPORT)
+    INTEGER_decode_xer,  /* This is temporary! */
+    INTEGER_encode_xer,
+#else
+    0,
+    0,
+#endif  /* !defined(ASN_DISABLE_XER_SUPPORT) */
+#if !defined(ASN_DISABLE_JER_SUPPORT)
+    ENUMERATED_decode_jer,
+    INTEGER_encode_jer,
+#else
+    0,
+    0,
+#endif  /* !defined(ASN_DISABLE_JER_SUPPORT) */
+#if !defined(ASN_DISABLE_OER_SUPPORT)
+    ENUMERATED_decode_oer,
+    ENUMERATED_encode_oer,
+#else
+    0,
+    0,
+#endif  /* !defined(ASN_DISABLE_OER_SUPPORT) */
+#if !defined(ASN_DISABLE_UPER_SUPPORT)
+    ENUMERATED_decode_uper,  /* Unaligned PER decoder */
+    ENUMERATED_encode_uper,  /* Unaligned PER encoder */
+#else
+    0,
+    0,
+#endif  /* !defined(ASN_DISABLE_UPER_SUPPORT) */
+#if !defined(ASN_DISABLE_APER_SUPPORT)
+    ENUMERATED_decode_aper,  /* Aligned PER decoder */
+    ENUMERATED_encode_aper,  /* Aligned PER encoder */
+#else
+    0,
+    0,
+#endif  /* !defined(ASN_DISABLE_APER_SUPPORT) */
+#if !defined(ASN_DISABLE_RFILL_SUPPORT)
+    ENUMERATED_random_fill,
+#else
+    0,
+#endif  /* !defined(ASN_DISABLE_RFILL_SUPPORT) */
+    0  /* Use generic outmost tag fetcher */
+};
+asn_TYPE_descriptor_t asn_DEF_ENUMERATED = {
+    "ENUMERATED",
+    "ENUMERATED",
+    &asn_OP_ENUMERATED,
+    asn_DEF_ENUMERATED_tags,
+    sizeof(asn_DEF_ENUMERATED_tags) / sizeof(asn_DEF_ENUMERATED_tags0),
+    asn_DEF_ENUMERATED_tags,	/* Same as above */
+    sizeof(asn_DEF_ENUMERATED_tags) / sizeof(asn_DEF_ENUMERATED_tags0),
+    {
+#if !defined(ASN_DISABLE_OER_SUPPORT)
+        0,
+#endif  /* !defined(ASN_DISABLE_OER_SUPPORT) */
+#if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT)
+        0,
+#endif  /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */
+        asn_generic_no_constraint
+    },
+    0, 0,  /* No members */
+    0  /* No specifics */
+};

osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/gen/ENUMERATED_aper.c Added

@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2017 Lev Walkin <vlm@lionet.info>.
+ * All rights reserved.
+ * Redistribution and modifications are permitted subject to BSD license.
+ */
+#include <asn_internal.h>
+#include <ENUMERATED.h>
+#include <NativeEnumerated.h>
+
+asn_dec_rval_t
+ENUMERATED_decode_aper(const asn_codec_ctx_t *opt_codec_ctx,
+                       const asn_TYPE_descriptor_t *td,
+                       const asn_per_constraints_t *constraints, void **sptr, asn_per_data_t *pd) {
+    asn_dec_rval_t rval;
+    ENUMERATED_t *st = (ENUMERATED_t *)*sptr;
+    long value;
+    void *vptr = &value;
+
+    if(!st) {
+        st = (ENUMERATED_t *)(*sptr = CALLOC(1, sizeof(*st)));
+        if(!st) ASN__DECODE_FAILED;
+    }
+
+    rval = NativeEnumerated_decode_aper(opt_codec_ctx, td, constraints,
+                                        (void **)&vptr, pd);
+    if(rval.code == RC_OK)
+        if(asn_long2INTEGER(st, value))
+            rval.code = RC_FAIL;
+    return rval;
+}
+
+asn_enc_rval_t
+ENUMERATED_encode_aper(const asn_TYPE_descriptor_t *td,
+                       const asn_per_constraints_t *constraints,
+                       const void *sptr, asn_per_outp_t *po) {
+    const ENUMERATED_t *st = (const ENUMERATED_t *)sptr;
+    long value;
+
+    if(asn_INTEGER2long(st, &value))
+        ASN__ENCODE_FAILED;
+
+    return NativeEnumerated_encode_aper(td, constraints, &value, po);
+}

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/src/sbcap/gen/GraphicString.c -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/gen/GraphicString.c Changed

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/src/sbcap/gen/INTEGER.c -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/gen/INTEGER.c Changed

@@ -22,6 +22,7 @@
     0,
 #endif  /* !defined(ASN_DISABLE_PRINT_SUPPORT) */
     INTEGER_compare,
+    INTEGER_copy,
 #if !defined(ASN_DISABLE_BER_SUPPORT)
     ber_decode_primitive,
     INTEGER_encode_der,
@@ -37,9 +38,11 @@
     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 */
@@ -361,7 +364,8 @@
 		break;
 	}
 	/* Copy the integer body */
-	for(bp = buf, pend1 += add; p != pend1; p += add)
+	pend1 += add;
+	for(bp = buf; p != pend1; p += add)
 		*bp++ = *p;
 
 	if(st->buf) FREEMEM(st->buf);
@@ -411,6 +415,33 @@
     return asn_imax2INTEGER(st, value);
 }
 
+int asn_INTEGER2int64(const INTEGER_t *st, int64_t *value) {
+    intmax_t v;
+    if(asn_INTEGER2imax(st, &v) == 0) {
+        if(v < INT64_MIN || v > INT64_MAX) {
+            errno = ERANGE;
+            return -1;
+        }
+        *value = v;
+        return 0;
+    } else {
+        return -1;
+    }
+}
+
+int asn_INTEGER2uint64(const INTEGER_t *st, uint64_t *value) {
+    uintmax_t v;
+    if(asn_INTEGER2umax(st, &v) == 0) {
+        if(v > UINT64_MAX) {
+            errno = ERANGE;
+            return -1;
+        }
+        *value = v;
+        return 0;
+    } else {
+        return -1;
+    }
+}
 
 int
 asn_uint642INTEGER(INTEGER_t *st, uint64_t value) {
@@ -736,3 +767,40 @@
     }
 
 }
+
+int
+INTEGER_copy(const asn_TYPE_descriptor_t *td, void **aptr,
+                     const void *bptr) {
+    (void)td;
+    INTEGER_t *a = *aptr;
+    const INTEGER_t *b = bptr;
+
+    if(!b) {
+        if(a) {
+            FREEMEM(a->buf);
+            FREEMEM(a);
+            *aptr = 0;
+        }
+        return 0;
+    }
+
+    if(!a) {
+        a = *aptr = CALLOC(1, sizeof(*a));
+        if(!a) return -1;
+    }
+
+    if(b->size) {
+        uint8_t* buf = MALLOC(b->size);
+        if(!buf) return -1;
+        memcpy(buf, b->buf, b->size);
+        FREEMEM(a->buf);
+        a->buf = buf;
+        a->size = b->size;
+    } else {
+        FREEMEM(a->buf);
+        a->buf = 0;
+        a->size = 0;
+    }
+
+    return 0;
+}

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/src/sbcap/gen/INTEGER_aper.c -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/gen/INTEGER_aper.c Changed

@@ -57,7 +57,7 @@
                 int max_range_bytes = (ct->range_bits >> 3) +
                                       (((ct->range_bits % 8) > 0) ? 1 : 0);
                 int length = 0, i;
-                long value = 0;
+                intmax_t value = 0;
 
                 for (i = 1; ; i++) {
                     int upper = 1 << i;
@@ -79,18 +79,18 @@
                     int buf = per_get_few_bits(pd, 8);
                     if (buf < 0)
                         ASN__DECODE_FAILED;
-                    value += (((long)buf) << (8 * length));
+                    value += (((intmax_t)buf) << (8 * length));
                 }
 
                 value += ct->lower_bound;
                 if((specs && specs->field_unsigned)
-                        ? asn_uint642INTEGER(st, (unsigned long)value)
-                        : asn_int642INTEGER(st, value))
+                        ? asn_umax2INTEGER(st, (uintmax_t)value)
+                        : asn_imax2INTEGER(st, value))
                     ASN__DECODE_FAILED;
-                ASN_DEBUG("Got value %ld + low %lld",
-                          value, (long long int)ct->lower_bound);
+                ASN_DEBUG("Got value %"ASN_PRIdMAX" + low %"ASN_PRIdMAX"",
+                          value, (intmax_t)ct->lower_bound);
             } else {
-                long value = 0;
+                intmax_t value = 0;
                 if (ct->range_bits < 8) {
                     value = per_get_few_bits(pd, ct->range_bits);
                     if(value < 0) ASN__DECODE_STARVED;
@@ -108,11 +108,11 @@
                 }
                 value += ct->lower_bound;
                 if((specs && specs->field_unsigned)
-                        ? asn_ulong2INTEGER(st, value)
-                        : asn_long2INTEGER(st, value))
+                        ? asn_umax2INTEGER(st, (uintmax_t)value)
+                        : asn_imax2INTEGER(st, value))
                     ASN__DECODE_FAILED;
-                ASN_DEBUG("Got value %ld + low %lld",
-                          value, (long long int)ct->lower_bound);
+                ASN_DEBUG("Got value %"ASN_PRIdMAX" + low %"ASN_PRIdMAX"",
+                          value, (intmax_t)ct->lower_bound);
             }
             return rval;
         } else {
@@ -167,7 +167,7 @@
     const uint8_t *buf;
     const uint8_t *end;
     const asn_per_constraint_t *ct;
-    long value = 0;
+    intmax_t value = 0;
 
     if(!st || st->size == 0) ASN__ENCODE_FAILED;
 
@@ -179,26 +179,26 @@
     if(ct) {
         int inext = 0;
         if(specs && specs->field_unsigned) {
-            unsigned long uval;
-            if(asn_INTEGER2ulong(st, &uval))
+            uintmax_t uval;
+            if(asn_INTEGER2umax(st, &uval))
                 ASN__ENCODE_FAILED;
             /* Check proper range */
             if(ct->flags & APC_SEMI_CONSTRAINED) {
-                if(uval < (unsigned long)ct->lower_bound)
+                if(uval < (uintmax_t)ct->lower_bound)
                     inext = 1;
             } else if(ct->range_bits >= 0) {
-                if(uval < (unsigned long)ct->lower_bound
-                        || uval > (unsigned long)ct->upper_bound)
+                if(uval < (uintmax_t)ct->lower_bound
+                        || uval > (uintmax_t)ct->upper_bound)
                     inext = 1;
             }
-            ASN_DEBUG("Value %lu (%02x/%zu) lb %lld ub %lld %s",
+            ASN_DEBUG("Value %"ASN_PRIdMAX" (%02x/%"ASN_PRI_SIZE") lb %"ASN_PRIdMAX" ub %"ASN_PRIdMAX" %s",
                       uval, st->buf0, st->size,
-                      (long long int)ct->lower_bound,
-                      (long long int)ct->upper_bound,
+                      (intmax_t)ct->lower_bound,
+                      (intmax_t)ct->upper_bound,
                       inext ? "ext" : "fix");
             value = uval;
         } else {
-            if(asn_INTEGER2long(st, &value)) ASN__ENCODE_FAILED;
+            if(asn_INTEGER2imax(st, &value)) ASN__ENCODE_FAILED;
             /* Check proper range */
             if(ct->flags & APC_SEMI_CONSTRAINED) {
                 if(value < ct->lower_bound)
@@ -208,10 +208,10 @@
                         || value > ct->upper_bound)
                     inext = 1;
             }
-            ASN_DEBUG("Value %lu (%02x/%zu) lb %lld ub %lld %s",
+            ASN_DEBUG("Value %"ASN_PRIdMAX" (%02x/%"ASN_PRI_SIZE") lb %"ASN_PRIdMAX" ub %"ASN_PRIdMAX" %s",
                       value, st->buf0, st->size,
-                      (long long int)ct->lower_bound,
-                      (long long int)ct->upper_bound,
+                      (intmax_t)ct->lower_bound,
+                      (intmax_t)ct->upper_bound,
                       inext ? "ext" : "fix");
         }
         if(ct->flags & APC_EXTENSIBLE) {
@@ -225,11 +225,11 @@
 
     /* X.691, #12.2.2 */
     if(ct && ct->range_bits >= 0) {
-        unsigned long v;
+        uintmax_t v;
 
         /* #10.5.6 */
-        ASN_DEBUG("Encoding integer %ld (%lld) with range %d bits",
-                  value, (long long int)(value - ct->lower_bound),
+        ASN_DEBUG("Encoding integer %"ASN_PRIdMAX" (%"ASN_PRIdMAX") with range %d bits",
+                  value, (intmax_t)(value - ct->lower_bound),
                   ct->range_bits);
 
         v = value - ct->lower_bound;
@@ -287,7 +287,7 @@
     }
 
     if(ct && ct->lower_bound) {
-        ASN_DEBUG("Adjust lower bound to %lld", (long long int)ct->lower_bound);
+        ASN_DEBUG("Adjust lower bound to %"ASN_PRIdMAX"", (intmax_t)ct->lower_bound);
         /* TODO: adjust lower bound */
         ASN__ENCODE_FAILED;
     }

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/src/sbcap/gen/NativeEnumerated.c -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/gen/NativeEnumerated.c Changed

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/src/sbcap/gen/NativeEnumerated_aper.c -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/gen/NativeEnumerated_aper.c Changed

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/src/sbcap/gen/NativeInteger.c -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/gen/NativeInteger.c Changed

@@ -27,6 +27,7 @@
     0,
 #endif  /* !defined(ASN_DISABLE_PRINT_SUPPORT) */
     NativeInteger_compare,
+    NativeInteger_copy,
 #if !defined(ASN_DISABLE_BER_SUPPORT)
     NativeInteger_decode_ber,
     NativeInteger_encode_der,
@@ -42,9 +43,11 @@
     0,
 #endif  /* !defined(ASN_DISABLE_XER_SUPPORT) */
 #if !defined(ASN_DISABLE_JER_SUPPORT)
+    NativeInteger_decode_jer,
     NativeInteger_encode_jer,
 #else
     0,
+    0,
 #endif  /* !defined(ASN_DISABLE_JER_SUPPORT) */
 #if !defined(ASN_DISABLE_OER_SUPPORT)
     NativeInteger_decode_oer,  /* OER decoder */
@@ -150,3 +153,30 @@
         return 1;
     }
 }
+
+int
+NativeInteger_copy(const asn_TYPE_descriptor_t *td, void **aptr, const void *bptr) {
+    unsigned long *a = *aptr;
+    const unsigned long *b = bptr;
+
+    (void)td;
+
+    /* Check if source has data */
+    if(!b) {
+        /* Clear destination */
+        if(a) {
+            FREEMEM(a);
+            *aptr = 0;
+        }
+        return 0;
+    }
+
+    if(!a) {
+        a = *aptr = MALLOC(sizeof(*a));
+        if(!a) return -1;
+    }
+
+    *a = *b;
+
+    return 0;
+}

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/src/sbcap/gen/NativeInteger_rfill.c -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/gen/NativeInteger_rfill.c Changed

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/src/sbcap/gen/OBJECT_IDENTIFIER.c -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/gen/OBJECT_IDENTIFIER.c Changed

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/src/sbcap/gen/OCTET_STRING.c -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/gen/OCTET_STRING.c Changed

@@ -26,6 +26,7 @@
     0,
 #endif  /* !defined(ASN_DISABLE_PRINT_SUPPORT) */
     OCTET_STRING_compare,
+    OCTET_STRING_copy,
 #if !defined(ASN_DISABLE_BER_SUPPORT)
     OCTET_STRING_decode_ber,
     OCTET_STRING_encode_der,
@@ -41,9 +42,11 @@
     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,
@@ -247,6 +250,43 @@
 
 }
 
+int
+OCTET_STRING_copy(const asn_TYPE_descriptor_t *td, void **aptr,
+                     const void *bptr) {
+    const asn_OCTET_STRING_specifics_t *specs = 
+        td->specifics ? (const asn_OCTET_STRING_specifics_t *)td->specifics
+                      : &asn_SPC_OCTET_STRING_specs;
+    OCTET_STRING_t *a = *aptr;
+    const OCTET_STRING_t *b = bptr;
+
+    if(!b) {
+        if(a) {
+            FREEMEM(a->buf);
+            a->buf = 0;
+            a->size = 0;
+            FREEMEM(a);
+        }
+        *aptr = 0;
+        return 0;
+    }
+
+    if(!a) {
+        a = *aptr = (OCTET_STRING_t *)CALLOC(1, specs->struct_size);
+        if(!a) return -1;
+    }
+
+    void *buf = MALLOC(b->size + 1);
+    if(!buf) return -1;
+    memcpy(buf, b->buf, b->size);
+    ((uint8_t *)buf)b->size = '\0';
+
+    FREEMEM(a->buf);
+    a->buf = (uint8_t *)buf;
+    a->size = b->size;
+
+    return 0;
+}
+
 #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT)
 int
 OCTET_STRING_per_get_characters(asn_per_data_t *po, uint8_t *buf,

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/src/sbcap/gen/OCTET_STRING_aper.c -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/gen/OCTET_STRING_aper.c Changed

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/src/sbcap/gen/OPEN_TYPE.c -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/gen/OPEN_TYPE.c Changed

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/src/sbcap/gen/OPEN_TYPE_aper.c -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/gen/OPEN_TYPE_aper.c Changed

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/src/sbcap/gen/ObjectDescriptor.c -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/gen/ObjectDescriptor.c Changed

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/src/sbcap/gen/aper_support.c -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/gen/aper_support.c Changed

@@ -25,8 +25,7 @@
 	*repeat = 0;
 
 	if (constrained && ub < 65536) {
-		int range = ub - lb + 1;
-		return aper_get_nsnnwn(pd, range);
+		return aper_get_constrained_whole_number(pd, lb, ub);
 	}
 
 	if (aper_get_align(pd) < 0)
@@ -70,55 +69,117 @@
 }
 
 ssize_t
-aper_get_nsnnwn(asn_per_data_t *pd, int range) {
-	ssize_t value;
-	int bytes = 0;
+aper_get_nsnnwn(asn_per_data_t *pd) {
+	int b;
+	int length;
 
-	ASN_DEBUG("getting nsnnwn with range %d", range);
+	ASN_DEBUG("getting nsnnwn");
 
-	if(range <= 255) {
-		int i;
+	b = per_get_few_bits(pd, 1);
+	if (b == -1)
+		return -1;
 
-		if (range < 0) return -1;
-		/* 1 -> 8 bits */
-		for (i = 1; i <= 8; i++) {
-			int upper = 1 << i;
-			if (upper >= range)
-				break;
-		}
-		value = per_get_few_bits(pd, i);
-		return value;
-	} else if (range == 256){
-		/* 1 byte */
-		bytes = 1;
-	} else if (range <= 65536) {
-		/* 2 bytes */
-		bytes = 2;
-	} else {
-		//return -1;
-		int length;
+	/* X.691 2002 10.6.1 */
+	if (b == 0)
+		return per_get_few_bits(pd, 6);
+
+	if (aper_get_align(pd) < 0)
+		return -1;
+
+	/* X.691 2002 10.6.2 */
+	/* X.691 2002 10.9.3.5 */
+	b = per_get_few_bits(pd, 1);
+	if (b == -1)
+		return -1;
+
+	if (b == 1) {
+		/* other 10.9.3.x cases not handled, it's doubtful we reach them in practice */
+		ASN_DEBUG("todo: X.691 2002 10.9.3.x");
+		return -1;
+	}
+
+	/* X.691 2002 10.9.3.6 */
+	length = per_get_few_bits(pd, 7);
+	if (length > 4) {
+		/* todo */
+		ASN_DEBUG("todo: X.691 2002 10.9.3.6 for length > 4");
+		return -1;
+	}
+	ASN_DEBUG("length %d\n", length);
+
+	/* todo: 0xffffffff will be seen as -1 and will lead to decoding failure */
+	return per_get_few_bits(pd, length * 8);
+}
 
-		/* handle indefinite range */
-		length = per_get_few_bits(pd, 1);
-		if (length == 0)
-			return per_get_few_bits(pd, 6);
+/* X.691 2002 10.5 - Decoding of a constrained whole number */
+long
+aper_get_constrained_whole_number(asn_per_data_t *pd, long lb, long ub) {
+	assert(ub >= lb);
+	long range = ub - lb + 1;
+	int range_len;
+	int value_len;
+	long value;
+
+	ASN_DEBUG("aper get constrained_whole_number with lb %ld and ub %ld", lb, ub);
+
+	/* X.691 2002 10.5.4 */
+	if (range == 1)
+		return lb;
+
+	/* X.691 2002 10.5.7.1 - The bit-field case. */
+	if (range <= 255) {
+		int bitfield_size = 8;
+		for (bitfield_size = 8; bitfield_size >= 2; bitfield_size--)
+			if ((range - 1) & (1 << (bitfield_size-1)))
+				break;
+		value = per_get_few_bits(pd, bitfield_size);
+		if (value < 0 || value >= range)
+			return -1;
+		return value + lb;
+	}
 
-		if (aper_get_align(pd) < 0)
+	/* X.691 2002 10.5.7.2 - The one-octet case. */
+	if (range == 256) {
+		if (aper_get_align(pd))
+			return -1;
+		value = per_get_few_bits(pd, 8);
+		if (value < 0 || value >= range)
 			return -1;
+		return value + lb;
+	}
 
-		length = per_get_few_bits(pd, 8);
-		/* the length is not likely to be that big */
-		if (length > 4)
+	/* X.691 2002 10.5.7.3 - The two-octet case. */
+	if (range <= 65536) {
+		if (aper_get_align(pd))
 			return -1;
-		value = 0;
-		if (per_get_many_bits(pd, (uint8_t *)&value, 0, length * 8) < 0)
+		value = per_get_few_bits(pd, 16);
+		if (value < 0 || value >= range)
 			return -1;
-		return value;
+		return value + lb;
 	}
-	if (aper_get_align(pd) < 0)
+
+	/* X.691 2002 10.5.7.4 - The indefinite length case. */
+	/* since we limit input to be 'long' we don't handle all numbers */
+	/* and so length determinant is retrieved as X.691 2002 10.9.3.3 */
+	/* number of bytes to store the range */
+	for (range_len = 3; ; range_len++) {
+		long bits = ((long)1) << (8 * range_len);
+		if (range - 1 < bits)
+			break;
+	}
+	value_len = aper_get_constrained_whole_number(pd, 1, range_len);
+	if (value_len == -1)
+		return -1;
+	if (value_len > 4) {
+		ASN_DEBUG("todo: aper_get_constrained_whole_number: value_len > 4");
+		return -1;
+	}
+	if (aper_get_align(pd))
+		return -1;
+	value = per_get_few_bits(pd, value_len * 8);
+	if (value < 0 || value >= range)
 		return -1;
-	value = per_get_few_bits(pd, 8 * bytes);
-	return value;
+	return value + lb;
 }
 
 int aper_put_align(asn_per_outp_t *po) {
@@ -142,11 +203,9 @@
 
 	ASN_DEBUG("APER put length %zu with range (%zd..%zd)", n, lb, ub);
 
-	/* 11.9 X.691 Note 2 */
-	if (constrained && ub < 65536) {
-		int range = ub - lb + 1;
-		return aper_put_nsnnwn(po, range, n) ? -1 : (ssize_t)n;
-	}
+	/* X.691 2002 10.9.3.3 */
+	if (constrained && ub < 65536)
+		return aper_put_constrained_whole_number(po, lb, ub, n + lb) ? -1 : (ssize_t)n;
 
 	if (aper_put_align(po) < 0)
 		return -1;
@@ -189,51 +248,113 @@
 }
 
 int
-aper_put_nsnnwn(asn_per_outp_t *po, int range, int number) {
-	int bytes;
+aper_put_nsnnwn(asn_per_outp_t *po, int number) {
+	int len;
+
+	ASN_DEBUG("aper put nsnnwn %d", number);
+
+	if (number <= 63) {
+		if (per_put_few_bits(po, 0, 1))
+			return -1;
+		return per_put_few_bits(po, number, 6);
+	}
 
-	ASN_DEBUG("aper put nsnnwn %d with range %d", number, range);
-	/* 10.5.7.1 X.691 */
-	if(range < 0) {
+	if (per_put_few_bits(po, 1, 1))
+		return -1;
+
+	if (number < 256) {
+		len = 1;
+	} else if (number < 65536) {
+		len = 2;
+	} else { /* number > 64K */
 		int i;
-		for (i = 1; ; i++) {
+		for (i = 3; ; i++) {
 			int bits = 1 << (8 * i);
-			if (number <= bits)
+			if (number < bits)
 				break;
 		}
-		bytes = i;
-		assert(i <= 4);
+		len = i;
 	}
-	if(range <= 255) {
-		int i;
-		for (i = 1; i <= 8; i++) {
-			int bits = 1 << i;
-			if (range <= bits)
-				break;
-		}
-		return per_put_few_bits(po, number, i);
-	} else if(range == 256) {
-		if (number >= range)
-			return -1;
-		bytes = 1;
-	} else if(range <= 65536) {
-		if (number >= range)
+
+	if (aper_put_align(po) < 0)
+		return -1;
+
+	/* put the length which is a non-constrained whole number */
+	if (len <= 127) {
+		if(per_put_few_bits(po, 0, 1))
 			return -1;
-		bytes = 2;
-	} else { /* Ranges > 64K */
-		int i;
-		for (i = 1; ; i++) {
-			int bits = 1 << (8 * i);
-			if (range <= bits)
-				break;
-		}
-		assert(i <= 4);
-		bytes = i;
+		if(per_put_few_bits(po, len, 7))
+			return -1;
+	} else {
+		/* todo but not big problem, it's very doubtful that the
+		 * number of bytes to encode 'number' will be > 127
+		 */
+		return -1;
 	}
 	if(aper_put_align(po) < 0) /* Aligning on octet */
 		return -1;
-/* 	if(per_put_few_bits(po, bytes, 8))
+	return per_put_few_bits(po, number, 8 * len);
+}
+
+/* X.691 2002 10.5 - Encoding of a constrained whole number */
+int
+aper_put_constrained_whole_number(asn_per_outp_t *po, long lb, long ub, long number) {
+	assert(ub >= lb);
+	long range = ub - lb + 1;
+	long value = number - lb;
+	int range_len;
+	int value_len;
+
+	ASN_DEBUG("aper put constrained_whole_number %ld with lb %ld and ub %ld", number, lb, ub);
+
+	if (number < lb || number > ub)
+		return -1;
+
+	/* X.691 2002 10.5.4 */
+	if (range == 1)
+		return 0;
+
+	/* X.691 2002 10.5.7.1 - The bit-field case. */
+	if (range <= 255) {
+		int bitfield_size = 8;
+		for (bitfield_size = 8; bitfield_size >= 2; bitfield_size--)
+			if ((range - 1) & (1 << (bitfield_size-1)))
+				break;
+		return per_put_few_bits(po, value, bitfield_size);
+	}
+
+	/* X.691 2002 10.5.7.2 - The one-octet case. */
+	if (range == 256) {
+		if (aper_put_align(po))
+			return -1;
+		return per_put_few_bits(po, value, 8);
+	}
+
+	/* X.691 2002 10.5.7.3 - The two-octet case. */
+	if (range <= 65536) {
+		if (aper_put_align(po))
+			return -1;
+		return per_put_few_bits(po, value, 16);
+	}
+
+	/* X.691 2002 10.5.7.4 - The indefinite length case. */
+	/* since we limit input to be 'long' we don't handle all numbers */
+	/* and so length determinant is stored as X.691 2002 10.9.3.3 */
+	/* number of bytes to store the range */
+	for (range_len = 3; ; range_len++) {
+		int bits = 1 << (8 * range_len);
+		if (range - 1 < bits)
+			break;
+	}
+	/* number of bytes to store the value */
+	for (value_len = 1; ; value_len++) {
+		long bits = ((long)1) << (8 * value_len);
+		if (value < bits)
+			break;
+	}
+	if (aper_put_constrained_whole_number(po, 1, range_len, value_len))
+		return -1;
+	if (aper_put_align(po))
 		return -1;
-*/
-	return per_put_few_bits(po, number, 8 * bytes);
+	return per_put_few_bits(po, value, value_len * 8);
 }

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/src/sbcap/gen/asn_application.c -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/gen/asn_application.c Changed

@@ -229,6 +229,9 @@
 #if !defined(ASN_DISABLE_XER_SUPPORT)
     enum xer_encoder_flags_e xer_flags = XER_F_CANONICAL;
 #endif  /* !defined(ASN_DISABLE_XER_SUPPORT) */
+#if !defined(ASN_DISABLE_JER_SUPPORT)
+    enum jer_encoder_flags_e jer_flags = JER_F;
+#endif  /* !defined(ASN_DISABLE_JER_SUPPORT) */
 
     (void)opt_codec_ctx; /* Parameters are not checked on encode yet. */
 
@@ -432,9 +435,15 @@
 #endif  /* !defined(ASN_DISABLE_XER_SUPPORT) */
 
 #if !defined(ASN_DISABLE_JER_SUPPORT)
+    case ATS_JER_MINIFIED:
+        /* Currently JER_F and JER_F_MINIFIED have opposite purposes
+        *  so we just flip the flag. */
+        jer_flags &= ~JER_F;
+        jer_flags |= JER_F_MINIFIED;
+        /* Fall through. */
     case ATS_JER:
         if(td->op->jer_encoder) {
-            er = jer_encode(td, sptr, callback, callback_key);
+            er = jer_encode(td, sptr, jer_flags, callback, callback_key);
             if(er.encoded == -1) {
                 if(er.failed_type && er.failed_type->op->jer_encoder) {
                     errno = EBADF;   /* Structure has incorrect form. */
@@ -533,6 +542,15 @@
         errno = ENOENT;
         ASN__DECODE_FAILED;
 #endif  /* !defined(ASN_DISABLE_XER_SUPPORT) */
+
+    case ATS_JER:
+    case ATS_JER_MINIFIED:
+#if !defined(ASN_DISABLE_JER_SUPPORT)
+        return jer_decode(opt_codec_ctx, td, sptr, buffer, size);
+#else
+        errno = ENOENT;
+        ASN__DECODE_FAILED;
+#endif  /* !defined(ASN_DISABLE_JER_SUPPORT) */
     }
 }

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/src/sbcap/gen/asn_internal.c -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/gen/asn_internal.c Changed

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/src/sbcap/gen/asn_random_fill.c -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/gen/asn_random_fill.c Changed

@@ -6,6 +6,7 @@
 #include <asn_internal.h>
 #include <asn_random_fill.h>
 #include <constr_TYPE.h>
+#include <stdlib.h>
 
 int
 asn_random_fill(const struct asn_TYPE_descriptor_s *td, void **struct_ptr,
@@ -42,17 +43,22 @@
         uintmax_t range = asn__intmax_range(lb, rb);
         uintmax_t value = 0;
         uintmax_t got_entropy = 0;
-
         (void)intmax_max;
-        assert(RAND_MAX > 0xffffff);    /* Seen 7ffffffd! */
+        int max = 0xffffff;
+
+#ifdef __WIN32__
+        max = RAND_MAX-1;
+#endif
+
+        assert(RAND_MAX > max);    /* Seen 7ffffffd! */
         assert(range < intmax_max);
 
         for(; got_entropy < range;) {
-            got_entropy = (got_entropy << 24) | 0xffffff;
+            got_entropy = (got_entropy << 24) | max;
 #ifdef HAVE_RANDOM
-            value = (value << 24) | (random() % 0xffffff);
+            value = (value << 24) | (random() % max);
 #else
-            value = (value << 24) | (rand() % 0xffffff);
+            value = (value << 24) | (rand() % max);
 #endif
         }

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/src/sbcap/gen/constr_CHOICE.c -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/gen/constr_CHOICE.c Changed

@@ -13,6 +13,7 @@
     0,
 #endif  /* !defined(ASN_DISABLE_PRINT_SUPPORT) */
     CHOICE_compare,
+    CHOICE_copy,
 #if !defined(ASN_DISABLE_BER_SUPPORT)
     CHOICE_decode_ber,
     CHOICE_encode_der,
@@ -28,9 +29,11 @@
     0,
 #endif  /* !defined(ASN_DISABLE_XER_SUPPORT) */
 #if !defined(ASN_DISABLE_JER_SUPPORT)
+    CHOICE_decode_jer,
     CHOICE_encode_jer,
 #else
     0,
+    0,
 #endif  /* !defined(ASN_DISABLE_JER_SUPPORT) */
 #if !defined(ASN_DISABLE_OER_SUPPORT)
     CHOICE_decode_oer,
@@ -154,13 +157,14 @@
 void
 CHOICE_free(const asn_TYPE_descriptor_t *td, void *ptr,
             enum asn_struct_free_method method) {
-    const asn_CHOICE_specifics_t *specs =
-        (const asn_CHOICE_specifics_t *)td->specifics;
+    const asn_CHOICE_specifics_t *specs;
     unsigned present;
 
 	if(!td || !ptr)
 		return;
 
+    specs = (const asn_CHOICE_specifics_t *)td->specifics;
+
 	ASN_DEBUG("Freeing %s as CHOICE", td->name);
 
 	/*
@@ -311,6 +315,59 @@
     }
 }
 
+int
+CHOICE_copy(const asn_TYPE_descriptor_t *td, void **aptr, const void *bptr) {
+    if(!td) return -1;
+
+    void *st = *aptr;
+    const asn_CHOICE_specifics_t *specs =
+        (const asn_CHOICE_specifics_t *)td->specifics;
+    const asn_TYPE_member_t *elm;  /* CHOICE's element */
+    int present;
+    int ret;
+	void *amemb;
+    void **amembp;
+    const void *bmemb;
+
+    if(!bptr) {
+        if(st) {
+            ASN_STRUCT_FREE(*td, st);
+            *aptr = NULL;
+        }
+        return 0;
+    }
+
+    if(!st) {
+        st = *aptr = CALLOC(1, specs->struct_size);
+        if(!st) return -1;
+    }
+
+    present = _fetch_present_idx(bptr,
+                                 specs->pres_offset, specs->pres_size);
+
+    if(present <= 0 && (unsigned)present > td->elements_count) return -1;
+    --present;
+
+    elm = &td->elementspresent;
+    if(elm->flags & ATF_POINTER) {
+        /* Member is a pointer to another structure */
+        amembp = (void **)((char *)st + elm->memb_offset);
+        bmemb = *(const void* const*)((const char*)bptr + elm->memb_offset);
+    } else {
+        amemb = (char *)st + elm->memb_offset;
+        amembp = &amemb;
+        bmemb = (const void*)((const char*)bptr + elm->memb_offset);
+    }
+    ret = elm->type->op->copy_struct(elm->type, amembp, bmemb);
+    if (ret != 0) return ret;
+
+    _set_present_idx(st,
+            specs->pres_offset,
+            specs->pres_size, present + 1);
+
+    return 0;
+}
+
 /*
  * Return the 1-based choice variant presence index.
  * Returns 0 in case of error.

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/src/sbcap/gen/constr_CHOICE_aper.c -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/gen/constr_CHOICE_aper.c Changed

@@ -40,6 +40,8 @@
         value = per_get_few_bits(pd, 1);
         if(value < 0) ASN__DECODE_STARVED;
         if(value) ct = 0;  /* Not restricted */
+        if((unsigned)value >= td->elements_count)
+            ASN__DECODE_FAILED;
     }
 
     if(ct && ct->range_bits >= 0) {
@@ -53,8 +55,8 @@
         if(specs->ext_start == -1)
             ASN__DECODE_FAILED;
 
-        if(specs && specs->tag2el_count > specs->ext_start) {
-            value = aper_get_nsnnwn(pd, specs->tag2el_count - specs->ext_start); /* extension elements range */
+        if(specs && specs->tag2el_count > (unsigned)specs->ext_start) {
+            value = aper_get_nsnnwn(pd); /* extension elements range */
             if(value < 0) ASN__DECODE_STARVED;
             value += specs->ext_start;
             if((unsigned)value >= td->elements_count)
@@ -166,11 +168,7 @@
         asn_enc_rval_t rval = {0,0,0};
         if(specs->ext_start == -1)
             ASN__ENCODE_FAILED;
-        int n = present - specs->ext_start;
-        if(n <= 63) {
-            if(n < 0) ASN__ENCODE_FAILED;
-            if(per_put_few_bits(po, n, 7)) ASN__ENCODE_FAILED;
-        } else
+        if(aper_put_nsnnwn(po, present - specs->ext_start))
             ASN__ENCODE_FAILED;
         if(aper_open_type_put(elm->type, elm->encoding_constraints.per_constraints,
                               memb_ptr, po))

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/src/sbcap/gen/constr_SEQUENCE.c -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/gen/constr_SEQUENCE.c Changed

@@ -14,6 +14,7 @@
     0,
 #endif  /* !defined(ASN_DISABLE_PRINT_SUPPORT) */
     SEQUENCE_compare,
+    SEQUENCE_copy,
 #if !defined(ASN_DISABLE_BER_SUPPORT)
     SEQUENCE_decode_ber,
     SEQUENCE_encode_der,
@@ -29,9 +30,11 @@
     0,
 #endif  /* !defined(ASN_DISABLE_XER_SUPPORT) */
 #if !defined(ASN_DISABLE_JER_SUPPORT)
+    SEQUENCE_decode_jer,
     SEQUENCE_encode_jer,
 #else
     0,
+    0,
 #endif  /* !defined(ASN_DISABLE_JER_SUPPORT) */
 #if !defined(ASN_DISABLE_OER_SUPPORT)
     SEQUENCE_decode_oer,
@@ -66,13 +69,14 @@
 SEQUENCE_free(const asn_TYPE_descriptor_t *td, void *sptr,
               enum asn_struct_free_method method) {
     size_t edx;
-    const asn_SEQUENCE_specifics_t *specs =
-        (const asn_SEQUENCE_specifics_t *)td->specifics;
+    const asn_SEQUENCE_specifics_t *specs; 
     asn_struct_ctx_t *ctx; /* Decoder context */
 
 	if(!td || !sptr)
 		return;
 
+    specs = (const asn_SEQUENCE_specifics_t *)td->specifics;
+
 	ASN_DEBUG("Freeing %s as SEQUENCE", td->name);
 
 	for(edx = 0; edx < td->elements_count; edx++) {
@@ -193,5 +197,55 @@
         if(ret != 0) return ret;
     }
 
+    return 0;
+}
+
+int
+SEQUENCE_copy(const asn_TYPE_descriptor_t *td, void **aptr,
+                 const void *bptr) {
+    if(!td) return -1;
+
+    const asn_SEQUENCE_specifics_t *specs = 
+        (const asn_SEQUENCE_specifics_t *)td->specifics;
+    size_t edx;
+    void *st = *aptr;        /* Target structure */
+
+    if(!bptr) {
+        if(st) {
+            SEQUENCE_free(td, st, 0);
+            *aptr = 0;
+        }
+        return 0;
+    }
+
+    /*
+     * Create the target structure if it is not present already.
+     */
+    if(st == 0) {
+        st = *aptr = CALLOC(1, specs->struct_size);
+        if(st == 0) return -1;
+    }
+
+	for(edx = 0; edx < td->elements_count; edx++) {
+		asn_TYPE_member_t *elm = &td->elementsedx;
+		void *amemb;
+		void **amembp;
+		const void *bmemb;
+        int ret;
+
+        if(elm->flags & ATF_POINTER) {
+            /* Member is a pointer to another structure */
+            amembp = (void **)((char *)st + elm->memb_offset);
+            bmemb = *(const void* const*)((const char*)bptr + elm->memb_offset);
+        } else {
+            amemb = (char *)st + elm->memb_offset;
+            amembp = &amemb;
+            bmemb = (const void*)((const char*)bptr + elm->memb_offset);
+        }
+
+        ret = elm->type->op->copy_struct(elm->type, amembp, bmemb);
+        if(ret != 0) return ret;
+    }
+
     return 0;
 }

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/src/sbcap/gen/constr_SEQUENCE_OF.c -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/gen/constr_SEQUENCE_OF.c Changed

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/src/sbcap/gen/constr_SET_OF.c -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/gen/constr_SET_OF.c Changed

@@ -14,6 +14,7 @@
     0,
 #endif  /* !defined(ASN_DISABLE_PRINT_SUPPORT) */
     SET_OF_compare,
+    SET_OF_copy,
 #if !defined(ASN_DISABLE_BER_SUPPORT)
     SET_OF_decode_ber,
     SET_OF_encode_der,
@@ -29,9 +30,11 @@
     0,
 #endif  /* !defined(ASN_DISABLE_XER_SUPPORT) */
 #if !defined(ASN_DISABLE_JER_SUPPORT)
+    SET_OF_decode_jer,
     SET_OF_encode_jer,
 #else
     0,
+    0,
 #endif  /* !defined(ASN_DISABLE_JER_SUPPORT) */
 #if !defined(ASN_DISABLE_OER_SUPPORT)
     SET_OF_decode_oer,
@@ -368,4 +371,59 @@
     }
 
 	return 0;
+}
+
+int
+SET_OF_copy(const asn_TYPE_descriptor_t *td, void **aptr,
+            const void *bptr) {
+    if(!td) return -1;
+
+    const asn_SET_OF_specifics_t *specs = 
+        (const asn_SET_OF_specifics_t *)td->specifics;
+    void *st = *aptr;
+
+    if(!bptr) {
+        if(*aptr) {
+            asn_set_empty(_A_SET_FROM_VOID(*aptr));
+            *aptr = 0;
+        }
+        return 0;
+    }
+
+    if(st == 0) {
+        st = *aptr = CALLOC(1, specs->struct_size);
+        if(st == 0) return -1;
+    }
+
+    asn_anonymous_set_ *a = _A_SET_FROM_VOID(*aptr);
+    const asn_anonymous_set_ *b = _A_CSET_FROM_VOID(bptr);
+
+    if(b->size) {
+		void *_new_arr;
+		_new_arr = REALLOC(a->array, b->size * sizeof(b->array0));
+		if(_new_arr) {
+			a->array = (void **)_new_arr;
+			a->size = b->size;
+		} else {
+            return -1;
+        }
+        a->count = b->count;
+
+        for(int i = 0; i < b->count; i++) {
+            void *bmemb = b->arrayi;
+            if(bmemb) {
+                void *amemb = 0;
+                int ret;
+                ret = td->elements->type->op->copy_struct(
+                                                    td->elements->type,
+                                                    &amemb, bmemb);
+                if(ret != 0) return ret;
+                a->arrayi = amemb;
+            } else {
+                a->arrayi = 0;
+            }
+        }
+    }
+
+	return 0;
 }

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/src/sbcap/gen/constr_SET_OF_aper.c -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/gen/constr_SET_OF_aper.c Changed

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/src/sbcap/gen/constr_TYPE.c -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/gen/constr_TYPE.c Changed

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/src/sbcap/skel/ANY.h -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/skel/ANY.h Changed

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/src/sbcap/skel/BIT_STRING.h -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/skel/BIT_STRING.h Changed

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/src/sbcap/skel/BMPString.h -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/skel/BMPString.h Changed

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/src/sbcap/skel/BOOLEAN.h -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/skel/BOOLEAN.h Changed

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/src/sbcap/skel/ENUMERATED.h -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/skel/ENUMERATED.h Changed

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/src/sbcap/skel/GeneralString.h -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/skel/GeneralString.h Changed

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/src/sbcap/skel/GeneralizedTime.h -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/skel/GeneralizedTime.h Changed

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/src/sbcap/skel/GraphicString.h -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/skel/GraphicString.h Changed

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/src/sbcap/skel/IA5String.h -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/skel/IA5String.h Changed

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/src/sbcap/skel/INTEGER.h -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/skel/INTEGER.h Changed

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/src/sbcap/skel/ISO646String.h -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/skel/ISO646String.h Changed

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/src/sbcap/skel/NULL.h -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/skel/NULL.h Changed

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/src/sbcap/skel/NativeEnumerated.h -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/skel/NativeEnumerated.h Changed

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/src/sbcap/skel/NativeInteger.h -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/skel/NativeInteger.h Changed

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/src/sbcap/skel/NativeReal.h -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/skel/NativeReal.h Changed

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/src/sbcap/skel/NumericString.h -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/skel/NumericString.h Changed

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/src/sbcap/skel/OBJECT_IDENTIFIER.h -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/skel/OBJECT_IDENTIFIER.h Changed

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/src/sbcap/skel/OCTET_STRING.h -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/skel/OCTET_STRING.h Changed

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/src/sbcap/skel/OPEN_TYPE.h -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/skel/OPEN_TYPE.h Changed

@@ -33,6 +33,7 @@
 #endif  /* !defined(ASN_DISABLE_PRINT_SUPPORT) */
 
 #define OPEN_TYPE_compare CHOICE_compare
+#define OPEN_TYPE_copy    CHOICE_copy
 
 #define OPEN_TYPE_constraint CHOICE_constraint
 
@@ -59,6 +60,13 @@
 #endif  /* !defined(ASN_DISABLE_XER_SUPPORT) */
 
 #if !defined(ASN_DISABLE_JER_SUPPORT)
+asn_dec_rval_t OPEN_TYPE_jer_get(
+    const asn_codec_ctx_t *opt_codec_ctx,
+    const asn_TYPE_descriptor_t *parent_type,
+    void *parent_structure,
+    const asn_TYPE_member_t *element,
+    const void *ptr, size_t size);
+#define OPEN_TYPE_decode_jer NULL
 #define OPEN_TYPE_encode_jer CHOICE_encode_jer
 #endif  /* !defined(ASN_DISABLE_JER_SUPPORT) */
 
@@ -70,7 +78,10 @@
     asn_TYPE_member_t *element, const void *ptr,
     size_t size);
 #define OPEN_TYPE_decode_oer NULL
-#define OPEN_TYPE_encode_oer CHOICE_encode_oer
+asn_enc_rval_t OPEN_TYPE_encode_oer(
+    const asn_TYPE_descriptor_t *type_descriptor,
+    const asn_oer_constraints_t *constraints, const void *struct_ptr,
+    asn_app_consume_bytes_f *consume_bytes_cb, void *app_key);
 #endif  /* !defined(ASN_DISABLE_OER_SUPPORT) */
 
 #if !defined(ASN_DISABLE_UPER_SUPPORT)

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/src/sbcap/skel/ObjectDescriptor.h -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/skel/ObjectDescriptor.h Changed

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/src/sbcap/skel/PrintableString.h -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/skel/PrintableString.h Changed

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/src/sbcap/skel/REAL.h -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/skel/REAL.h Changed

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/src/sbcap/skel/RELATIVE-OID.h -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/skel/RELATIVE-OID.h Changed

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/src/sbcap/skel/T61String.h -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/skel/T61String.h Changed

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/src/sbcap/skel/TeletexString.h -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/skel/TeletexString.h Changed

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/src/sbcap/skel/UTCTime.h -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/skel/UTCTime.h Changed

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/src/sbcap/skel/UTF8String.h -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/skel/UTF8String.h Changed

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/src/sbcap/skel/UniversalString.h -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/skel/UniversalString.h Changed

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/src/sbcap/skel/VideotexString.h -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/skel/VideotexString.h Changed

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/src/sbcap/skel/VisibleString.h -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/skel/VisibleString.h Changed

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/src/sbcap/skel/aper_support.h -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/skel/aper_support.h Changed

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/src/sbcap/skel/asn_application.h -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/skel/asn_application.h Changed

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/src/sbcap/skel/asn_codecs_prim.h -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/skel/asn_codecs_prim.h Changed

@@ -49,6 +49,32 @@
     xer_primitive_body_decoder_f *prim_body_decoder);
 #endif  /* !defined(ASN_DISABLE_XER_SUPPORT) */
 
+#if !defined(ASN_DISABLE_JER_SUPPORT)
+/*
+ * A callback specification for the jer_decode_primitive() function below.
+ */
+enum jer_pbd_rval {
+    JPBD_SYSTEM_FAILURE,   /* System failure (memory shortage, etc) */
+    JPBD_DECODER_LIMIT,    /* Hit some decoder limitation or deficiency */
+    JPBD_BROKEN_ENCODING,  /* Encoding of a primitive body is broken */
+    JPBD_NOT_BODY_IGNORE,  /* Not a body format, but safe to ignore */
+    JPBD_BODY_CONSUMED     /* Body is recognized and consumed */
+};
+typedef enum jer_pbd_rval(jer_primitive_body_decoder_f)(
+    const asn_TYPE_descriptor_t *td, void *struct_ptr, const void *chunk_buf,
+    size_t chunk_size);
+
+/*
+ * Specific function to decode simple primitive types.
+ * Also see jer_decode_general() in jer_decoder.h
+ */
+asn_dec_rval_t jer_decode_primitive(
+    const asn_codec_ctx_t *opt_codec_ctx,
+    const asn_TYPE_descriptor_t *type_descriptor, void **struct_ptr,
+    size_t struct_size, const void *buf_ptr, size_t size,
+    jer_primitive_body_decoder_f *prim_body_decoder);
+#endif  /* !defined(ASN_DISABLE_JER_SUPPORT) */
+
 #ifdef __cplusplus
 }
 #endif

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/src/sbcap/skel/asn_system.h -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/skel/asn_system.h Changed

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/src/sbcap/skel/constr_CHOICE.h -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/skel/constr_CHOICE.h Changed

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/src/sbcap/skel/constr_SEQUENCE.h -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/skel/constr_SEQUENCE.h Changed

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/src/sbcap/skel/constr_SEQUENCE_OF.h -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/skel/constr_SEQUENCE_OF.h Changed

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/src/sbcap/skel/constr_SET.h -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/skel/constr_SET.h Changed

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/src/sbcap/skel/constr_SET_OF.h -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/skel/constr_SET_OF.h Changed

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/src/sbcap/skel/constr_TYPE.h -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/skel/constr_TYPE.h Changed

@@ -51,8 +51,10 @@
 #endif  /* !defined(ASN_DISABLE_XER_SUPPORT) */
 
 #if !defined(ASN_DISABLE_JER_SUPPORT)
+#include <jer_decoder.h>  /* Decoder of JER (JSON, text) */
 #include <jer_encoder.h>  /* Encoder into JER (JSON, text) */
 #else
+typedef void (jer_type_decoder_f)(void);
 typedef void (jer_type_encoder_f)(void);
 #endif  /* !defined(ASN_DISABLE_JER_SUPPORT) */
 
@@ -142,6 +144,16 @@
 		const void *struct_B);
 
 /*
+ * Copies struct B into struct A.
+ * Allocates memory for struct A, if necessary.
+ */
+typedef int (asn_struct_copy_f)(
+		const struct asn_TYPE_descriptor_s *type_descriptor,
+		void **struct_A,
+		const void *struct_B
+        );
+
+/*
  * Return the outmost tag of the type.
  * If the type is untagged CHOICE, the dynamic operation is performed.
  * NOTE: This function pointer type is only useful internally.
@@ -173,10 +185,12 @@
     asn_struct_free_f *free_struct;     /* Free the structure */
     asn_struct_print_f *print_struct;   /* Human readable output */
     asn_struct_compare_f *compare_struct; /* Compare two structures */
+    asn_struct_copy_f *copy_struct;       /* Copy method */
     ber_type_decoder_f *ber_decoder;      /* Generic BER decoder */
     der_type_encoder_f *der_encoder;      /* Canonical DER encoder */
     xer_type_decoder_f *xer_decoder;      /* Generic XER decoder */
     xer_type_encoder_f *xer_encoder;      /* Canonical XER encoder */
+    jer_type_decoder_f *jer_decoder;      /* Generic JER encoder */
     jer_type_encoder_f *jer_encoder;      /* Generic JER encoder */
     oer_type_decoder_f *oer_decoder;      /* Generic OER decoder */
     oer_type_encoder_f *oer_encoder;      /* Canonical OER encoder */
@@ -288,6 +302,17 @@
                const asn_TYPE_descriptor_t *td, /* ASN.1 type descriptor */
                const void *struct_ptr);         /* Structure to be printed */
 
+/*
+ * Copies a source structure (struct_src) into destination structure 
+ * (struct_dst). Allocates memory for the destination structure, if necessary.
+ * RETURN VALUES:
+ *   0: Copy OK.
+ * 	-1: Problem copying the structure.
+ */
+int asn_copy(const asn_TYPE_descriptor_t *td, /* ASN.1 type descriptor */
+             void **struct_dst,               /* Structure to be populated */
+             const void *struct_src);         /* Structure to be copied */
+
 #ifdef __cplusplus
 }
 #endif

osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/skel/jer_decoder.h Added

@@ -0,0 +1,106 @@
+/*-
+ * Copyright (c) 2004-2017 Lev Walkin <vlm@lionet.info>. All rights reserved.
+ * Redistribution and modifications are permitted subject to BSD license.
+ */
+#ifndef	_JER_DECODER_H_
+#define	_JER_DECODER_H_
+
+#include <asn_application.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct asn_TYPE_descriptor_s;	/* Forward declaration */
+
+/*
+ * The JER decoder of any ASN.1 type. May be invoked by the application.
+ * Decodes CANONICAL-JER and BASIC-JER.
+ */
+asn_dec_rval_t jer_decode(
+    const struct asn_codec_ctx_s *opt_codec_ctx,
+    const struct asn_TYPE_descriptor_s *type_descriptor,
+    void **struct_ptr,  /* Pointer to a target structure's pointer */
+    const void *buffer, /* Data to be decoded */
+    size_t size         /* Size of data buffer */
+);
+
+/*
+ * Type of the type-specific JER decoder function.
+ */
+typedef asn_dec_rval_t(jer_type_decoder_f)(
+    const asn_codec_ctx_t *opt_codec_ctx,
+    const struct asn_TYPE_descriptor_s *type_descriptor, void **struct_ptr,
+    const void *buf_ptr, size_t size);
+
+/*******************************
+ * INTERNALLY USEFUL FUNCTIONS *
+ *******************************/
+
+/*
+ * Generalized function for decoding the primitive values.
+ * Used by more specialized functions, such as OCTET_STRING_decode_jer_utf8
+ * and others. This function should not be used by applications, as its API
+ * is subject to changes.
+ */
+asn_dec_rval_t jer_decode_general(
+    const asn_codec_ctx_t *opt_codec_ctx,
+    asn_struct_ctx_t *ctx, /* Type decoder context */
+    void *struct_key,      /* Treated as opaque pointer */
+    const void *buf_ptr, size_t size,
+    int (*opt_unexpected_tag_decoder)(void *struct_key, const void *chunk_buf,
+                                      size_t chunk_size),
+    ssize_t (*body_receiver)(void *struct_key, const void *chunk_buf,
+                             size_t chunk_size, int have_more));
+
+
+/*
+ * Fetch the next JER (JSON) token from the stream.
+ * The function returns the number of bytes occupied by the chunk type,
+ * returned in the _ch_type. The _ch_type is only set (and valid) when
+ * the return value is >= 0.
+ */
+typedef enum pjer_chunk_type {
+	PJER_WMORE,     /* Chunk type is not clear, more data expected. */
+	PJER_TEXT,	    /* General data */
+	PJER_KEY,	    /* Complete JSON key */
+    PJER_VALUE,     /* Complete JSON value */
+	PJER_DLM	    /* JSON delimiter */
+  } pjer_chunk_type_e;
+ssize_t jer_next_token(int *stateContext,
+	const void *buffer, size_t size, pjer_chunk_type_e *_ch_type);
+
+/*
+ * This function checks the buffer for the current token or 
+ * against the key name expected to occur.
+ */
+typedef enum jer_check_sym {
+	JCK_BROKEN,	  /* Something is broken */
+	JCK_UNKNOWN,  /* Key or delimiter is unknown */	
+	JCK_KEY,	  /* Key is OK */
+	JCK_COMMA,    /* Delimiter is ',' */
+	JCK_OSTART,	  /* Delimiter is '{' */
+	JCK_OEND,     /* Delimiter is '}' */
+	JCK_ASTART,	  /* Delimiter is '' */
+	JCK_AEND      /* Delimiter is '' */
+} jer_check_sym_e;
+jer_check_sym_e jer_check_sym(const void *buf_ptr, int size,
+		const char *need_key);
+
+/*
+ * Get the number of bytes consisting entirely of JER whitespace characters.
+ * RETURN VALUES:
+ * >=0:	Number of whitespace characters in the string.
+ */
+size_t jer_whitespace_span(const void *chunk_buf, size_t chunk_size);
+
+/*
+ * Skip the series of anticipated extensions.
+ */
+int jer_skip_unknown(jer_check_sym_e scv, ber_tlv_len_t *depth);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _JER_DECODER_H_ */

osmo-cbc_0.4.2.3.da8b.202403252026.tar.gz/src/sbcap/skel/jer_encoder.h -> osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/skel/jer_encoder.h Changed

osmo-cbc_0.4.2.4.538b.202403262026.tar.gz/src/sbcap/skel/jer_support.h Added

@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2003, 2004 X/IO Labs, xiolabs.com.
+ * Copyright (c) 2003-2017 Lev Walkin <vlm@lionet.info>. All rights reserved.
+ * Redistribution and modifications are permitted subject to BSD license.
+ */
+#ifndef	_JER_SUPPORT_H_
+#define	_JER_SUPPORT_H_
+
+#include <asn_system.h>		/* Platform-specific types */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * Types of data transferred to the application.
+ */
+typedef enum {
+	PJSON_TEXT,
+	PJSON_KEY,
+	PJSON_VALUE,
+	PJSON_DLM,
+	/* 
+	 * The following chunk types are reported if the chunk
+	 * terminates the specified JSON element.
+	 */
+	PJSON_KEY_END,	 /* Key ended */
+	PJSON_VALUE_END  /* Value ended */
+} pjson_chunk_type_e;
+
+/*
+ * Callback function that is called by the parser when parsed data is
+ * available. The _opaque is the pointer to a field containing opaque user 
+ * data specified in pxml_create() call. The chunk type is _type and the text 
+ * data is the piece of buffer identified by _bufid (as supplied to
+ * pxml_feed() call) starting at offset _offset and of _size bytes size. 
+ * The chunk is NOT '\0'-terminated.
+ */
+typedef int (pjson_callback_f)(pjson_chunk_type_e _type,
+	const void *_chunk_data, size_t _chunk_size, void *_key);
+
+/*
+ * Parse the given buffer as it were a chunk of XML data.
+ * Invoke the specified callback each time the meaningful data is found.
+ * This function returns number of bytes consumed from the buffer.
+ * It will always be lesser than or equal to the specified _size.
+ * The next invocation of this function must account the difference.
+ */
+ssize_t pjson_parse(int *_stateContext, const void *_buf, size_t _size,
+	pjson_callback_f *cb, void *_key);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _JER_SUPPORT_H_ */

Changes of Revision 644