laforge submitted this change.
SBcAP: Update as1nc skeleton and generated code
Generated using current mouse07410/vlm_master
(12b8e555b971c745ea715cb247f39120fa15f7f0) [1]
[1] https://github.com/mouse07410/asn1c/commit/12b8e555b971c745ea715cb247f39120fa15f7f0
Change-Id: I0153ecf307c99ce904ed4632422bd9d586ec3167
---
M src/sbcap/Makefile.am
M src/sbcap/gen/ANY.c
M src/sbcap/gen/BIT_STRING.c
A src/sbcap/gen/ENUMERATED.c
A src/sbcap/gen/ENUMERATED_aper.c
M src/sbcap/gen/GraphicString.c
M src/sbcap/gen/INTEGER.c
M src/sbcap/gen/INTEGER_aper.c
M src/sbcap/gen/NativeEnumerated.c
M src/sbcap/gen/NativeEnumerated_aper.c
M src/sbcap/gen/NativeInteger.c
M src/sbcap/gen/NativeInteger_rfill.c
M src/sbcap/gen/OBJECT_IDENTIFIER.c
M src/sbcap/gen/OCTET_STRING.c
M src/sbcap/gen/OCTET_STRING_aper.c
M src/sbcap/gen/OPEN_TYPE.c
M src/sbcap/gen/OPEN_TYPE_aper.c
M src/sbcap/gen/ObjectDescriptor.c
M src/sbcap/gen/aper_support.c
M src/sbcap/gen/asn_application.c
M src/sbcap/gen/asn_internal.c
M src/sbcap/gen/asn_random_fill.c
M src/sbcap/gen/constr_CHOICE.c
M src/sbcap/gen/constr_CHOICE_aper.c
M src/sbcap/gen/constr_SEQUENCE.c
M src/sbcap/gen/constr_SEQUENCE_OF.c
M src/sbcap/gen/constr_SET_OF.c
M src/sbcap/gen/constr_SET_OF_aper.c
M src/sbcap/gen/constr_TYPE.c
M src/sbcap/skel/ANY.h
M src/sbcap/skel/BIT_STRING.h
M src/sbcap/skel/BMPString.h
M src/sbcap/skel/BOOLEAN.h
M src/sbcap/skel/ENUMERATED.h
M src/sbcap/skel/GeneralString.h
M src/sbcap/skel/GeneralizedTime.h
M src/sbcap/skel/GraphicString.h
M src/sbcap/skel/IA5String.h
M src/sbcap/skel/INTEGER.h
M src/sbcap/skel/ISO646String.h
M src/sbcap/skel/NULL.h
M src/sbcap/skel/NativeEnumerated.h
M src/sbcap/skel/NativeInteger.h
M src/sbcap/skel/NativeReal.h
M src/sbcap/skel/NumericString.h
M src/sbcap/skel/OBJECT_IDENTIFIER.h
M src/sbcap/skel/OCTET_STRING.h
M src/sbcap/skel/OPEN_TYPE.h
M src/sbcap/skel/ObjectDescriptor.h
M src/sbcap/skel/PrintableString.h
M src/sbcap/skel/REAL.h
M src/sbcap/skel/RELATIVE-OID.h
M src/sbcap/skel/T61String.h
M src/sbcap/skel/TeletexString.h
M src/sbcap/skel/UTCTime.h
M src/sbcap/skel/UTF8String.h
M src/sbcap/skel/UniversalString.h
M src/sbcap/skel/VideotexString.h
M src/sbcap/skel/VisibleString.h
M src/sbcap/skel/aper_support.h
M src/sbcap/skel/asn_application.h
M src/sbcap/skel/asn_codecs_prim.h
M src/sbcap/skel/asn_system.h
M src/sbcap/skel/constr_CHOICE.h
M src/sbcap/skel/constr_SEQUENCE.h
M src/sbcap/skel/constr_SEQUENCE_OF.h
M src/sbcap/skel/constr_SET.h
M src/sbcap/skel/constr_SET_OF.h
M src/sbcap/skel/constr_TYPE.h
A src/sbcap/skel/jer_decoder.h
M src/sbcap/skel/jer_encoder.h
A src/sbcap/skel/jer_support.h
72 files changed, 1,166 insertions(+), 160 deletions(-)
diff --git a/src/sbcap/Makefile.am b/src/sbcap/Makefile.am
index b8cb5c8..0a4c471 100644
--- a/src/sbcap/Makefile.am
+++ b/src/sbcap/Makefile.am
@@ -33,6 +33,8 @@
gen/constr_SET_OF_print.c \
gen/constr_SET_OF_rfill.c \
gen/constr_TYPE.c \
+ gen/ENUMERATED.c \
+ gen/ENUMERATED_aper.c \
gen/GraphicString.c \
gen/INTEGER_aper.c \
gen/INTEGER.c \
@@ -348,7 +350,9 @@
skel/constr_TYPE.h \
skel/constraints.h \
skel/der_encoder.h \
+ skel/jer_decoder.h \
skel/jer_encoder.h \
+ skel/jer_support.h \
skel/oer_decoder.h \
skel/oer_encoder.h \
skel/oer_support.h \
diff --git a/src/sbcap/gen/ANY.c b/src/sbcap/gen/ANY.c
index bf988db..3cbe1e2 100644
--- a/src/sbcap/gen/ANY.c
+++ b/src/sbcap/gen/ANY.c
@@ -18,6 +18,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,
@@ -33,9 +34,11 @@
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/src/sbcap/gen/BIT_STRING.c b/src/sbcap/gen/BIT_STRING.c
index b5ba940..208ac14 100644
--- a/src/sbcap/gen/BIT_STRING.c
+++ b/src/sbcap/gen/BIT_STRING.c
@@ -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);
+ buf[b->size] = 0;
+
+ FREEMEM(a->buf);
+ a->buf = buf;
+ a->size = b->size;
+ a->bits_unused = b->bits_unused;
+
+ return 0;
+}
diff --git a/src/sbcap/gen/ENUMERATED.c b/src/sbcap/gen/ENUMERATED.c
new file mode 100644
index 0000000..97bc9b1
--- /dev/null
+++ b/src/sbcap/gen/ENUMERATED.c
@@ -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_tags[0]),
+ asn_DEF_ENUMERATED_tags, /* Same as above */
+ sizeof(asn_DEF_ENUMERATED_tags) / sizeof(asn_DEF_ENUMERATED_tags[0]),
+ {
+#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 */
+};
diff --git a/src/sbcap/gen/ENUMERATED_aper.c b/src/sbcap/gen/ENUMERATED_aper.c
new file mode 100644
index 0000000..58911a4
--- /dev/null
+++ b/src/sbcap/gen/ENUMERATED_aper.c
@@ -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);
+}
diff --git a/src/sbcap/gen/GraphicString.c b/src/sbcap/gen/GraphicString.c
index b761187..0f2fc39 100644
--- a/src/sbcap/gen/GraphicString.c
+++ b/src/sbcap/gen/GraphicString.c
@@ -20,6 +20,7 @@
0,
#endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */
OCTET_STRING_compare,
+ OCTET_STRING_copy,
#if !defined(ASN_DISABLE_BER_SUPPORT)
OCTET_STRING_decode_ber, /* Implemented in terms of OCTET STRING */
OCTET_STRING_encode_der,
@@ -35,9 +36,11 @@
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,
+ 0,
#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */
#if !defined(ASN_DISABLE_OER_SUPPORT)
OCTET_STRING_decode_oer,
diff --git a/src/sbcap/gen/INTEGER.c b/src/sbcap/gen/INTEGER.c
index 095063f..df2f529 100644
--- a/src/sbcap/gen/INTEGER.c
+++ b/src/sbcap/gen/INTEGER.c
@@ -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;
+}
diff --git a/src/sbcap/gen/INTEGER_aper.c b/src/sbcap/gen/INTEGER_aper.c
index fc88268..2bfa96f 100644
--- a/src/sbcap/gen/INTEGER_aper.c
+++ b/src/sbcap/gen/INTEGER_aper.c
@@ -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->buf[0], 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->buf[0], 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;
}
diff --git a/src/sbcap/gen/NativeEnumerated.c b/src/sbcap/gen/NativeEnumerated.c
index aee450c..148cb8f 100644
--- a/src/sbcap/gen/NativeEnumerated.c
+++ b/src/sbcap/gen/NativeEnumerated.c
@@ -26,6 +26,7 @@
0,
#endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */
NativeInteger_compare,
+ NativeInteger_copy,
#if !defined(ASN_DISABLE_BER_SUPPORT)
NativeInteger_decode_ber,
NativeInteger_encode_der,
@@ -41,9 +42,11 @@
0,
#endif /* !defined(ASN_DISABLE_XER_SUPPORT) */
#if !defined(ASN_DISABLE_JER_SUPPORT)
+ NativeEnumerated_decode_jer,
NativeEnumerated_encode_jer,
#else
0,
+ 0,
#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */
#if !defined(ASN_DISABLE_OER_SUPPORT)
NativeEnumerated_decode_oer,
diff --git a/src/sbcap/gen/NativeEnumerated_aper.c b/src/sbcap/gen/NativeEnumerated_aper.c
index 5c4c256..bd205b1 100644
--- a/src/sbcap/gen/NativeEnumerated_aper.c
+++ b/src/sbcap/gen/NativeEnumerated_aper.c
@@ -64,7 +64,7 @@
*/
/* XXX handle indefinite index length > 64k */
- value = aper_get_nsnnwn(pd, 65537);
+ value = aper_get_nsnnwn(pd);
if(value < 0) ASN__DECODE_STARVED;
value += specs->extension - 1;
//if(value >= specs->map_count)
@@ -148,9 +148,7 @@
ASN_DEBUG("value = %ld, ext = %d, inext = %d, res = %ld",
value, specs->extension, inext,
value - (inext ? (specs->extension - 1) : 0));
- if(aper_put_nsnnwn(po,
- ct->upper_bound - ct->lower_bound + 1,
- value - (inext ? (specs->extension - 1) : 0)))
+ if(aper_put_nsnnwn(po, value - (inext ? (specs->extension - 1) : 0)))
ASN__ENCODE_FAILED;
ASN__ENCODED_OK(er);
diff --git a/src/sbcap/gen/NativeInteger.c b/src/sbcap/gen/NativeInteger.c
index f0309b0..8957b65 100644
--- a/src/sbcap/gen/NativeInteger.c
+++ b/src/sbcap/gen/NativeInteger.c
@@ -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;
+}
diff --git a/src/sbcap/gen/NativeInteger_rfill.c b/src/sbcap/gen/NativeInteger_rfill.c
index 0e2cee8..fddd149 100644
--- a/src/sbcap/gen/NativeInteger_rfill.c
+++ b/src/sbcap/gen/NativeInteger_rfill.c
@@ -63,8 +63,10 @@
0, sizeof(variants) / sizeof(variants[0]) - 1)];
}
- if(!constraints) constraints = &td->encoding_constraints;
#if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT)
+ if(!constraints || !constraints->per_constraints)
+ constraints = &td->encoding_constraints;
+
const asn_per_constraints_t *ct;
ct = constraints ? constraints->per_constraints : 0;
@@ -74,6 +76,8 @@
ct->value.upper_bound);
}
}
+#else
+ if(!constraints) constraints = &td->encoding_constraints;
#endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */
}
diff --git a/src/sbcap/gen/OBJECT_IDENTIFIER.c b/src/sbcap/gen/OBJECT_IDENTIFIER.c
index 5cf2d60..c5ab38e 100644
--- a/src/sbcap/gen/OBJECT_IDENTIFIER.c
+++ b/src/sbcap/gen/OBJECT_IDENTIFIER.c
@@ -24,6 +24,7 @@
0,
#endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */
OCTET_STRING_compare, /* Implemented in terms of a string comparison */
+ OCTET_STRING_copy, /* Implemented in terms of a string copy */
#if !defined(ASN_DISABLE_BER_SUPPORT)
ber_decode_primitive,
der_encode_primitive,
@@ -39,9 +40,11 @@
0,
#endif /* !defined(ASN_DISABLE_XER_SUPPORT) */
#if !defined(ASN_DISABLE_JER_SUPPORT)
+ OBJECT_IDENTIFIER_decode_jer,
OBJECT_IDENTIFIER_encode_jer,
#else
0,
+ 0,
#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */
#if !defined(ASN_DISABLE_OER_SUPPORT)
OBJECT_IDENTIFIER_decode_oer,
diff --git a/src/sbcap/gen/OCTET_STRING.c b/src/sbcap/gen/OCTET_STRING.c
index d0bdead..fc983b4 100644
--- a/src/sbcap/gen/OCTET_STRING.c
+++ b/src/sbcap/gen/OCTET_STRING.c
@@ -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,
diff --git a/src/sbcap/gen/OCTET_STRING_aper.c b/src/sbcap/gen/OCTET_STRING_aper.c
index 0373fe6..2601383 100644
--- a/src/sbcap/gen/OCTET_STRING_aper.c
+++ b/src/sbcap/gen/OCTET_STRING_aper.c
@@ -179,7 +179,6 @@
raw_len = aper_get_length(pd, csiz->lower_bound, csiz->upper_bound,
csiz->effective_bits, &repeat);
if(raw_len < 0) RETURN(RC_WMORE);
- raw_len += csiz->lower_bound;
ASN_DEBUG("Got PER length eb %ld, len %ld, %s (%s)",
(long)csiz->effective_bits, (long)raw_len,
diff --git a/src/sbcap/gen/OPEN_TYPE.c b/src/sbcap/gen/OPEN_TYPE.c
index c9afecf..75f9b95 100644
--- a/src/sbcap/gen/OPEN_TYPE.c
+++ b/src/sbcap/gen/OPEN_TYPE.c
@@ -14,6 +14,7 @@
0,
#endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */
OPEN_TYPE_compare,
+ OPEN_TYPE_copy,
#if !defined(ASN_DISABLE_BER_SUPPORT)
OPEN_TYPE_decode_ber,
OPEN_TYPE_encode_der,
@@ -29,9 +30,11 @@
0,
#endif /* !defined(ASN_DISABLE_XER_SUPPORT) */
#if !defined(ASN_DISABLE_JER_SUPPORT)
+ OPEN_TYPE_decode_jer,
OPEN_TYPE_encode_jer,
#else
0,
+ 0,
#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */
#if !defined(ASN_DISABLE_OER_SUPPORT)
OPEN_TYPE_decode_oer,
diff --git a/src/sbcap/gen/OPEN_TYPE_aper.c b/src/sbcap/gen/OPEN_TYPE_aper.c
index 3e2ab18..78799ff 100644
--- a/src/sbcap/gen/OPEN_TYPE_aper.c
+++ b/src/sbcap/gen/OPEN_TYPE_aper.c
@@ -53,7 +53,8 @@
(char *)*memb_ptr2
+ elm->type->elements[selected.presence_index - 1].memb_offset;
- rv = aper_open_type_get(opt_codec_ctx, selected.type_descriptor, NULL,
+ rv = aper_open_type_get(opt_codec_ctx, selected.type_descriptor,
+ elm->type->elements[selected.presence_index - 1].encoding_constraints.per_constraints,
&inner_value, pd);
switch(rv.code) {
case RC_OK:
@@ -110,7 +111,7 @@
memb_ptr = (const char *)sptr + elm->memb_offset;
}
- if(aper_open_type_put(elm->type, NULL, memb_ptr, po) < 0) {
+ if(aper_open_type_put(elm->type, elm->encoding_constraints.per_constraints, memb_ptr, po) < 0) {
ASN__ENCODE_FAILED;
}
diff --git a/src/sbcap/gen/ObjectDescriptor.c b/src/sbcap/gen/ObjectDescriptor.c
index c311a92..4b3560a 100644
--- a/src/sbcap/gen/ObjectDescriptor.c
+++ b/src/sbcap/gen/ObjectDescriptor.c
@@ -20,6 +20,7 @@
0,
#endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */
OCTET_STRING_compare,
+ OCTET_STRING_copy,
#if !defined(ASN_DISABLE_BER_SUPPORT)
OCTET_STRING_decode_ber, /* Implemented in terms of OCTET STRING */
OCTET_STRING_encode_der,
@@ -35,9 +36,11 @@
0,
#endif /* !defined(ASN_DISABLE_XER_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)
0,
diff --git a/src/sbcap/gen/aper_support.c b/src/sbcap/gen/aper_support.c
index 1f34c60..6731c1c 100644
--- a/src/sbcap/gen/aper_support.c
+++ b/src/sbcap/gen/aper_support.c
@@ -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);
- /* handle indefinite range */
- length = per_get_few_bits(pd, 1);
- if (length == 0)
- return per_get_few_bits(pd, 6);
-
- if (aper_get_align(pd) < 0)
- return -1;
-
- length = per_get_few_bits(pd, 8);
- /* the length is not likely to be that big */
- if (length > 4)
- return -1;
- value = 0;
- if (per_get_many_bits(pd, (uint8_t *)&value, 0, length * 8) < 0)
- return -1;
- return value;
- }
if (aper_get_align(pd) < 0)
return -1;
- value = per_get_few_bits(pd, 8 * bytes);
- return value;
+
+ /* 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);
+}
+
+/* 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;
+ }
+
+ /* 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;
+ }
+
+ /* X.691 2002 10.5.7.3 - The two-octet case. */
+ if (range <= 65536) {
+ if (aper_get_align(pd))
+ return -1;
+ value = per_get_few_bits(pd, 16);
+ if (value < 0 || value >= range)
+ return -1;
+ return value + lb;
+ }
+
+ /* 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;
+ 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 with range %d", number, range);
- /* 10.5.7.1 X.691 */
- if(range < 0) {
- int i;
- for (i = 1; ; i++) {
- int bits = 1 << (8 * i);
- if (number <= bits)
- break;
- }
- bytes = i;
- assert(i <= 4);
+ 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);
}
- if(range <= 255) {
+
+ 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 <= 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)
- return -1;
- bytes = 2;
- } else { /* Ranges > 64K */
- int i;
- for (i = 1; ; i++) {
+ for (i = 3; ; i++) {
int bits = 1 << (8 * i);
- if (range <= bits)
+ if (number < bits)
break;
}
- assert(i <= 4);
- bytes = i;
+ len = i;
+ }
+
+ 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;
+ 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;
-*/
- return per_put_few_bits(po, number, 8 * bytes);
+
+ /* 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, value, value_len * 8);
}
diff --git a/src/sbcap/gen/asn_application.c b/src/sbcap/gen/asn_application.c
index 7992185..4309593 100644
--- a/src/sbcap/gen/asn_application.c
+++ b/src/sbcap/gen/asn_application.c
@@ -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) */
}
}
diff --git a/src/sbcap/gen/asn_internal.c b/src/sbcap/gen/asn_internal.c
index c2a8108..1b28266 100644
--- a/src/sbcap/gen/asn_internal.c
+++ b/src/sbcap/gen/asn_internal.c
@@ -26,7 +26,9 @@
buf_size <<= 1;
if(buf == scratch) {
buf = MALLOC(buf_size);
- if(!buf) return -1;
+ if(!buf) {
+ return -1;
+ }
} else {
void *p = REALLOC(buf, buf_size);
if(!p) {
diff --git a/src/sbcap/gen/asn_random_fill.c b/src/sbcap/gen/asn_random_fill.c
index 2965362..4d14cbf 100644
--- a/src/sbcap/gen/asn_random_fill.c
+++ b/src/sbcap/gen/asn_random_fill.c
@@ -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
}
diff --git a/src/sbcap/gen/constr_CHOICE.c b/src/sbcap/gen/constr_CHOICE.c
index 5f52e3d..2a20583 100644
--- a/src/sbcap/gen/constr_CHOICE.c
+++ b/src/sbcap/gen/constr_CHOICE.c
@@ -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->elements[present];
+ 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.
diff --git a/src/sbcap/gen/constr_CHOICE_aper.c b/src/sbcap/gen/constr_CHOICE_aper.c
index 41040aa..0f07423 100644
--- a/src/sbcap/gen/constr_CHOICE_aper.c
+++ b/src/sbcap/gen/constr_CHOICE_aper.c
@@ -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))
diff --git a/src/sbcap/gen/constr_SEQUENCE.c b/src/sbcap/gen/constr_SEQUENCE.c
index 8397d0c..a77b68f 100644
--- a/src/sbcap/gen/constr_SEQUENCE.c
+++ b/src/sbcap/gen/constr_SEQUENCE.c
@@ -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++) {
@@ -195,3 +199,53 @@
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->elements[edx];
+ 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;
+}
diff --git a/src/sbcap/gen/constr_SEQUENCE_OF.c b/src/sbcap/gen/constr_SEQUENCE_OF.c
index 9c5d6cd..6ec3888 100644
--- a/src/sbcap/gen/constr_SEQUENCE_OF.c
+++ b/src/sbcap/gen/constr_SEQUENCE_OF.c
@@ -15,6 +15,7 @@
0,
#endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */
SEQUENCE_OF_compare,
+ SEQUENCE_OF_copy,
#if !defined(ASN_DISABLE_BER_SUPPORT)
SEQUENCE_OF_decode_ber,
SEQUENCE_OF_encode_der,
@@ -30,9 +31,11 @@
0,
#endif /* !defined(ASN_DISABLE_XER_SUPPORT) */
#if !defined(ASN_DISABLE_JER_SUPPORT)
+ SEQUENCE_OF_decode_jer,
SEQUENCE_OF_encode_jer,
#else
0,
+ 0,
#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */
#if !defined(ASN_DISABLE_OER_SUPPORT)
SEQUENCE_OF_decode_oer, /* Same as SET OF decoder. */
diff --git a/src/sbcap/gen/constr_SET_OF.c b/src/sbcap/gen/constr_SET_OF.c
index 97a7cac..f5cc3ba 100644
--- a/src/sbcap/gen/constr_SET_OF.c
+++ b/src/sbcap/gen/constr_SET_OF.c
@@ -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,
@@ -369,3 +372,58 @@
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->array[0]));
+ 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->array[i];
+ 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->array[i] = amemb;
+ } else {
+ a->array[i] = 0;
+ }
+ }
+ }
+
+ return 0;
+}
diff --git a/src/sbcap/gen/constr_SET_OF_aper.c b/src/sbcap/gen/constr_SET_OF_aper.c
index 87c341e..f959b17 100644
--- a/src/sbcap/gen/constr_SET_OF_aper.c
+++ b/src/sbcap/gen/constr_SET_OF_aper.c
@@ -129,13 +129,12 @@
if(value) ct = 0; /* Not restricted! */
}
- if(ct && ct->effective_bits >= 0) {
+ if(ct && ct->upper_bound >= 1 && ct->upper_bound <= 65535
+ && ct->upper_bound == ct->lower_bound) {
/* X.691, #19.5: No length determinant */
- nelems = aper_get_nsnnwn(pd, ct->upper_bound - ct->lower_bound + 1);
- ASN_DEBUG("Preparing to fetch %ld+%lld elements from %s",
- (long)nelems, (long long int)ct->lower_bound, td->name);
- if(nelems < 0) ASN__DECODE_STARVED;
- nelems += ct->lower_bound;
+ nelems = ct->upper_bound;
+ ASN_DEBUG("Preparing to fetch %ld elements from %s",
+ (long)nelems, td->name);
} else {
nelems = -1;
}
diff --git a/src/sbcap/gen/constr_TYPE.c b/src/sbcap/gen/constr_TYPE.c
index e634e75..5f0212b 100644
--- a/src/sbcap/gen/constr_TYPE.c
+++ b/src/sbcap/gen/constr_TYPE.c
@@ -9,7 +9,7 @@
/*
* Version of the ASN.1 infrastructure shipped with compiler.
*/
-int get_asn1c_environment_version() { return ASN1C_ENVIRONMENT_VERSION; }
+int get_asn1c_environment_version(void) { return ASN1C_ENVIRONMENT_VERSION; }
static asn_app_consume_bytes_f _print2fp;
@@ -54,6 +54,26 @@
return fflush(stream);
}
+/*
+ * Copy a structuture.
+ */
+int
+asn_copy(const asn_TYPE_descriptor_t *td,
+ void **struct_dst, const void *struct_src) {
+
+ if(!td || !struct_dst || !struct_src) {
+ errno = EINVAL;
+ return -1;
+ }
+
+ if(!td->op) {
+ errno = ENOSYS;
+ return -1;
+ }
+
+ return td->op->copy_struct(td, struct_dst, struct_src);
+}
+
/* Dump the data into the specified stdio stream */
static int
_print2fp(const void *buffer, size_t size, void *app_key) {
diff --git a/src/sbcap/skel/ANY.h b/src/sbcap/skel/ANY.h
index 871ed5e..6434aab 100644
--- a/src/sbcap/skel/ANY.h
+++ b/src/sbcap/skel/ANY.h
@@ -29,6 +29,7 @@
#endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */
#define ANY_compare OCTET_STRING_compare
+#define ANY_copy OCTET_STRING_copy
#define ANY_constraint asn_generic_no_constraint
@@ -43,6 +44,7 @@
#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/src/sbcap/skel/BIT_STRING.h b/src/sbcap/skel/BIT_STRING.h
index e755fe9..0b71feb 100644
--- a/src/sbcap/skel/BIT_STRING.h
+++ b/src/sbcap/skel/BIT_STRING.h
@@ -31,6 +31,7 @@
#endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */
asn_struct_compare_f BIT_STRING_compare;
+asn_struct_copy_f BIT_STRING_copy;
asn_constr_check_f BIT_STRING_constraint;
@@ -45,6 +46,7 @@
#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/src/sbcap/skel/BMPString.h b/src/sbcap/skel/BMPString.h
index 1707a9e..3b32cf3 100644
--- a/src/sbcap/skel/BMPString.h
+++ b/src/sbcap/skel/BMPString.h
@@ -28,6 +28,7 @@
#endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */
#define BMPString_compare OCTET_STRING_compare
+#define BMPString_copy OCTET_STRING_copy
asn_constr_check_f BMPString_constraint;
@@ -42,6 +43,7 @@
#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/src/sbcap/skel/BOOLEAN.h b/src/sbcap/skel/BOOLEAN.h
index 2cbbe71..8b9b496 100644
--- a/src/sbcap/skel/BOOLEAN.h
+++ b/src/sbcap/skel/BOOLEAN.h
@@ -28,6 +28,7 @@
#endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */
asn_struct_compare_f BOOLEAN_compare;
+asn_struct_copy_f BOOLEAN_copy;
#define BOOLEAN_constraint asn_generic_no_constraint
@@ -42,6 +43,7 @@
#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/src/sbcap/skel/ENUMERATED.h b/src/sbcap/skel/ENUMERATED.h
index d3983de..b151903 100644
--- a/src/sbcap/skel/ENUMERATED.h
+++ b/src/sbcap/skel/ENUMERATED.h
@@ -23,6 +23,7 @@
#endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */
#define ENUMERATED_compare INTEGER_compare
+#define ENUMERATED_copy INTEGER_copy
#define ENUMERATED_constraint asn_generic_no_constraint
@@ -37,6 +38,7 @@
#endif /* !defined(ASN_DISABLE_XER_SUPPORT) */
#if !defined(ASN_DISABLE_JER_SUPPORT)
+jer_type_decoder_f ENUMERATED_decode_jer;
#define ENUMERATED_encode_jer INTEGER_encode_jer
#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */
diff --git a/src/sbcap/skel/GeneralString.h b/src/sbcap/skel/GeneralString.h
index 418e66b..2815245 100644
--- a/src/sbcap/skel/GeneralString.h
+++ b/src/sbcap/skel/GeneralString.h
@@ -23,6 +23,7 @@
#endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */
#define GeneralString_compare OCTET_STRING_compare
+#define GeneralString_copy OCTET_STRING_copy
#define GeneralString_constraint asn_generic_unknown_constraint
@@ -37,6 +38,7 @@
#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/src/sbcap/skel/GeneralizedTime.h b/src/sbcap/skel/GeneralizedTime.h
index 2a86f7a..8a00738 100644
--- a/src/sbcap/skel/GeneralizedTime.h
+++ b/src/sbcap/skel/GeneralizedTime.h
@@ -23,6 +23,7 @@
#endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */
asn_struct_compare_f GeneralizedTime_compare;
+#define GeneralizedTime_copy OCTET_STRING_copy
asn_constr_check_f GeneralizedTime_constraint;
@@ -37,6 +38,7 @@
#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/src/sbcap/skel/GraphicString.h b/src/sbcap/skel/GraphicString.h
index 807e9d6..9368e50 100644
--- a/src/sbcap/skel/GraphicString.h
+++ b/src/sbcap/skel/GraphicString.h
@@ -23,6 +23,7 @@
#endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */
#define GraphicString_compare OCTET_STRING_compare
+#define GraphicString_copy OCTET_STRING_copy
#define GraphicString_constraint asn_generic_unknown_constraint
@@ -37,6 +38,7 @@
#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/src/sbcap/skel/IA5String.h b/src/sbcap/skel/IA5String.h
index 195f474..0a408a5 100644
--- a/src/sbcap/skel/IA5String.h
+++ b/src/sbcap/skel/IA5String.h
@@ -26,6 +26,7 @@
#endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */
#define IA5String_compare OCTET_STRING_compare
+#define IA5String_copy OCTET_STRING_copy
asn_constr_check_f IA5String_constraint;
@@ -40,6 +41,7 @@
#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/src/sbcap/skel/INTEGER.h b/src/sbcap/skel/INTEGER.h
index 1666e0b..5fa1c7b 100644
--- a/src/sbcap/skel/INTEGER.h
+++ b/src/sbcap/skel/INTEGER.h
@@ -47,6 +47,7 @@
#endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */
asn_struct_compare_f INTEGER_compare;
+asn_struct_copy_f INTEGER_copy;
#define INTEGER_constraint asn_generic_no_constraint
@@ -61,6 +62,7 @@
#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) */
@@ -106,6 +108,8 @@
int asn_INTEGER2ulong(const INTEGER_t *i, unsigned long *l);
int asn_long2INTEGER(INTEGER_t *i, long l);
int asn_ulong2INTEGER(INTEGER_t *i, unsigned long l);
+int asn_INTEGER2int64(const INTEGER_t *i, int64_t *l);
+int asn_INTEGER2uint64(const INTEGER_t *i, uint64_t *l);
int asn_int642INTEGER(INTEGER_t *i, int64_t l);
int asn_uint642INTEGER(INTEGER_t *i, uint64_t l);
diff --git a/src/sbcap/skel/ISO646String.h b/src/sbcap/skel/ISO646String.h
index 76757d5..76382d7 100644
--- a/src/sbcap/skel/ISO646String.h
+++ b/src/sbcap/skel/ISO646String.h
@@ -24,6 +24,7 @@
#endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */
#define ISO646String_compare OCTET_STRING_compare
+#define ISO646String_copy OCTET_STRING_copy
#define ISO646String_constraint VisibleString_constraint
@@ -38,6 +39,7 @@
#endif /* !defined(ASN_DISABLE_XER_SUPPORT) */
#if !defined(ASN_DISABLE_JER_SUPPORT)
+#define ISO646String_decode_jer OCTET_STRING_decode_jer_utf8
#define ISO646String_encode_jer OCTET_STRING_encode_jer_utf8
#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */
diff --git a/src/sbcap/skel/NULL.h b/src/sbcap/skel/NULL.h
index 7264475..ca9d6fa 100644
--- a/src/sbcap/skel/NULL.h
+++ b/src/sbcap/skel/NULL.h
@@ -27,6 +27,7 @@
#endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */
asn_struct_compare_f NULL_compare;
+asn_struct_copy_f NULL_copy;
#define NULL_constraint asn_generic_no_constraint
@@ -41,6 +42,7 @@
#endif /* !defined(ASN_DISABLE_XER_SUPPORT) */
#if !defined(ASN_DISABLE_JER_SUPPORT)
+jer_type_decoder_f NULL_decode_jer;
jer_type_encoder_f NULL_encode_jer;
#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */
diff --git a/src/sbcap/skel/NativeEnumerated.h b/src/sbcap/skel/NativeEnumerated.h
index 0c711e3..8c045e5 100644
--- a/src/sbcap/skel/NativeEnumerated.h
+++ b/src/sbcap/skel/NativeEnumerated.h
@@ -13,6 +13,7 @@
#define _NativeEnumerated_H_
#include <NativeInteger.h>
+#include <ENUMERATED.h>
#ifdef __cplusplus
extern "C" {
@@ -28,6 +29,7 @@
#endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */
#define NativeEnumerated_compare NativeInteger_compare
+#define NativeEnumerated_copy NativeInteger_copy
#define NativeEnumerated_constraint asn_generic_no_constraint
@@ -42,6 +44,7 @@
#endif /* !defined(ASN_DISABLE_XER_SUPPORT) */
#if !defined(ASN_DISABLE_JER_SUPPORT)
+jer_type_decoder_f NativeEnumerated_decode_jer;
jer_type_encoder_f NativeEnumerated_encode_jer;
#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */
diff --git a/src/sbcap/skel/NativeInteger.h b/src/sbcap/skel/NativeInteger.h
index 3a47c11..352926b 100644
--- a/src/sbcap/skel/NativeInteger.h
+++ b/src/sbcap/skel/NativeInteger.h
@@ -29,6 +29,7 @@
#endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */
asn_struct_compare_f NativeInteger_compare;
+asn_struct_copy_f NativeInteger_copy;
#define NativeInteger_constraint asn_generic_no_constraint
@@ -43,6 +44,7 @@
#endif /* !defined(ASN_DISABLE_XER_SUPPORT) */
#if !defined(ASN_DISABLE_JER_SUPPORT)
+jer_type_decoder_f NativeInteger_decode_jer;
jer_type_encoder_f NativeInteger_encode_jer;
#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */
diff --git a/src/sbcap/skel/NativeReal.h b/src/sbcap/skel/NativeReal.h
index 513876e..2007fbd 100644
--- a/src/sbcap/skel/NativeReal.h
+++ b/src/sbcap/skel/NativeReal.h
@@ -37,6 +37,7 @@
#endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */
asn_struct_compare_f NativeReal_compare;
+asn_struct_copy_f NativeReal_copy;
#define NativeReal_constraint asn_generic_no_constraint
@@ -51,6 +52,7 @@
#endif /* !defined(ASN_DISABLE_XER_SUPPORT) */
#if !defined(ASN_DISABLE_JER_SUPPORT)
+jer_type_decoder_f NativeReal_decode_jer;
jer_type_encoder_f NativeReal_encode_jer;
#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */
diff --git a/src/sbcap/skel/NumericString.h b/src/sbcap/skel/NumericString.h
index 76b0553..c0c1210 100644
--- a/src/sbcap/skel/NumericString.h
+++ b/src/sbcap/skel/NumericString.h
@@ -23,6 +23,7 @@
#endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */
#define NumericString_compare OCTET_STRING_compare
+#define NumericString_copy OCTET_STRING_copy
asn_constr_check_f NumericString_constraint;
@@ -37,6 +38,7 @@
#endif /* !defined(ASN_DISABLE_XER_SUPPORT) */
#if !defined(ASN_DISABLE_JER_SUPPORT)
+#define NumericString_decode_jer OCTET_STRING_decode_jer_utf8
#define NumericString_encode_jer OCTET_STRING_encode_jer_utf8
#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */
diff --git a/src/sbcap/skel/OBJECT_IDENTIFIER.h b/src/sbcap/skel/OBJECT_IDENTIFIER.h
index f878055..cef8c6c 100644
--- a/src/sbcap/skel/OBJECT_IDENTIFIER.h
+++ b/src/sbcap/skel/OBJECT_IDENTIFIER.h
@@ -32,6 +32,7 @@
#endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */
#define OBJECT_IDENTIFIER_compare OCTET_STRING_compare
+#define OBJECT_IDENTIFIER_copy OCTET_STRING_copy
asn_constr_check_f OBJECT_IDENTIFIER_constraint;
@@ -46,6 +47,7 @@
#endif /* !defined(ASN_DISABLE_XER_SUPPORT) */
#if !defined(ASN_DISABLE_JER_SUPPORT)
+jer_type_decoder_f OBJECT_IDENTIFIER_decode_jer;
jer_type_encoder_f OBJECT_IDENTIFIER_encode_jer;
#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */
diff --git a/src/sbcap/skel/OCTET_STRING.h b/src/sbcap/skel/OCTET_STRING.h
index b1ace14..1340865 100644
--- a/src/sbcap/skel/OCTET_STRING.h
+++ b/src/sbcap/skel/OCTET_STRING.h
@@ -29,6 +29,7 @@
#endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */
asn_struct_compare_f OCTET_STRING_compare;
+asn_struct_copy_f OCTET_STRING_copy;
#define OCTET_STRING_constraint asn_generic_no_constraint
@@ -46,6 +47,8 @@
#endif /* !defined(ASN_DISABLE_XER_SUPPORT) */
#if !defined(ASN_DISABLE_JER_SUPPORT)
+jer_type_decoder_f OCTET_STRING_decode_jer_hex; /* Hexadecimal */
+jer_type_decoder_f OCTET_STRING_decode_jer_utf8; /* ASCII/UTF-8 */
jer_type_encoder_f OCTET_STRING_encode_jer;
jer_type_encoder_f OCTET_STRING_encode_jer_utf8;
#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */
diff --git a/src/sbcap/skel/OPEN_TYPE.h b/src/sbcap/skel/OPEN_TYPE.h
index 5e97977..c4b5d1b 100644
--- a/src/sbcap/skel/OPEN_TYPE.h
+++ b/src/sbcap/skel/OPEN_TYPE.h
@@ -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)
diff --git a/src/sbcap/skel/ObjectDescriptor.h b/src/sbcap/skel/ObjectDescriptor.h
index 852c45d..b70c0cb 100644
--- a/src/sbcap/skel/ObjectDescriptor.h
+++ b/src/sbcap/skel/ObjectDescriptor.h
@@ -35,6 +35,7 @@
#endif /* !defined(ASN_DISABLE_XER_SUPPORT) */
#if !defined(ASN_DISABLE_JER_SUPPORT)
+#define ObjectDescriptor_decode_jer OCTET_STRING_decode_jer_utf8
#define ObjectDescriptor_encode_jer OCTET_STRING_encode_jer_utf8
#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */
diff --git a/src/sbcap/skel/PrintableString.h b/src/sbcap/skel/PrintableString.h
index c24861d..aa37f39 100644
--- a/src/sbcap/skel/PrintableString.h
+++ b/src/sbcap/skel/PrintableString.h
@@ -23,6 +23,7 @@
#endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */
#define PrintableString_compare OCTET_STRING_compare
+#define PrintableString_copy OCTET_STRING_copy
asn_constr_check_f PrintableString_constraint;
@@ -37,6 +38,7 @@
#endif /* !defined(ASN_DISABLE_XER_SUPPORT) */
#if !defined(ASN_DISABLE_JER_SUPPORT)
+#define PrintableString_decode_jer OCTET_STRING_decode_jer_utf8
#define PrintableString_encode_jer OCTET_STRING_encode_jer_utf8
#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */
diff --git a/src/sbcap/skel/REAL.h b/src/sbcap/skel/REAL.h
index 2f8bf47..2aa470e 100644
--- a/src/sbcap/skel/REAL.h
+++ b/src/sbcap/skel/REAL.h
@@ -54,6 +54,7 @@
#endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */
asn_struct_compare_f REAL_compare;
+asn_struct_copy_f REAL_copy;
#define REAL_constraint asn_generic_no_constraint
@@ -68,6 +69,7 @@
#endif /* !defined(ASN_DISABLE_XER_SUPPORT) */
#if !defined(ASN_DISABLE_JER_SUPPORT)
+jer_type_decoder_f REAL_decode_jer;
jer_type_encoder_f REAL_encode_jer;
#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */
diff --git a/src/sbcap/skel/RELATIVE-OID.h b/src/sbcap/skel/RELATIVE-OID.h
index 67deba4..4246fea 100644
--- a/src/sbcap/skel/RELATIVE-OID.h
+++ b/src/sbcap/skel/RELATIVE-OID.h
@@ -28,6 +28,7 @@
#endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */
#define RELATIVE_OID_compare OCTET_STRING_compare
+#define RELATIVE_OID_copy OCTET_STRING_copy
#define RELATIVE_OID_constraint asn_generic_no_constraint
@@ -42,6 +43,7 @@
#endif /* !defined(ASN_DISABLE_XER_SUPPORT) */
#if !defined(ASN_DISABLE_JER_SUPPORT)
+jer_type_decoder_f RELATIVE_OID_decode_jer;
jer_type_encoder_f RELATIVE_OID_encode_jer;
#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */
diff --git a/src/sbcap/skel/T61String.h b/src/sbcap/skel/T61String.h
index 6b724d8..640b1f5 100644
--- a/src/sbcap/skel/T61String.h
+++ b/src/sbcap/skel/T61String.h
@@ -23,6 +23,7 @@
#endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */
#define T61String_compare OCTET_STRING_compare
+#define T61String_copy OCTET_STRING_copy
#define T61String_constraint asn_generic_unknown_constraint
@@ -37,6 +38,7 @@
#endif /* !defined(ASN_DISABLE_XER_SUPPORT) */
#if !defined(ASN_DISABLE_JER_SUPPORT)
+#define T61String_decode_jer OCTET_STRING_decode_jer_hex
#define T61String_encode_jer OCTET_STRING_encode_jer
#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */
diff --git a/src/sbcap/skel/TeletexString.h b/src/sbcap/skel/TeletexString.h
index 1be8c9e..e8ec031 100644
--- a/src/sbcap/skel/TeletexString.h
+++ b/src/sbcap/skel/TeletexString.h
@@ -23,6 +23,7 @@
#endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */
#define TeletexString_compare OCTET_STRING_compare
+#define TeletexString_copy OCTET_STRING_copy
#define TeletexString_constraint asn_generic_unknown_constraint
@@ -37,6 +38,7 @@
#endif /* !defined(ASN_DISABLE_XER_SUPPORT) */
#if !defined(ASN_DISABLE_JER_SUPPORT)
+#define TeletexString_decode_jer OCTET_STRING_decode_jer_hex
#define TeletexString_encode_jer OCTET_STRING_encode_jer
#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */
diff --git a/src/sbcap/skel/UTCTime.h b/src/sbcap/skel/UTCTime.h
index 4dd05f5..bdcf1a9 100644
--- a/src/sbcap/skel/UTCTime.h
+++ b/src/sbcap/skel/UTCTime.h
@@ -23,6 +23,7 @@
#endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */
asn_struct_compare_f UTCTime_compare;
+#define UTCTime_copy OCTET_STRING_copy
asn_constr_check_f UTCTime_constraint;
@@ -37,6 +38,7 @@
#endif /* !defined(ASN_DISABLE_XER_SUPPORT) */
#if !defined(ASN_DISABLE_JER_SUPPORT)
+#define UTCTime_decode_jer OCTET_STRING_decode_jer_utf8
jer_type_encoder_f UTCTime_encode_jer;
#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */
diff --git a/src/sbcap/skel/UTF8String.h b/src/sbcap/skel/UTF8String.h
index 3a31def..e1fefee 100644
--- a/src/sbcap/skel/UTF8String.h
+++ b/src/sbcap/skel/UTF8String.h
@@ -23,6 +23,7 @@
#endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */
#define UTF8String_compare OCTET_STRING_compare
+#define UTF8String_copy OCTET_STRING_copy
asn_constr_check_f UTF8String_constraint;
@@ -37,6 +38,7 @@
#endif /* !defined(ASN_DISABLE_XER_SUPPORT) */
#if !defined(ASN_DISABLE_JER_SUPPORT)
+#define UTF8String_decode_jer OCTET_STRING_decode_jer_utf8
#define UTF8String_encode_jer OCTET_STRING_encode_jer_utf8
#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */
diff --git a/src/sbcap/skel/UniversalString.h b/src/sbcap/skel/UniversalString.h
index e7f6856..3bddfbf 100644
--- a/src/sbcap/skel/UniversalString.h
+++ b/src/sbcap/skel/UniversalString.h
@@ -24,6 +24,7 @@
#endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */
#define UniversalString_compare OCTET_STRING_compare
+#define UniversalString_copy OCTET_STRING_copy
asn_constr_check_f UniversalString_constraint;
@@ -38,6 +39,7 @@
#endif /* !defined(ASN_DISABLE_XER_SUPPORT) */
#if !defined(ASN_DISABLE_JER_SUPPORT)
+jer_type_decoder_f UniversalString_decode_jer;
jer_type_encoder_f UniversalString_encode_jer;
#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */
diff --git a/src/sbcap/skel/VideotexString.h b/src/sbcap/skel/VideotexString.h
index ec9b7dd..ea991df 100644
--- a/src/sbcap/skel/VideotexString.h
+++ b/src/sbcap/skel/VideotexString.h
@@ -23,6 +23,7 @@
#endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */
#define VideotexString_compare OCTET_STRING_compare
+#define VideotexString_copy OCTET_STRING_copy
#define VideotexString_constraint asn_generic_unknown_constraint
@@ -37,6 +38,7 @@
#endif /* !defined(ASN_DISABLE_XER_SUPPORT) */
#if !defined(ASN_DISABLE_JER_SUPPORT)
+#define VideotexString_decode_jer OCTET_STRING_decode_jer_hex
#define VideotexString_encode_jer OCTET_STRING_encode_jer
#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */
diff --git a/src/sbcap/skel/VisibleString.h b/src/sbcap/skel/VisibleString.h
index 4ed5763..013f12f 100644
--- a/src/sbcap/skel/VisibleString.h
+++ b/src/sbcap/skel/VisibleString.h
@@ -23,6 +23,7 @@
#endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */
#define VisibleString_compare OCTET_STRING_compare
+#define VisibleString_copy OCTET_STRING_copy
asn_constr_check_f VisibleString_constraint;
@@ -37,6 +38,7 @@
#endif /* !defined(ASN_DISABLE_XER_SUPPORT) */
#if !defined(ASN_DISABLE_JER_SUPPORT)
+#define VisibleString_decode_jer OCTET_STRING_decode_jer_hex
#define VisibleString_encode_jer OCTET_STRING_encode_jer
#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */
diff --git a/src/sbcap/skel/aper_support.h b/src/sbcap/skel/aper_support.h
index a372445..62d3790 100644
--- a/src/sbcap/skel/aper_support.h
+++ b/src/sbcap/skel/aper_support.h
@@ -27,7 +27,12 @@
/*
* Get the normally small non-negative whole number.
*/
-ssize_t aper_get_nsnnwn(asn_per_data_t *pd, int range);
+ssize_t aper_get_nsnnwn(asn_per_data_t *pd);
+
+/*
+ * Get the constrained whole number.
+ */
+long aper_get_constrained_whole_number(asn_per_data_t *po, long lb, long ub);
/*
* X.691 (08/2015) #11.9 "General rules for encoding a length determinant"
@@ -54,7 +59,12 @@
/*
* Put the normally small non-negative whole number.
*/
-int aper_put_nsnnwn(asn_per_outp_t *po, int range, int number);
+int aper_put_nsnnwn(asn_per_outp_t *po, int number);
+
+/*
+ * Put the constrained whole number.
+ */
+int aper_put_constrained_whole_number(asn_per_outp_t *po, long lb, long ub, long number);
#ifdef __cplusplus
}
diff --git a/src/sbcap/skel/asn_application.h b/src/sbcap/skel/asn_application.h
index bf10cd3..355bc84 100644
--- a/src/sbcap/skel/asn_application.h
+++ b/src/sbcap/skel/asn_application.h
@@ -61,7 +61,13 @@
*/
ATS_BASIC_XER,
ATS_CANONICAL_XER,
+ /*
+ * X.697:
+ * JER: JSON Encoding Rules.
+ * MINIFIED produces a whitespace-free JSON.
+ */
ATS_JER,
+ ATS_JER_MINIFIED,
};
/*
diff --git a/src/sbcap/skel/asn_codecs_prim.h b/src/sbcap/skel/asn_codecs_prim.h
index 5bbd9cf..8647ab9 100644
--- a/src/sbcap/skel/asn_codecs_prim.h
+++ b/src/sbcap/skel/asn_codecs_prim.h
@@ -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
diff --git a/src/sbcap/skel/asn_system.h b/src/sbcap/skel/asn_system.h
index 0f0d495..eab32c9 100644
--- a/src/sbcap/skel/asn_system.h
+++ b/src/sbcap/skel/asn_system.h
@@ -78,12 +78,24 @@
#else /* !defined(__vxworks) */
#include <inttypes.h> /* C99 specifies this file */
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h> /* for ntohl() */
+#define sys_ntohl(foo) ntohl(foo)
+#else /* !_HAVE_ARPA_INET_H */
#ifdef HAVE_NETINET_IN_H
#include <netinet/in.h> /* for ntohl() */
-#endif
#define sys_ntohl(foo) ntohl(foo)
+#else /* !_HAVE_NETINET_IN_H */
+/* Here's the definition of ntohl() */
+#define sys_ntohl(l) ((((l) << 24) & 0xff000000) \
+ | (((l) << 8) & 0xff0000) \
+ | (((l) >> 8) & 0xff00) \
+ | ((l >> 24) & 0xff))
+#endif /* HAVE_NETINET_IN_H */
+#endif /* HAVE_ARPA_INET_H */
#endif /* defined(__vxworks) */
+
#endif /* _WIN32 */
#if __GNUC__ >= 3 || defined(__clang__)
diff --git a/src/sbcap/skel/constr_CHOICE.h b/src/sbcap/skel/constr_CHOICE.h
index 03d606c..1bec3ca 100644
--- a/src/sbcap/skel/constr_CHOICE.h
+++ b/src/sbcap/skel/constr_CHOICE.h
@@ -46,6 +46,7 @@
#endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */
asn_struct_compare_f CHOICE_compare;
+asn_struct_copy_f CHOICE_copy;
asn_constr_check_f CHOICE_constraint;
@@ -60,6 +61,7 @@
#endif /* !defined(ASN_DISABLE_XER_SUPPORT) */
#if !defined(ASN_DISABLE_JER_SUPPORT)
+jer_type_decoder_f CHOICE_decode_jer;
jer_type_encoder_f CHOICE_encode_jer;
#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */
diff --git a/src/sbcap/skel/constr_SEQUENCE.h b/src/sbcap/skel/constr_SEQUENCE.h
index 5ecfd8f..a3f50d1 100644
--- a/src/sbcap/skel/constr_SEQUENCE.h
+++ b/src/sbcap/skel/constr_SEQUENCE.h
@@ -51,6 +51,7 @@
#endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */
asn_struct_compare_f SEQUENCE_compare;
+asn_struct_copy_f SEQUENCE_copy;
asn_constr_check_f SEQUENCE_constraint;
@@ -65,6 +66,7 @@
#endif /* !defined(ASN_DISABLE_XER_SUPPORT) */
#if !defined(ASN_DISABLE_JER_SUPPORT)
+jer_type_decoder_f SEQUENCE_decode_jer;
jer_type_encoder_f SEQUENCE_encode_jer;
#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */
diff --git a/src/sbcap/skel/constr_SEQUENCE_OF.h b/src/sbcap/skel/constr_SEQUENCE_OF.h
index 1768582..978ad8e 100644
--- a/src/sbcap/skel/constr_SEQUENCE_OF.h
+++ b/src/sbcap/skel/constr_SEQUENCE_OF.h
@@ -23,6 +23,7 @@
#endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */
asn_struct_compare_f SEQUENCE_OF_compare;
+#define SEQUENCE_OF_copy SET_OF_copy
#define SEQUENCE_OF_constraint SET_OF_constraint
@@ -37,6 +38,7 @@
#endif /* !defined(ASN_DISABLE_XER_SUPPORT) */
#if !defined(ASN_DISABLE_JER_SUPPORT)
+#define SEQUENCE_OF_decode_jer SET_OF_decode_jer
jer_type_encoder_f SEQUENCE_OF_encode_jer;
#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */
diff --git a/src/sbcap/skel/constr_SET.h b/src/sbcap/skel/constr_SET.h
index 2d03c8e..9dd4475 100644
--- a/src/sbcap/skel/constr_SET.h
+++ b/src/sbcap/skel/constr_SET.h
@@ -52,6 +52,7 @@
#endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */
asn_struct_compare_f SET_compare;
+asn_struct_copy_f SET_copy;
asn_constr_check_f SET_constraint;
@@ -66,7 +67,8 @@
#endif /* !defined(ASN_DISABLE_XER_SUPPORT) */
#if !defined(ASN_DISABLE_JER_SUPPORT)
-jer_type_encoder_f SET_encode_jer;
+jer_type_decoder_f SET_decode_jer;
+jer_type_encoder_f SEQUENCE_encode_jer; /* X.697 29. (2021) */
#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */
#if !defined(ASN_DISABLE_UPER_SUPPORT)
diff --git a/src/sbcap/skel/constr_SET_OF.h b/src/sbcap/skel/constr_SET_OF.h
index 0e9dd39..82ead58 100644
--- a/src/sbcap/skel/constr_SET_OF.h
+++ b/src/sbcap/skel/constr_SET_OF.h
@@ -33,6 +33,7 @@
#endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */
asn_struct_compare_f SET_OF_compare;
+asn_struct_copy_f SET_OF_copy;
asn_constr_check_f SET_OF_constraint;
@@ -47,6 +48,7 @@
#endif /* !defined(ASN_DISABLE_XER_SUPPORT) */
#if !defined(ASN_DISABLE_JER_SUPPORT)
+jer_type_decoder_f SET_OF_decode_jer;
jer_type_encoder_f SET_OF_encode_jer;
#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */
diff --git a/src/sbcap/skel/constr_TYPE.h b/src/sbcap/skel/constr_TYPE.h
index 55c2574..b64d5b5 100644
--- a/src/sbcap/skel/constr_TYPE.h
+++ b/src/sbcap/skel/constr_TYPE.h
@@ -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
diff --git a/src/sbcap/skel/jer_decoder.h b/src/sbcap/skel/jer_decoder.h
new file mode 100644
index 0000000..550cf64
--- /dev/null
+++ b/src/sbcap/skel/jer_decoder.h
@@ -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_ */
diff --git a/src/sbcap/skel/jer_encoder.h b/src/sbcap/skel/jer_encoder.h
index 672976d..cf8b9d2 100644
--- a/src/sbcap/skel/jer_encoder.h
+++ b/src/sbcap/skel/jer_encoder.h
@@ -13,15 +13,13 @@
struct asn_TYPE_descriptor_s; /* Forward declaration */
-/* Flags used by the jer_encode() and (*jer_type_encoder_f), defined below
- *
- * This isn't actually used, it might be used in the future to support
- * both normal JSON and prettified JSON output or removed.
- * It came from XER
+/*
+ * Flags used by the jer_encode() and (*jer_type_encoder_f), defined below
*/
enum jer_encoder_flags_e {
/* Mode of encoding */
- JER_F = 0x01, /* JER (pretty-printing) */
+ JER_F = 0x01, /* JER (pretty-printing) */
+ JER_F_MINIFIED = 0x02, /* JER (minified) */
};
/*
@@ -30,6 +28,7 @@
*/
asn_enc_rval_t jer_encode(const struct asn_TYPE_descriptor_s *type_descriptor,
const void *struct_ptr, /* Structure to be encoded */
+ enum jer_encoder_flags_e jer_flags,
asn_app_consume_bytes_f *consume_bytes_cb,
void *app_key /* Arbitrary callback argument */
);
diff --git a/src/sbcap/skel/jer_support.h b/src/sbcap/skel/jer_support.h
new file mode 100644
index 0000000..556f99e
--- /dev/null
+++ b/src/sbcap/skel/jer_support.h
@@ -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_ */
To view, visit change 36448. To unsubscribe, or for help writing mail filters, visit settings.