more PER support

25 files changed, 814 insertions, 5 deletions

diff --git a/asn1c/tests/Makefile.am b/asn1c/tests/Makefile.am
index 16e78886..85b0856c 100644
--- a/asn1c/tests/Makefile.am
+++ b/asn1c/tests/Makefile.am
@@ -11,7 +11,8 @@ EXTRA_DIST =			\
 	$(check_SCRIPTS)	\
 	check-*.c*		\
 	data-62			\
-	data-70
+	data-70			\
+	data-119
 
 dist-hook:
 	rm -rf `find $(distdir) -name CVS -or -name .cvsignore`
diff --git a/asn1c/tests/Makefile.in b/asn1c/tests/Makefile.in
index 829a42f9..c264d27d 100644
--- a/asn1c/tests/Makefile.in
+++ b/asn1c/tests/Makefile.in
@@ -165,7 +165,8 @@ EXTRA_DIST = \
 	$(check_SCRIPTS)	\
 	check-*.c*		\
 	data-62			\
-	data-70
+	data-70			\
+	data-119
 
 all: all-am
 
diff --git a/asn1c/tests/check-119.-fnative-types.-gen-PER.c b/asn1c/tests/check-119.-fnative-types.-gen-PER.c
new file mode 100644
index 00000000..ca881615
--- /dev/null
+++ b/asn1c/tests/check-119.-fnative-types.-gen-PER.c
@@ -0,0 +1,363 @@
+/*
+ * Mode of operation:
+ * Each of the *.in files is XER-decoded, then converted into DER,
+ * then decoded from DER and encoded into XER again. The resulting
+ * stream is compared with the corresponding .out file.
+ */
+#undef	NDEBUG
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <unistd.h>	/* for chdir(2) */
+#include <string.h>
+#include <dirent.h>
+#include <assert.h>
+#include <ctype.h>
+#include <errno.h>
+
+#include <PDU.h>
+
+enum expectation {
+	EXP_OK,		/* Encoding/decoding must succeed */
+	EXP_CXER_EXACT,	/* Encoding/decoding using CXER must be exact */
+	EXP_CXER_DIFF,	/* Encoding/decoding using CXER must be different */
+	EXP_BROKEN,	/* Decoding must fail */
+	EXP_DIFFERENT,	/* Reconstruction will yield different encoding */
+	EXP_PER_NOCOMP,	/* Not PER compatible */
+};
+
+static unsigned char buf[4096];
+static int buf_offset;
+
+static int
+_buf_writer(const void *buffer, size_t size, void *app_key) {
+	unsigned char *b, *bend;
+	(void)app_key;
+	assert(buf_offset + size < sizeof(buf));
+	memcpy(buf + buf_offset, buffer, size);
+	b = buf + buf_offset;
+	bend = b + size;
+	fprintf(stderr, "=> [");
+	for(; b < bend; b++) {
+		if(*b >= 32 && *b < 127 && *b != '%')
+			fprintf(stderr, "%c", *b);
+		else
+			fprintf(stderr, "%%%02x", *b);
+	}
+	fprintf(stderr, "]:%ld\n", (long)size);
+	buf_offset += size;
+	return 0;
+}
+
+enum enctype {
+	AS_PER,
+	AS_DER,
+	AS_XER,
+	AS_CXER,
+};
+
+static void
+save_object_as(PDU_t *st, enum expectation exp, enum enctype how) {
+	asn_enc_rval_t rval; /* Return value */
+
+	buf_offset = 0;
+
+	/*
+	 * Save object using specified method.
+	 */
+	switch(how) {
+	case AS_PER:
+		rval = uper_encode(&asn_DEF_PDU, st,
+			_buf_writer, 0);
+		if(exp == EXP_PER_NOCOMP)
+			assert(rval.encoded == -1);
+		else
+			assert(rval.encoded > 0);
+		fprintf(stderr, "SAVED OBJECT IN SIZE %d\n", buf_offset);
+		return;
+	case AS_DER:
+		rval = der_encode(&asn_DEF_PDU, st,
+			_buf_writer, 0);
+		break;
+	case AS_XER:
+		rval = xer_encode(&asn_DEF_PDU, st, XER_F_BASIC,
+			_buf_writer, 0);
+		break;
+	case AS_CXER:
+		rval = xer_encode(&asn_DEF_PDU, st, XER_F_CANONICAL,
+			_buf_writer, 0);
+		break;
+	}
+
+	if (rval.encoded == -1) {
+		fprintf(stderr,
+			"Cannot encode %s: %s\n",
+			rval.failed_type->name, strerror(errno));
+		assert(rval.encoded != -1);
+		return;
+	}
+
+	fprintf(stderr, "SAVED OBJECT IN SIZE %d\n", buf_offset);
+}
+
+static PDU_t *
+load_object_from(const char *fname, enum expectation expectation, char *fbuf, int size, enum enctype how) {
+	asn_dec_rval_t rval;
+	PDU_t *st = 0;
+	int csize = 1;
+
+	if(getenv("INITIAL_CHUNK_SIZE"))
+		csize = atoi(getenv("INITIAL_CHUNK_SIZE"));
+
+	/* Perform multiple iterations with multiple chunks sizes */
+	for(; csize < 20; csize += 1) {
+		int fbuf_offset = 0;
+		int fbuf_left = size;
+		int fbuf_chunk = csize;
+
+		fprintf(stderr, "LOADING OBJECT OF SIZE %d FROM [%s] as %s,"
+			" chunks %d\n",
+			size, fname, how==AS_PER?"PER":"XER", csize);
+
+		if(st) asn_DEF_PDU.free_struct(&asn_DEF_PDU, st, 0);
+		st = 0;
+
+		do {
+			fprintf(stderr, "Decoding bytes %d..%d (left %d)\n",
+				fbuf_offset,
+					fbuf_chunk < fbuf_left
+						? fbuf_chunk : fbuf_left,
+					fbuf_left);
+			if(st) {
+				fprintf(stderr, "=== currently ===\n");
+				asn_fprint(stderr, &asn_DEF_PDU, st);
+				fprintf(stderr, "=== end ===\n");
+			}
+			switch(how) {
+			case AS_XER:
+				rval = xer_decode(0, &asn_DEF_PDU, (void **)&st,
+					fbuf + fbuf_offset,
+					fbuf_chunk < fbuf_left 
+					? fbuf_chunk : fbuf_left);
+				break;
+			case AS_PER:
+				rval = uper_decode(0, &asn_DEF_PDU,
+					(void **)&st, fbuf + fbuf_offset,
+					fbuf_chunk < fbuf_left 
+					? fbuf_chunk : fbuf_left, 0, 0);
+				if(rval.code == RC_WMORE) {
+					rval.consumed = 0; /* Not restartable */
+					ASN_STRUCT_FREE(asn_DEF_PDU, st);
+					st = 0;
+					fprintf(stderr, "-> PER wants more\n");
+				} else {
+					fprintf(stderr, "-> PER ret %d/%d\n",
+						rval.code, rval.consumed);
+					/* uper_decode() returns _bits_ */
+					rval.consumed += 7;
+					rval.consumed /= 8;
+				}
+				break;
+			}
+			fbuf_offset += rval.consumed;
+			fbuf_left -= rval.consumed;
+			if(rval.code == RC_WMORE)
+				fbuf_chunk += 1;	/* Give little more */
+			else
+				fbuf_chunk = csize;	/* Back off */
+		} while(fbuf_left && rval.code == RC_WMORE);
+
+		if(expectation != EXP_BROKEN) {
+			assert(rval.code == RC_OK);
+			if(how == AS_PER) {
+				fprintf(stderr, "[left %d, off %d, size %d]\n",
+					fbuf_left, fbuf_offset, size);
+				assert(fbuf_offset == size);
+			} else {
+				assert(fbuf_offset - size < 2
+				|| (fbuf_offset + 1 /* "\n" */  == size
+					&& fbuf[size - 1] == '\n')
+				|| (fbuf_offset + 2 /* "\r\n" */  == size
+					&& fbuf[size - 2] == '\r'
+					&& fbuf[size - 1] == '\n')
+				);
+			}
+		} else {
+			assert(rval.code != RC_OK);
+			fprintf(stderr, "Failed, but this was expected\n");
+			asn_DEF_PDU.free_struct(&asn_DEF_PDU, st, 0);
+			st = 0;	/* ignore leak for now */
+		}
+	}
+
+	if(st) asn_fprint(stderr, &asn_DEF_PDU, st);
+	return st;
+}
+
+static int
+xer_encoding_equal(char *obuf, size_t osize, char *nbuf, size_t nsize) {
+	char *oend = obuf + osize;
+	char *nend = nbuf + nsize;
+
+	if((osize && !nsize) || (!osize && nsize))
+		return 0;	/* not equal apriori */
+
+	while(1) {
+		while(obuf < oend && isspace(*obuf)) obuf++;
+		while(nbuf < nend && isspace(*nbuf)) nbuf++;
+
+		if(obuf == oend || nbuf == nend) {
+			if(obuf == oend && nbuf == nend)
+				break;
+			fprintf(stderr, "%s data in reconstructed encoding\n",
+				(obuf == oend) ? "More" : "Less");
+			return 0;
+		}
+
+		if(*obuf != *nbuf) {
+			printf("%c%c != %c%c\n",
+				obuf[0], obuf[1],
+				nbuf[0], nbuf[1]);
+			return 0;
+		}
+		obuf++, nbuf++;
+	}
+
+	return 1;
+}
+
+static void
+process_XER_data(const char *fname, enum expectation expectation, char *fbuf, int size) {
+	PDU_t *st;
+	int ret;
+
+	st = load_object_from(fname, expectation, fbuf, size, AS_XER);
+	if(!st) return;
+
+	/* Save and re-load as DER */
+	save_object_as(st, expectation, AS_PER);
+	if(expectation == EXP_PER_NOCOMP)
+		return;	/* Already checked */
+	st = load_object_from("buffer", expectation, buf, buf_offset, AS_PER);
+	assert(st);
+
+	save_object_as(st,
+			expectation,
+			(expectation == EXP_CXER_EXACT
+			|| expectation == EXP_CXER_DIFF)
+			? AS_CXER : AS_XER);
+	fprintf(stderr, "=== original ===\n");
+	fwrite(fbuf, 1, size, stderr);
+	fprintf(stderr, "=== re-encoded ===\n");
+	fwrite(buf, 1, buf_offset, stderr);
+	fprintf(stderr, "=== end ===\n");
+
+	switch(expectation) {
+	case EXP_DIFFERENT:
+		assert(!xer_encoding_equal(fbuf, size, buf, buf_offset));
+		break;
+	case EXP_BROKEN:
+		assert(!xer_encoding_equal(fbuf, size, buf, buf_offset));
+		break;
+	case EXP_CXER_EXACT:
+		buf[buf_offset++] = '\n';
+		assert(size == buf_offset);
+		assert(memcmp(fbuf, buf, size) == 0);
+		break;
+	case EXP_CXER_DIFF:
+		buf[buf_offset++] = '\n';
+		assert(size != buf_offset
+			|| memcmp(fbuf, buf, size));
+		break;
+	case EXP_OK:
+	case EXP_PER_NOCOMP:
+		assert(xer_encoding_equal(fbuf, size, buf, buf_offset));
+		break;
+	}
+
+	asn_DEF_PDU.free_struct(&asn_DEF_PDU, st, 0);
+}
+
+/*
+ * Decode the .der files and try to regenerate them.
+ */
+static int
+process(const char *fname) {
+	char fbuf[4096];
+	char *ext = strrchr(fname, '.');
+	enum expectation expectation;
+	int ret;
+	int rd;
+	FILE *fp;
+
+	if(ext == 0 || strcmp(ext, ".in"))
+		return 0;
+
+	switch(ext[-1]) {
+	case 'B':	/* The file is intentionally broken */
+		expectation = EXP_BROKEN; break;
+	case 'D':	/* Reconstructing should yield different data */
+		expectation = EXP_DIFFERENT; break;
+	case 'E':	/* Byte to byte exact reconstruction */
+		expectation = EXP_CXER_EXACT; break;
+	case 'X':	/* Should fail byte-to-byte comparison */
+		expectation = EXP_CXER_DIFF; break;
+	case 'P':	/* Incompatible with PER */
+		expectation = EXP_PER_NOCOMP; break;
+	default:
+		expectation = EXP_OK; break;
+	}
+
+	fprintf(stderr, "\nProcessing file [../%s]\n", fname);
+
+	ret = chdir("../data-119");
+	assert(ret == 0);
+	fp = fopen(fname, "r");
+	ret = chdir("../test-check-119.-gen-PER");
+	assert(ret == 0);
+	assert(fp);
+
+	rd = fread(fbuf, 1, sizeof(fbuf), fp);
+	fclose(fp);
+
+	assert(rd < sizeof(fbuf));	/* expect small files */
+
+	process_XER_data(fname, expectation, fbuf, rd);
+
+	fprintf(stderr, "Finished [%s]\n", fname);
+
+	return 1;
+}
+
+int
+main() {
+	DIR *dir;
+	struct dirent *dent;
+	int processed_files = 0;
+	char *str;
+
+	/* Process a specific test file */
+	str = getenv("DATA_119_FILE");
+	if(str && strncmp(str, "data-119-", 9) == 0) {
+		process(str);
+		return 0;
+	}
+
+	dir = opendir("../data-119");
+	assert(dir);
+
+	/*
+	 * Process each file in that directory.
+	 */
+	while((dent = readdir(dir))) {
+		if(strncmp(dent->d_name, "data-119-", 9) == 0)
+			if(process(dent->d_name))
+				processed_files++;
+	}
+
+	assert(processed_files);
+	closedir(dir);
+
+	return 0;
+}
+
diff --git a/asn1c/tests/check-119.-gen-PER.c b/asn1c/tests/check-119.-gen-PER.c
new file mode 100644
index 00000000..ca881615
--- /dev/null
+++ b/asn1c/tests/check-119.-gen-PER.c
@@ -0,0 +1,363 @@
+/*
+ * Mode of operation:
+ * Each of the *.in files is XER-decoded, then converted into DER,
+ * then decoded from DER and encoded into XER again. The resulting
+ * stream is compared with the corresponding .out file.
+ */
+#undef	NDEBUG
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <unistd.h>	/* for chdir(2) */
+#include <string.h>
+#include <dirent.h>
+#include <assert.h>
+#include <ctype.h>
+#include <errno.h>
+
+#include <PDU.h>
+
+enum expectation {
+	EXP_OK,		/* Encoding/decoding must succeed */
+	EXP_CXER_EXACT,	/* Encoding/decoding using CXER must be exact */
+	EXP_CXER_DIFF,	/* Encoding/decoding using CXER must be different */
+	EXP_BROKEN,	/* Decoding must fail */
+	EXP_DIFFERENT,	/* Reconstruction will yield different encoding */
+	EXP_PER_NOCOMP,	/* Not PER compatible */
+};
+
+static unsigned char buf[4096];
+static int buf_offset;
+
+static int
+_buf_writer(const void *buffer, size_t size, void *app_key) {
+	unsigned char *b, *bend;
+	(void)app_key;
+	assert(buf_offset + size < sizeof(buf));
+	memcpy(buf + buf_offset, buffer, size);
+	b = buf + buf_offset;
+	bend = b + size;
+	fprintf(stderr, "=> [");
+	for(; b < bend; b++) {
+		if(*b >= 32 && *b < 127 && *b != '%')
+			fprintf(stderr, "%c", *b);
+		else
+			fprintf(stderr, "%%%02x", *b);
+	}
+	fprintf(stderr, "]:%ld\n", (long)size);
+	buf_offset += size;
+	return 0;
+}
+
+enum enctype {
+	AS_PER,
+	AS_DER,
+	AS_XER,
+	AS_CXER,
+};
+
+static void
+save_object_as(PDU_t *st, enum expectation exp, enum enctype how) {
+	asn_enc_rval_t rval; /* Return value */
+
+	buf_offset = 0;
+
+	/*
+	 * Save object using specified method.
+	 */
+	switch(how) {
+	case AS_PER:
+		rval = uper_encode(&asn_DEF_PDU, st,
+			_buf_writer, 0);
+		if(exp == EXP_PER_NOCOMP)
+			assert(rval.encoded == -1);
+		else
+			assert(rval.encoded > 0);
+		fprintf(stderr, "SAVED OBJECT IN SIZE %d\n", buf_offset);
+		return;
+	case AS_DER:
+		rval = der_encode(&asn_DEF_PDU, st,
+			_buf_writer, 0);
+		break;
+	case AS_XER:
+		rval = xer_encode(&asn_DEF_PDU, st, XER_F_BASIC,
+			_buf_writer, 0);
+		break;
+	case AS_CXER:
+		rval = xer_encode(&asn_DEF_PDU, st, XER_F_CANONICAL,
+			_buf_writer, 0);
+		break;
+	}
+
+	if (rval.encoded == -1) {
+		fprintf(stderr,
+			"Cannot encode %s: %s\n",
+			rval.failed_type->name, strerror(errno));
+		assert(rval.encoded != -1);
+		return;
+	}
+
+	fprintf(stderr, "SAVED OBJECT IN SIZE %d\n", buf_offset);
+}
+
+static PDU_t *
+load_object_from(const char *fname, enum expectation expectation, char *fbuf, int size, enum enctype how) {
+	asn_dec_rval_t rval;
+	PDU_t *st = 0;
+	int csize = 1;
+
+	if(getenv("INITIAL_CHUNK_SIZE"))
+		csize = atoi(getenv("INITIAL_CHUNK_SIZE"));
+
+	/* Perform multiple iterations with multiple chunks sizes */
+	for(; csize < 20; csize += 1) {
+		int fbuf_offset = 0;
+		int fbuf_left = size;
+		int fbuf_chunk = csize;
+
+		fprintf(stderr, "LOADING OBJECT OF SIZE %d FROM [%s] as %s,"
+			" chunks %d\n",
+			size, fname, how==AS_PER?"PER":"XER", csize);
+
+		if(st) asn_DEF_PDU.free_struct(&asn_DEF_PDU, st, 0);
+		st = 0;
+
+		do {
+			fprintf(stderr, "Decoding bytes %d..%d (left %d)\n",
+				fbuf_offset,
+					fbuf_chunk < fbuf_left
+						? fbuf_chunk : fbuf_left,
+					fbuf_left);
+			if(st) {
+				fprintf(stderr, "=== currently ===\n");
+				asn_fprint(stderr, &asn_DEF_PDU, st);
+				fprintf(stderr, "=== end ===\n");
+			}
+			switch(how) {
+			case AS_XER:
+				rval = xer_decode(0, &asn_DEF_PDU, (void **)&st,
+					fbuf + fbuf_offset,
+					fbuf_chunk < fbuf_left 
+					? fbuf_chunk : fbuf_left);
+				break;
+			case AS_PER:
+				rval = uper_decode(0, &asn_DEF_PDU,
+					(void **)&st, fbuf + fbuf_offset,
+					fbuf_chunk < fbuf_left 
+					? fbuf_chunk : fbuf_left, 0, 0);
+				if(rval.code == RC_WMORE) {
+					rval.consumed = 0; /* Not restartable */
+					ASN_STRUCT_FREE(asn_DEF_PDU, st);
+					st = 0;
+					fprintf(stderr, "-> PER wants more\n");
+				} else {
+					fprintf(stderr, "-> PER ret %d/%d\n",
+						rval.code, rval.consumed);
+					/* uper_decode() returns _bits_ */
+					rval.consumed += 7;
+					rval.consumed /= 8;
+				}
+				break;
+			}
+			fbuf_offset += rval.consumed;
+			fbuf_left -= rval.consumed;
+			if(rval.code == RC_WMORE)
+				fbuf_chunk += 1;	/* Give little more */
+			else
+				fbuf_chunk = csize;	/* Back off */
+		} while(fbuf_left && rval.code == RC_WMORE);
+
+		if(expectation != EXP_BROKEN) {
+			assert(rval.code == RC_OK);
+			if(how == AS_PER) {
+				fprintf(stderr, "[left %d, off %d, size %d]\n",
+					fbuf_left, fbuf_offset, size);
+				assert(fbuf_offset == size);
+			} else {
+				assert(fbuf_offset - size < 2
+				|| (fbuf_offset + 1 /* "\n" */  == size
+					&& fbuf[size - 1] == '\n')
+				|| (fbuf_offset + 2 /* "\r\n" */  == size
+					&& fbuf[size - 2] == '\r'
+					&& fbuf[size - 1] == '\n')
+				);
+			}
+		} else {
+			assert(rval.code != RC_OK);
+			fprintf(stderr, "Failed, but this was expected\n");
+			asn_DEF_PDU.free_struct(&asn_DEF_PDU, st, 0);
+			st = 0;	/* ignore leak for now */
+		}
+	}
+
+	if(st) asn_fprint(stderr, &asn_DEF_PDU, st);
+	return st;
+}
+
+static int
+xer_encoding_equal(char *obuf, size_t osize, char *nbuf, size_t nsize) {
+	char *oend = obuf + osize;
+	char *nend = nbuf + nsize;
+
+	if((osize && !nsize) || (!osize && nsize))
+		return 0;	/* not equal apriori */
+
+	while(1) {
+		while(obuf < oend && isspace(*obuf)) obuf++;
+		while(nbuf < nend && isspace(*nbuf)) nbuf++;
+
+		if(obuf == oend || nbuf == nend) {
+			if(obuf == oend && nbuf == nend)
+				break;
+			fprintf(stderr, "%s data in reconstructed encoding\n",
+				(obuf == oend) ? "More" : "Less");
+			return 0;
+		}
+
+		if(*obuf != *nbuf) {
+			printf("%c%c != %c%c\n",
+				obuf[0], obuf[1],
+				nbuf[0], nbuf[1]);
+			return 0;
+		}
+		obuf++, nbuf++;
+	}
+
+	return 1;
+}
+
+static void
+process_XER_data(const char *fname, enum expectation expectation, char *fbuf, int size) {
+	PDU_t *st;
+	int ret;
+
+	st = load_object_from(fname, expectation, fbuf, size, AS_XER);
+	if(!st) return;
+
+	/* Save and re-load as DER */
+	save_object_as(st, expectation, AS_PER);
+	if(expectation == EXP_PER_NOCOMP)
+		return;	/* Already checked */
+	st = load_object_from("buffer", expectation, buf, buf_offset, AS_PER);
+	assert(st);
+
+	save_object_as(st,
+			expectation,
+			(expectation == EXP_CXER_EXACT
+			|| expectation == EXP_CXER_DIFF)
+			? AS_CXER : AS_XER);
+	fprintf(stderr, "=== original ===\n");
+	fwrite(fbuf, 1, size, stderr);
+	fprintf(stderr, "=== re-encoded ===\n");
+	fwrite(buf, 1, buf_offset, stderr);
+	fprintf(stderr, "=== end ===\n");
+
+	switch(expectation) {
+	case EXP_DIFFERENT:
+		assert(!xer_encoding_equal(fbuf, size, buf, buf_offset));
+		break;
+	case EXP_BROKEN:
+		assert(!xer_encoding_equal(fbuf, size, buf, buf_offset));
+		break;
+	case EXP_CXER_EXACT:
+		buf[buf_offset++] = '\n';
+		assert(size == buf_offset);
+		assert(memcmp(fbuf, buf, size) == 0);
+		break;
+	case EXP_CXER_DIFF:
+		buf[buf_offset++] = '\n';
+		assert(size != buf_offset
+			|| memcmp(fbuf, buf, size));
+		break;
+	case EXP_OK:
+	case EXP_PER_NOCOMP:
+		assert(xer_encoding_equal(fbuf, size, buf, buf_offset));
+		break;
+	}
+
+	asn_DEF_PDU.free_struct(&asn_DEF_PDU, st, 0);
+}
+
+/*
+ * Decode the .der files and try to regenerate them.
+ */
+static int
+process(const char *fname) {
+	char fbuf[4096];
+	char *ext = strrchr(fname, '.');
+	enum expectation expectation;
+	int ret;
+	int rd;
+	FILE *fp;
+
+	if(ext == 0 || strcmp(ext, ".in"))
+		return 0;
+
+	switch(ext[-1]) {
+	case 'B':	/* The file is intentionally broken */
+		expectation = EXP_BROKEN; break;
+	case 'D':	/* Reconstructing should yield different data */
+		expectation = EXP_DIFFERENT; break;
+	case 'E':	/* Byte to byte exact reconstruction */
+		expectation = EXP_CXER_EXACT; break;
+	case 'X':	/* Should fail byte-to-byte comparison */
+		expectation = EXP_CXER_DIFF; break;
+	case 'P':	/* Incompatible with PER */
+		expectation = EXP_PER_NOCOMP; break;
+	default:
+		expectation = EXP_OK; break;
+	}
+
+	fprintf(stderr, "\nProcessing file [../%s]\n", fname);
+
+	ret = chdir("../data-119");
+	assert(ret == 0);
+	fp = fopen(fname, "r");
+	ret = chdir("../test-check-119.-gen-PER");
+	assert(ret == 0);
+	assert(fp);
+
+	rd = fread(fbuf, 1, sizeof(fbuf), fp);
+	fclose(fp);
+
+	assert(rd < sizeof(fbuf));	/* expect small files */
+
+	process_XER_data(fname, expectation, fbuf, rd);
+
+	fprintf(stderr, "Finished [%s]\n", fname);
+
+	return 1;
+}
+
+int
+main() {
+	DIR *dir;
+	struct dirent *dent;
+	int processed_files = 0;
+	char *str;
+
+	/* Process a specific test file */
+	str = getenv("DATA_119_FILE");
+	if(str && strncmp(str, "data-119-", 9) == 0) {
+		process(str);
+		return 0;
+	}
+
+	dir = opendir("../data-119");
+	assert(dir);
+
+	/*
+	 * Process each file in that directory.
+	 */
+	while((dent = readdir(dir))) {
+		if(strncmp(dent->d_name, "data-119-", 9) == 0)
+			if(process(dent->d_name))
+				processed_files++;
+	}
+
+	assert(processed_files);
+	closedir(dir);
+
+	return 0;
+}
+
diff --git a/asn1c/tests/check-70.c b/asn1c/tests/check-70.c
index 4b51065f..124c800f 100644
--- a/asn1c/tests/check-70.c
+++ b/asn1c/tests/check-70.c
@@ -40,7 +40,7 @@ _buf_writer(const void *buffer, size_t size, void *app_key) {
 		if(*b >= 32 && *b < 127 && *b != '%')
 			fprintf(stderr, "%c", *b);
 		else
-			fprintf(stderr, "%%02x", *b);
+			fprintf(stderr, "%%%02x", *b);
 	}
 	fprintf(stderr, "]:%ld\n", (long)size);
 	buf_offset += size;
