Adding upstream version 1:9.6p1.upstream/1%9.6p1

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 152 insertions, 0 deletions

diff --git a/regress/unittests/bitmap/Makefile b/regress/unittests/bitmap/Makefile
new file mode 100644
index 0000000..fe30acc
--- /dev/null
+++ b/regress/unittests/bitmap/Makefile
@@ -0,0 +1,14 @@
+#	$OpenBSD: Makefile,v 1.4 2017/12/21 00:41:22 djm Exp $
+
+PROG=test_bitmap
+SRCS=tests.c
+
+# From usr.sbin/ssh
+SRCS+=bitmap.c atomicio.c
+
+REGRESS_TARGETS=run-regress-${PROG}
+
+run-regress-${PROG}: ${PROG}
+	env ${TEST_ENV} ./${PROG}
+
+.include <bsd.regress.mk>
diff --git a/regress/unittests/bitmap/tests.c b/regress/unittests/bitmap/tests.c
new file mode 100644
index 0000000..576b863
--- /dev/null
+++ b/regress/unittests/bitmap/tests.c
@@ -0,0 +1,138 @@
+/* 	$OpenBSD: tests.c,v 1.2 2021/12/14 21:25:27 deraadt Exp $ */
+/*
+ * Regress test for bitmap.h bitmap API
+ *
+ * Placed in the public domain
+ */
+
+#include "includes.h"
+
+#include <sys/types.h>
+#include <stdio.h>
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
+#include <stdlib.h>
+#include <string.h>
+
+#ifdef WITH_OPENSSL
+#include <openssl/bn.h>
+#endif
+
+#include "../test_helper/test_helper.h"
+
+#include "bitmap.h"
+
+#define NTESTS 131
+
+void
+tests(void)
+{
+#ifdef WITH_OPENSSL
+	struct bitmap *b;
+	BIGNUM *bn;
+	size_t len;
+	int i, j, k, n;
+	u_char bbuf[1024], bnbuf[1024];
+	int r;
+
+	TEST_START("bitmap_new");
+	b = bitmap_new();
+	ASSERT_PTR_NE(b, NULL);
+	bn = BN_new();
+	ASSERT_PTR_NE(bn, NULL);
+	TEST_DONE();
+
+	TEST_START("bitmap_set_bit / bitmap_test_bit");
+	for (i = -1; i < NTESTS; i++) {
+		for (j = -1; j < NTESTS; j++) {
+			for (k = -1; k < NTESTS; k++) {
+				bitmap_zero(b);
+				BN_clear(bn);
+
+				test_subtest_info("set %d/%d/%d", i, j, k);
+				/* Set bits */
+				if (i >= 0) {
+					ASSERT_INT_EQ(bitmap_set_bit(b, i), 0);
+					ASSERT_INT_EQ(BN_set_bit(bn, i), 1);
+				}
+				if (j >= 0) {
+					ASSERT_INT_EQ(bitmap_set_bit(b, j), 0);
+					ASSERT_INT_EQ(BN_set_bit(bn, j), 1);
+				}
+				if (k >= 0) {
+					ASSERT_INT_EQ(bitmap_set_bit(b, k), 0);
+					ASSERT_INT_EQ(BN_set_bit(bn, k), 1);
+				}
+
+				/* Check perfect match between bitmap and bn */
+				test_subtest_info("match %d/%d/%d", i, j, k);
+				for (n = 0; n < NTESTS; n++) {
+					ASSERT_INT_EQ(BN_is_bit_set(bn, n),
+					    bitmap_test_bit(b, n));
+				}
+
+				/* Test length calculations */
+				test_subtest_info("length %d/%d/%d", i, j, k);
+				ASSERT_INT_EQ(BN_num_bits(bn),
+				    (int)bitmap_nbits(b));
+				ASSERT_INT_EQ(BN_num_bytes(bn),
+				    (int)bitmap_nbytes(b));
+
+				/* Test serialisation */
+				test_subtest_info("serialise %d/%d/%d",
+				    i, j, k);
+				len = bitmap_nbytes(b);
+				memset(bbuf, 0xfc, sizeof(bbuf));
+				ASSERT_INT_EQ(bitmap_to_string(b, bbuf,
+				    sizeof(bbuf)), 0);
+				for (n = len; n < (int)sizeof(bbuf); n++)
+					ASSERT_U8_EQ(bbuf[n], 0xfc);
+				r = BN_bn2bin(bn, bnbuf);
+				ASSERT_INT_GE(r, 0);
+				ASSERT_INT_EQ(r, (int)len);
+				ASSERT_MEM_EQ(bbuf, bnbuf, len);
+
+				/* Test deserialisation */
+				test_subtest_info("deserialise %d/%d/%d",
+				    i, j, k);
+				bitmap_zero(b);
+				ASSERT_INT_EQ(bitmap_from_string(b, bnbuf,
+				    len), 0);
+				for (n = 0; n < NTESTS; n++) {
+					ASSERT_INT_EQ(BN_is_bit_set(bn, n),
+					    bitmap_test_bit(b, n));
+				}
+
+				/* Test clearing bits */
+				test_subtest_info("clear %d/%d/%d",
+				    i, j, k);
+				for (n = 0; n < NTESTS; n++) {
+					ASSERT_INT_EQ(bitmap_set_bit(b, n), 0);
+					ASSERT_INT_EQ(BN_set_bit(bn, n), 1);
+				}
+				if (i >= 0) {
+					bitmap_clear_bit(b, i);
+					BN_clear_bit(bn, i);
+				}
+				if (j >= 0) {
+					bitmap_clear_bit(b, j);
+					BN_clear_bit(bn, j);
+				}
+				if (k >= 0) {
+					bitmap_clear_bit(b, k);
+					BN_clear_bit(bn, k);
+				}
+				for (n = 0; n < NTESTS; n++) {
+					ASSERT_INT_EQ(BN_is_bit_set(bn, n),
+					    bitmap_test_bit(b, n));
+				}
+			}
+		}
+	}
+	bitmap_free(b);
+	BN_free(bn);
+	TEST_DONE();
+#endif
+}
+