2 files changed, 95 insertions, 0 deletions

diff --git a/regress/unittests/misc/Makefile b/regress/unittests/misc/Makefile
new file mode 100644
index 000000000..06e954cb8
--- /dev/null
+++ b/regress/unittests/misc/Makefile
@@ -0,0 +1,16 @@
+#       $OpenBSD: Makefile,v 1.1 2019/04/28 22:53:26 dtucker Exp $
+
+PROG=test_misc
+SRCS=tests.c
+
+# From usr.bin/ssh/Makefile.inc
+SRCS+=sshbuf.c sshbuf-getput-basic.c ssherr.c log.c xmalloc.c misc.c
+# From usr/bin/ssh/sshd/Makefile
+SRCS+=atomicio.c cleanup.c fatal.c
+
+REGRESS_TARGETS=run-regress-${PROG}
+
+run-regress-${PROG}: ${PROG}
+        env ${TEST_ENV} ./${PROG}
+
+.include <bsd.regress.mk>
diff --git a/regress/unittests/misc/tests.c b/regress/unittests/misc/tests.c
new file mode 100644
index 000000000..ed775ebbd
--- /dev/null
+++ b/regress/unittests/misc/tests.c
@@ -0,0 +1,79 @@
+/*      $OpenBSD: tests.c,v 1.1 2019/04/28 22:53:26 dtucker Exp $ */
+/*
+ * Regress test for misc helper functions.
+ *
+ * Placed in the public domain.
+ */
+
+#include <sys/types.h>
+#include <sys/param.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "test_helper.h"
+
+#include "misc.h"
+
+void
+tests(void)
+{
+        int port;
+        char *user, *host, *path;
+
+        TEST_START("misc_parse_user_host_path");
+        ASSERT_INT_EQ(parse_user_host_path("someuser@some.host:some/path",
+            &user, &host, &path), 0);
+        ASSERT_STRING_EQ(user, "someuser");
+        ASSERT_STRING_EQ(host, "some.host");
+        ASSERT_STRING_EQ(path, "some/path");
+        free(user); free(host); free(path);
+        TEST_DONE();
+
+        TEST_START("misc_parse_user_ipv4_path");
+        ASSERT_INT_EQ(parse_user_host_path("someuser@1.22.33.144:some/path",
+            &user, &host, &path), 0);
+        ASSERT_STRING_EQ(user, "someuser");
+        ASSERT_STRING_EQ(host, "1.22.33.144");
+        ASSERT_STRING_EQ(path, "some/path");
+        free(user); free(host); free(path);
+        TEST_DONE();
+
+        TEST_START("misc_parse_user_[ipv4]_path");
+        ASSERT_INT_EQ(parse_user_host_path("someuser@[1.22.33.144]:some/path",
+            &user, &host, &path), 0);
+        ASSERT_STRING_EQ(user, "someuser");
+        ASSERT_STRING_EQ(host, "1.22.33.144");
+        ASSERT_STRING_EQ(path, "some/path");
+        free(user); free(host); free(path);
+        TEST_DONE();
+
+        TEST_START("misc_parse_user_[ipv4]_nopath");
+        ASSERT_INT_EQ(parse_user_host_path("someuser@[1.22.33.144]:",
+            &user, &host, &path), 0);
+        ASSERT_STRING_EQ(user, "someuser");
+        ASSERT_STRING_EQ(host, "1.22.33.144");
+        ASSERT_STRING_EQ(path, ".");
+        free(user); free(host); free(path);
+        TEST_DONE();
+
+        TEST_START("misc_parse_user_ipv6_path");
+        ASSERT_INT_EQ(parse_user_host_path("someuser@[::1]:some/path",
+            &user, &host, &path), 0);
+        ASSERT_STRING_EQ(user, "someuser");
+        ASSERT_STRING_EQ(host, "::1");
+        ASSERT_STRING_EQ(path, "some/path");
+        free(user); free(host); free(path);
+        TEST_DONE();
+
+        TEST_START("misc_parse_uri");
+        ASSERT_INT_EQ(parse_uri("ssh", "ssh://someuser@some.host:22/some/path",
+            &user, &host, &port, &path), 0);
+        ASSERT_STRING_EQ(user, "someuser");
+        ASSERT_STRING_EQ(host, "some.host");
+        ASSERT_INT_EQ(port, 22);
+        ASSERT_STRING_EQ(path, "some/path");
+        free(user); free(host); free(path);
+        TEST_DONE();
+}