diff --git a/asn1c/tests/data-119/README b/asn1c/tests/data-119/README
new file mode 100644
index 00000000..044f5b84
--- /dev/null
+++ b/asn1c/tests/data-119/README
@@ -0,0 +1,13 @@
+Mode of operation:
+
+	Each of the *.in files is XER-decoded, then converted into PER,
+	then decoded back from PER, then encoded into XER again,
+	and finally compared to the original encoding.
+
+Naming conventions:
+
+*-B.in	-	The file is intentionally broken
+*-P.in	-	Is not PER compatible, PER encoding must fail.
+*-E.in  -	CXER reconstruction should yield byte-wise identical data.
+
+Otherwise, a reconstructed buffer should loosely match the original.
diff --git a/asn1c/tests/data-119/data-119-01.in b/asn1c/tests/data-119/data-119-01.in
new file mode 100644
index 00000000..47e83a00
--- /dev/null
+++ b/asn1c/tests/data-119/data-119-01.in
@@ -0,0 +1,3 @@
+<PDU>
+	<ns></ns>
+</PDU>
diff --git a/asn1c/tests/data-119/data-119-02.in b/asn1c/tests/data-119/data-119-02.in
new file mode 100644
index 00000000..c7f53b4d
--- /dev/null
+++ b/asn1c/tests/data-119/data-119-02.in
@@ -0,0 +1,3 @@
+<PDU>
+	<ns>0123456789</ns>
+</PDU>
diff --git a/asn1c/tests/data-119/data-119-03.in b/asn1c/tests/data-119/data-119-03.in
new file mode 100644
index 00000000..f51836da
--- /dev/null
+++ b/asn1c/tests/data-119/data-119-03.in
@@ -0,0 +1,3 @@
+<PDU>
+	<ns> </ns>
+</PDU>
diff --git a/asn1c/tests/data-119/data-119-04-P.in b/asn1c/tests/data-119/data-119-04-P.in
new file mode 100644
index 00000000..df606c98
--- /dev/null
+++ b/asn1c/tests/data-119/data-119-04-P.in
@@ -0,0 +1,3 @@
+<PDU>
+	<ns>z</ns>
+</PDU>
diff --git a/asn1c/tests/data-119/data-119-05.in b/asn1c/tests/data-119/data-119-05.in
new file mode 100644
index 00000000..632652d9
--- /dev/null
+++ b/asn1c/tests/data-119/data-119-05.in
@@ -0,0 +1,4 @@
+<PDU>
+	<ia5>yabloko</ia5>
+	<vs>yabloko</vs>
+</PDU>
diff --git a/asn1c/tests/data-119/data-119-06-P.in b/asn1c/tests/data-119/data-119-06-P.in
new file mode 100644
index 00000000..6eddf52c
--- /dev/null
+++ b/asn1c/tests/data-119/data-119-06-P.in
@@ -0,0 +1,3 @@
+<PDU>
+	<ia5>яблоко</ia5>
+</PDU>
diff --git a/asn1c/tests/data-119/data-119-07-P.in b/asn1c/tests/data-119/data-119-07-P.in
new file mode 100644
index 00000000..9f7ace88
--- /dev/null
+++ b/asn1c/tests/data-119/data-119-07-P.in
@@ -0,0 +1,3 @@
+<PDU>
+	<ia5-c>non-capitals</ia5-c>
+</PDU>
diff --git a/asn1c/tests/data-119/data-119-08.in b/asn1c/tests/data-119/data-119-08.in
new file mode 100644
index 00000000..5916078e
--- /dev/null
+++ b/asn1c/tests/data-119/data-119-08.in
@@ -0,0 +1,4 @@
+<PDU>
+	<ia5-c>CAPITALS</ia5-c>
+	<vs-c>CAPITALS</vs-c>
+</PDU>
diff --git a/asn1c/tests/data-119/data-119-09.in b/asn1c/tests/data-119/data-119-09.in
new file mode 100644
index 00000000..b20ca47e
--- /dev/null
+++ b/asn1c/tests/data-119/data-119-09.in
@@ -0,0 +1,8 @@
+<PDU>
+	<ia5></ia5>
+	<ia5-c></ia5-c>
+	<ia5-ce></ia5-ce>
+	<vs></vs>
+	<vs-c></vs-c>
+	<vs-ce></vs-ce>
+</PDU>
diff --git a/asn1c/tests/data-119/data-119-10.in b/asn1c/tests/data-119/data-119-10.in
new file mode 100644
index 00000000..afe04b0f
--- /dev/null
+++ b/asn1c/tests/data-119/data-119-10.in
@@ -0,0 +1,9 @@
+<PDU>
+	<ia5-ir>BAZ</ia5-ir>
+	<vs-ir>BAZ</vs-ir>
+	<pr-ir>BAZ</pr-ir>
+	<ns-ir>19</ns-ir>
+	<ut-c>Do not respect SIZE constraint</ut-c>
+	<ut-ce>Do not respect SIZE constraint</ut-ce>
+	<ut-ir>ABCabc</ut-ir>
+</PDU>
diff --git a/asn1c/tests/data-119/data-119-11-P.in b/asn1c/tests/data-119/data-119-11-P.in
new file mode 100644
index 00000000..4a7d4d23
--- /dev/null
+++ b/asn1c/tests/data-119/data-119-11-P.in
@@ -0,0 +1,3 @@
+<PDU>
+	<ia5-ir>FAIL</ia5-ir>
+</PDU>
diff --git a/asn1c/tests/data-119/data-119-12-P.in b/asn1c/tests/data-119/data-119-12-P.in
new file mode 100644
index 00000000..bd45e2e4
--- /dev/null
+++ b/asn1c/tests/data-119/data-119-12-P.in
@@ -0,0 +1,3 @@
+<PDU>
+	<vs-ir>FAIL</vs-ir>
+</PDU>
diff --git a/asn1c/tests/data-119/data-119-13-P.in b/asn1c/tests/data-119/data-119-13-P.in
new file mode 100644
index 00000000..c2396c13
--- /dev/null
+++ b/asn1c/tests/data-119/data-119-13-P.in
@@ -0,0 +1,3 @@
+<PDU>
+	<pr-ir>FAIL</pr-ir>
+</PDU>
diff --git a/asn1c/tests/data-119/data-119-14-P.in b/asn1c/tests/data-119/data-119-14-P.in
new file mode 100644
index 00000000..0f2d9ecc
--- /dev/null
+++ b/asn1c/tests/data-119/data-119-14-P.in
@@ -0,0 +1,3 @@
+<PDU>
+	<ns-ir>13</ns-ir>
+</PDU>
diff --git a/asn1c/tests/data-119/data-119-15.in b/asn1c/tests/data-119/data-119-15.in
new file mode 100644
index 00000000..296dc2d3
--- /dev/null
+++ b/asn1c/tests/data-119/data-119-15.in
@@ -0,0 +1,3 @@
+<PDU>
+	<ut-ir>ABCabc,12234</ut-ir>
+</PDU>
diff --git a/asn1c/tests/data-119/data-119-16.in b/asn1c/tests/data-119/data-119-16.in
new file mode 100644
index 00000000..2a117faf
--- /dev/null
+++ b/asn1c/tests/data-119/data-119-16.in
@@ -0,0 +1,3 @@
+<PDU>
+	<real>3.14159265</real>
+</PDU>
diff --git a/asn1c/tests/data-119/data-119-17.in b/asn1c/tests/data-119/data-119-17.in
new file mode 100644
index 00000000..862efc13
--- /dev/null
+++ b/asn1c/tests/data-119/data-119-17.in
@@ -0,0 +1,3 @@
+<PDU>
+	<oid>1.3.6.1.4.1.9363.1.5.1</oid>
+</PDU>
diff --git a/asn1c/tests/data-70/README b/asn1c/tests/data-70/README
index 91019add..64eca8b7 100644
--- a/asn1c/tests/data-70/README
+++ b/asn1c/tests/data-70/README
@@ -1,7 +1,7 @@
 Mode of operation:
 
