Support of Aligned PER and Information Object Class

asn1c/tests/check-assembly.sh

@@ -17,7 +17,7 @@ abs_top_srcdir="${abs_top_srcdir:-$(pwd)/../../}"
 abs_top_builddir="${abs_top_builddir:-$(pwd)/../../}"
 
 if echo "$*" | grep -q -- -- ; then
-    TEST_DRIVER=$(echo "$*"  | sed -e 's/ -- .*/--/g')
+    TEST_DRIVER=$(echo "$*"  | sed -e 's/ -- .*/ -- /g')
     source_full=$(echo "$*"  | sed -e 's/.* //g')
 else
     TEST_DRIVER=""

asn1c/tests/check-src/check-03.-fwide-types.c

@@ -28,7 +28,7 @@ check_xer(e_Enum2 eval, char *xer_string) {
 	asn_dec_rval_t rv;
 	char buf2[128];
 	Enum2_t *e = 0;
-	long val;
+	long long val;
 
 	rv = xer_decode(0, &asn_DEF_Enum2, (void **)&e,
 		xer_string, strlen(xer_string));

asn1c/unber.c

@@ -39,6 +39,7 @@
 #include <OBJECT_IDENTIFIER.c>
 #include <RELATIVE-OID.c>
 #include <asn_codecs_prim.c>
+#include <asn1p_integer.c>
 
 #undef COPYRIGHT
 #define COPYRIGHT "Copyright (c) 2004, 2005 Lev Walkin <[email protected]>\n"
@@ -163,10 +164,10 @@ typedef enum pd_code {
     PD_EOF = 1,
 } pd_code_e;
 static pd_code_e process_deeper(const char *fname, FILE *fp,
-                                asn1c_integer_t *offset, int level,
+                                size_t *offset, int level,
                                 ssize_t limit, ber_tlv_len_t *frame_size,
                                 ber_tlv_len_t effective_size, int expect_eoc);
-static void print_TL(int fin, asn1c_integer_t offset, int level, int constr,
+static void print_TL(int fin, size_t offset, int level, int constr,
                      ssize_t tlen, ber_tlv_tag_t, ber_tlv_len_t,
                      ber_tlv_len_t effective_frame_size);
 static int print_V(const char *fname, FILE *fp, ber_tlv_tag_t, ber_tlv_len_t);
@@ -178,7 +179,7 @@ static int
 process(const char *fname) {
     FILE *fp;
     pd_code_e pdc;
-    asn1c_integer_t offset = 0;   /* Stream decoding position */
+    size_t offset = 0;   /* Stream decoding position */
     ber_tlv_len_t frame_size = 0; /* Single frame size */
 
     if(strcmp(fname, "-")) {
@@ -196,8 +197,7 @@ process(const char *fname) {
      */
     for(; offset < skip_bytes; offset++) {
         if(fgetc(fp) == -1) {
-            fprintf(stderr, "%s: input source (%" PRIdASN
-                            " bytes) "
+            fprintf(stderr, "%s: input source (%zu bytes) "
                             "has less data than \"-s %d\" switch "
                             "wants to skip\n",
                     fname, offset, skip_bytes);
@@ -223,7 +223,7 @@ process(const char *fname) {
  * Process the TLV recursively.
  */
 static pd_code_e
-process_deeper(const char *fname, FILE *fp, asn1c_integer_t *offset, int level,
+process_deeper(const char *fname, FILE *fp, size_t *offset, int level,
                ssize_t limit, ber_tlv_len_t *frame_size,
                ber_tlv_len_t effective_size, int expect_eoc) {
     unsigned char tagbuf[32];
@@ -244,8 +244,7 @@ process_deeper(const char *fname, FILE *fp, asn1c_integer_t *offset, int level,
         if(limit >= 0 && tblen >= limit) {
             fprintf(stderr,
                     "%s: Too long TL sequence (%ld >= %ld)"
-                    " at %" PRIdASN
-                    ". "
+                    " at %zu. "
                     "Broken or maliciously constructed file\n",
                     fname, (long)tblen, (long)limit, *offset);
             return PD_FAILED;
@@ -257,7 +256,7 @@ process_deeper(const char *fname, FILE *fp, asn1c_integer_t *offset, int level,
             if(limit > 0 || expect_eoc) {
                 fprintf(stderr,
                         "%s: Unexpected end of file (TL)"
-                        " at %" PRIdASN "\n",
+                        " at %zu\n",
                         fname, *offset);
                 return PD_FAILED;
             } else {
@@ -275,7 +274,7 @@ process_deeper(const char *fname, FILE *fp, asn1c_integer_t *offset, int level,
         case -1:
             fprintf(stderr,
                     "%s: Fatal error decoding tag"
-                    " at %" PRIdASN "+%ld\n",
+                    " at %zu+%ld\n",
                     fname, *offset, (long)tblen);
             return PD_FAILED;
         case 0:
@@ -293,7 +292,7 @@ process_deeper(const char *fname, FILE *fp, asn1c_integer_t *offset, int level,
         case -1:
             fprintf(stderr,
                     "%s: Fatal error decoding value length"
-                    " at %" PRIdASN "\n",
+                    " at %zu\n",
                     fname, *offset + t_len);
             return PD_FAILED;
         case 0:
@@ -385,7 +384,7 @@ process_deeper(const char *fname, FILE *fp, asn1c_integer_t *offset, int level,
 }
 
 static void
-print_TL(int fin, asn1c_integer_t offset, int level, int constr, ssize_t tlen,
+print_TL(int fin, size_t offset, int level, int constr, ssize_t tlen,
          ber_tlv_tag_t tlv_tag, ber_tlv_len_t tlv_len,
          ber_tlv_len_t effective_size) {
     if(fin && !constr) {
@@ -399,7 +398,7 @@ print_TL(int fin, asn1c_integer_t offset, int level, int constr, ssize_t tlen,
     printf(constr ? ((tlv_len == -1) ? "I" : "C") : "P");
 
     /* Print out the offset of this boundary, even if closing tag */
-    if(!minimalistic) printf(" O=\"%" PRIdASN "\"", offset);
+    if(!minimalistic) printf(" O=\"%zu\"", offset);
 
     printf(" T=\"");
     ber_tlv_tag_fwrite(tlv_tag, stdout);
@@ -572,7 +571,7 @@ print_V(const char *fname, FILE *fp, ber_tlv_tag_t tlv_tag,
     switch(etype) {
     case ASN_BASIC_INTEGER:
     case ASN_BASIC_ENUMERATED:
-        printf("%" PRIdASN, collector);
+        printf("%s", asn1p_itoa(collector));
         break;
     case ASN_BASIC_OBJECT_IDENTIFIER:
         if(vbuf) {
@@ -589,7 +588,7 @@ print_V(const char *fname, FILE *fp, ber_tlv_tag_t tlv_tag,
                 printf(" F>");
                 for(i = 0; i < arcno; i++) {
                     if(i) printf(".");
-                    printf("%" PRIuASN, arcs[i]);
+                    printf("%s", asn1p_itoa(arcs[i]));
                 }
                 FREEMEM(vbuf);
                 vbuf = 0;
@@ -610,7 +609,7 @@ print_V(const char *fname, FILE *fp, ber_tlv_tag_t tlv_tag,
                 printf(" F>");
                 for(i = 0; i < arcno; i++) {
                     if(i) printf(".");
-                    printf("%" PRIuASN, arcs[i]);
+                    printf("%s", asn1p_itoa(arcs[i]));
                 }
                 FREEMEM(vbuf);
                 vbuf = 0;
@@ -846,6 +845,10 @@ OCTET_STRING_encode_uper(asn_TYPE_descriptor_t *td, asn_per_constraints_t *cts,
     return er;
 }
 
+asn_dec_rval_t OCTET_STRING_decode_aper(asn_codec_ctx_t *ctx, asn_TYPE_descriptor_t *td, asn_per_constraints_t *cts, void **sptr, asn_per_data_t *pd) { asn_dec_rval_t rv = { 0, 0 }; (void)ctx; (void)td; (void)cts; (void)sptr; (void)pd; return rv; }
+
+asn_enc_rval_t OCTET_STRING_encode_aper(asn_TYPE_descriptor_t *td, asn_per_constraints_t *cts, void *sptr, asn_per_outp_t *po) { asn_enc_rval_t er = { 0, 0, 0 }; (void)td; (void)cts; (void)sptr; (void)po; return er; }
+
 size_t
 xer_whitespace_span(const void *chunk_buf, size_t chunk_size) {
     (void)chunk_buf;

configure.ac

@@ -81,8 +81,8 @@ AC_SUBST(TESTSUITE_CFLAGS)
 dnl Skeletons should be very compatible with most of the compilers, hence
 dnl very strict backward compatibility flags.
 SKELETONS_CFLAGS="${ADD_CFLAGS} ${SKELETONS_CFLAGS}"
-AX_CHECK_COMPILE_FLAG([-std=c89],
-    [SKELETONS_CFLAGS="$SKELETONS_CFLAGS -std=c89"])
+AX_CHECK_COMPILE_FLAG([-std=c99],
+    [SKELETONS_CFLAGS="$SKELETONS_CFLAGS -std=c99"])
 AX_CHECK_COMPILE_FLAG([-Wpedantic],
     [SKELETONS_CFLAGS="$SKELETONS_CFLAGS -Wpedantic"])
 AX_CHECK_COMPILE_FLAG([-Wno-duplicate-decl-specifier],
@@ -99,6 +99,8 @@ AC_C_BIGENDIAN
 AC_TYPE_OFF_T
 AC_TYPE_SIZE_T
 AC_STRUCT_TM
+AC_CHECK_TYPE([__int128],
+    [AC_DEFINE(HAVE_128_BIT_INT, 1, [Have 128-bit integer])])
 AC_CHECK_TYPE(intmax_t, int64_t)
 
 dnl Test if we should check features that depend on 64-bitness.

examples/sample.source.RRC/Makefile

@@ -4825,7 +4825,7 @@ check-per:
 	done; done; fi
 	@if test -f sample-DL-DCCH-Message-1.per ; then \
 	for f in sample-*-[1-9].per; do \
-	pdu=`echo $$f | sed -E -e "s/sample-([A-Za-z-]+)-[0-9].*/\1/"`; \
+	pdu=`echo $$f | sed -E -e "s/sample-([A-Za-z-]+)-[0-9].*/
/"`; \
 	for b in 1 17 33 980 8192; do \
 	echo "Recoding $$f into DER into XER and back ($$b)..."; \
 	./${TARGET} -b $$b -p $$pdu -iper -oder $$f > ./.tmp.1.$$$$ || exit 3; \