Merge changes I934c73d4,I28cdc9a0,I9e734da9,I3c079d86

* changes:
  UPSTREAM: depend
  UPSTREAM: upstream: avoid possible NULL deref; from Pedro Martelletto
  Revert "upstream: fix compilation with DEBUG_KEXDH; bz#3160 ok dtucker@"
  Merge upstream-master into master

1 files changed, 79 insertions, 0 deletions

diff --git a/regress/unittests/misc/tests.c b/regress/unittests/misc/tests.c
new file mode 100644
index 00000000..ed775ebb
--- /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();
+}