-	Each of the *.in files is XER-decoded, then converted into DER or PER,
-	then decoded back from DER (PER), then encoded into XER again,
+	Each of the *.in files is XER-decoded, then converted into DER,
+	then decoded back from DER, then encoded into XER again,
 	and finally compared to the original encoding.
 
 Naming conventions:
diff --git a/asn1c/unber.c b/asn1c/unber.c
index 4edf18f0..69736988 100644
--- a/asn1c/unber.c
+++ b/asn1c/unber.c
@@ -768,4 +768,8 @@ ssize_t der_write_tags(asn_TYPE_descriptor_t *td, size_t slen, int tag_mode, int
 
 asn_dec_rval_t xer_decode_general(asn_codec_ctx_t *opt_codec_ctx, asn_struct_ctx_t *ctx, void *struct_key, const char *xml_tag, const void *buf_ptr, size_t size, int (*otd)(void *struct_key, const void *chunk_buf, size_t chunk_size), ssize_t (*br)(void *struct_key, const void *chunk_buf, size_t chunk_size, int have_more)) { asn_dec_rval_t rv = { 0, 0 }; (void)opt_codec_ctx; (void)ctx; (void)struct_key; (void)xml_tag; (void)buf_ptr; (void)size; (void)otd; (void)br; return rv; }
 
+asn_dec_rval_t OCTET_STRING_decode_uper(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_uper(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; }
+
 int xer_is_whitespace(const void *b, size_t s) { (void)b; (void)s; return 0; }