Import openssh_7.5p1.orig.tar.gz

7 files changed, 155 insertions, 29 deletions

diff --git a/regress/unittests/Makefile b/regress/unittests/Makefile
index e70b16644..e975f6ca4 100644
--- a/regress/unittests/Makefile
+++ b/regress/unittests/Makefile
@@ -1,5 +1,6 @@
-#       $OpenBSD: Makefile,v 1.7 2016/08/19 06:44:13 djm Exp $
-REGRESS_FAIL_EARLY= yes
-SUBDIR= test_helper sshbuf sshkey bitmap kex hostkeys utf8 match
+#       $OpenBSD: Makefile,v 1.9 2017/03/14 01:20:29 dtucker Exp $
+
+REGRESS_FAIL_EARLY?=    yes
+SUBDIR= test_helper sshbuf sshkey bitmap kex hostkeys utf8 match conversion
 
 .include <bsd.subdir.mk>
diff --git a/regress/unittests/conversion/Makefile b/regress/unittests/conversion/Makefile
new file mode 100644
index 000000000..cde97dc28
--- /dev/null
+++ b/regress/unittests/conversion/Makefile
@@ -0,0 +1,10 @@
+#       $OpenBSD: Makefile,v 1.1 2017/03/14 01:20:29 dtucker Exp $
+
+PROG=test_conversion
+SRCS=tests.c
+REGRESS_TARGETS=run-regress-${PROG}
+
+run-regress-${PROG}: ${PROG}
+        env ${TEST_ENV} ./${PROG}
+
+.include <bsd.regress.mk>
diff --git a/regress/unittests/conversion/tests.c b/regress/unittests/conversion/tests.c
new file mode 100644
index 000000000..6dd77ef42
--- /dev/null
+++ b/regress/unittests/conversion/tests.c
@@ -0,0 +1,51 @@
+/*      $OpenBSD: tests.c,v 1.1 2017/03/14 01:20:29 dtucker Exp $ */
+/*
+ * Regress test for conversions
+ *
+ * Placed in the public domain
+ */
+
+#include "includes.h"
+
+#include <sys/types.h>
+#include <sys/param.h>
+#include <stdio.h>
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
+#include <stdlib.h>
+#include <string.h>
+
+#include "../test_helper/test_helper.h"
+
+#include "misc.h"
+
+void
+tests(void)
+{
+        char buf[1024];
+
+        TEST_START("conversion_convtime");
+        ASSERT_LONG_EQ(convtime("0"), 0);
+        ASSERT_LONG_EQ(convtime("1"), 1);
+        ASSERT_LONG_EQ(convtime("1S"), 1);
+        /* from the examples in the comment above the function */
+        ASSERT_LONG_EQ(convtime("90m"), 5400);
+        ASSERT_LONG_EQ(convtime("1h30m"), 5400);
+        ASSERT_LONG_EQ(convtime("2d"), 172800);
+        ASSERT_LONG_EQ(convtime("1w"), 604800);
+
+        /* negative time is not allowed */
+        ASSERT_LONG_EQ(convtime("-7"), -1);
+        ASSERT_LONG_EQ(convtime("-9d"), -1);
+        
+        /* overflow */
+        snprintf(buf, sizeof buf, "%llu", (unsigned long long)LONG_MAX + 1);
+        ASSERT_LONG_EQ(convtime(buf), -1);
+
+        /* overflow with multiplier */
+        snprintf(buf, sizeof buf, "%lluM", (unsigned long long)LONG_MAX/60 + 1);
+        ASSERT_LONG_EQ(convtime(buf), -1);
+        ASSERT_LONG_EQ(convtime("1000000000000000000000w"), -1);
+        TEST_DONE();
+}
diff --git a/regress/unittests/match/tests.c b/regress/unittests/match/tests.c
index 7ff319c16..e1593367b 100644
--- a/regress/unittests/match/tests.c
+++ b/regress/unittests/match/tests.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: tests.c,v 1.3 2016/09/21 17:03:54 djm Exp $ */
+/*      $OpenBSD: tests.c,v 1.4 2017/02/03 23:01:42 djm Exp $ */
 /*
  * Regress test for matching functions
  *
@@ -103,6 +103,25 @@ tests(void)
         /* XXX negated ASSERT_INT_EQ(addr_match_list("127.0.0.1", "!127.0.0.2,10.0.0.1"), 1); */
         TEST_DONE();
 
+#define CHECK_FILTER(string,filter,expected) \
+        do { \
+                char *result = match_filter_list((string), (filter)); \
+                ASSERT_STRING_EQ(result, expected); \
+                free(result); \
+        } while (0)
+
+        TEST_START("match_filter_list");
+        CHECK_FILTER("a,b,c", "", "a,b,c");
+        CHECK_FILTER("a,b,c", "a", "b,c");
+        CHECK_FILTER("a,b,c", "b", "a,c");
+        CHECK_FILTER("a,b,c", "c", "a,b");
+        CHECK_FILTER("a,b,c", "a,b", "c");
+        CHECK_FILTER("a,b,c", "a,c", "b");
+        CHECK_FILTER("a,b,c", "b,c", "a");
+        CHECK_FILTER("a,b,c", "a,b,c", "");
+        CHECK_FILTER("a,b,c", "b,c", "a");
+        CHECK_FILTER("", "a,b,c", "");
+        TEST_DONE();
 /*
  * XXX TODO
  * int      match_host_and_ip(const char *, const char *, const char *);
diff --git a/regress/unittests/test_helper/test_helper.c b/regress/unittests/test_helper/test_helper.c
index 26ca26b5e..f855137fb 100644
--- a/regress/unittests/test_helper/test_helper.c
+++ b/regress/unittests/test_helper/test_helper.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: test_helper.c,v 1.6 2015/03/03 20:42:49 djm Exp $     */
+/*      $OpenBSD: test_helper.c,v 1.7 2017/03/14 01:10:07 dtucker Exp $ */
 /*
  * Copyright (c) 2011 Damien Miller <djm@mindrot.org>
  *
@@ -442,6 +442,17 @@ assert_u_int(const char *file, int line, const char *a1, const char *a2,
 }
 
 void
+assert_long(const char *file, int line, const char *a1, const char *a2,
+    long aa1, long aa2, enum test_predicate pred)
+{
+        TEST_CHECK(aa1, aa2, pred);
+        test_header(file, line, a1, a2, "LONG", pred);
+        fprintf(stderr, "%12s = %ld / 0x%lx\n", a1, aa1, aa1);
+        fprintf(stderr, "%12s = %ld / 0x%lx\n", a2, aa2, aa2);
+        test_die();
+}
+
+void
 assert_long_long(const char *file, int line, const char *a1, const char *a2,
     long long aa1, long long aa2, enum test_predicate pred)
 {
diff --git a/regress/unittests/test_helper/test_helper.h b/regress/unittests/test_helper/test_helper.h
index 1d9c66986..615b7832b 100644
--- a/regress/unittests/test_helper/test_helper.h
+++ b/regress/unittests/test_helper/test_helper.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: test_helper.h,v 1.6 2015/01/18 19:52:44 djm Exp $     */
+/*      $OpenBSD: test_helper.h,v 1.7 2017/03/14 01:10:07 dtucker Exp $ */
 /*
  * Copyright (c) 2011 Damien Miller <djm@mindrot.org>
  *
@@ -67,6 +67,9 @@ void assert_size_t(const char *file, int line,
 void assert_u_int(const char *file, int line,
     const char *a1, const char *a2,
     u_int aa1, u_int aa2, enum test_predicate pred);
+void assert_long(const char *file, int line,
+    const char *a1, const char *a2,
+    long aa1, long aa2, enum test_predicate pred);
 void assert_long_long(const char *file, int line,
     const char *a1, const char *a2,
     long long aa1, long long aa2, enum test_predicate pred);
@@ -110,6 +113,8 @@ void assert_u64(const char *file, int line,
         assert_size_t(__FILE__, __LINE__, #a1, #a2, a1, a2, TEST_EQ)
 #define ASSERT_U_INT_EQ(a1, a2) \
         assert_u_int(__FILE__, __LINE__, #a1, #a2, a1, a2, TEST_EQ)
+#define ASSERT_LONG_EQ(a1, a2) \
+        assert_long(__FILE__, __LINE__, #a1, #a2, a1, a2, TEST_EQ)
 #define ASSERT_LONG_LONG_EQ(a1, a2) \
         assert_long_long(__FILE__, __LINE__, #a1, #a2, a1, a2, TEST_EQ)
 #define ASSERT_CHAR_EQ(a1, a2) \
@@ -139,6 +144,8 @@ void assert_u64(const char *file, int line,
         assert_size_t(__FILE__, __LINE__, #a1, #a2, a1, a2, TEST_NE)
 #define ASSERT_U_INT_NE(a1, a2) \
         assert_u_int(__FILE__, __LINE__, #a1, #a2, a1, a2, TEST_NE)
+#define ASSERT_LONG_NE(a1, a2) \
+        assert_long(__FILE__, __LINE__, #a1, #a2, a1, a2, TEST_NE)
 #define ASSERT_LONG_LONG_NE(a1, a2) \
         assert_long_long(__FILE__, __LINE__, #a1, #a2, a1, a2, TEST_NE)
 #define ASSERT_CHAR_NE(a1, a2) \
@@ -166,6 +173,8 @@ void assert_u64(const char *file, int line,
         assert_size_t(__FILE__, __LINE__, #a1, #a2, a1, a2, TEST_LT)
 #define ASSERT_U_INT_LT(a1, a2) \
         assert_u_int(__FILE__, __LINE__, #a1, #a2, a1, a2, TEST_LT)
+#define ASSERT_LONG_LT(a1, a2) \
+        assert_long(__FILE__, __LINE__, #a1, #a2, a1, a2, TEST_LT)
 #define ASSERT_LONG_LONG_LT(a1, a2) \
         assert_long_long(__FILE__, __LINE__, #a1, #a2, a1, a2, TEST_LT)
 #define ASSERT_CHAR_LT(a1, a2) \
@@ -193,6 +202,8 @@ void assert_u64(const char *file, int line,
         assert_size_t(__FILE__, __LINE__, #a1, #a2, a1, a2, TEST_LE)
 #define ASSERT_U_INT_LE(a1, a2) \
         assert_u_int(__FILE__, __LINE__, #a1, #a2, a1, a2, TEST_LE)
+#define ASSERT_LONG_LE(a1, a2) \
+        assert_long(__FILE__, __LINE__, #a1, #a2, a1, a2, TEST_LE)
 #define ASSERT_LONG_LONG_LE(a1, a2) \
         assert_long_long(__FILE__, __LINE__, #a1, #a2, a1, a2, TEST_LE)
 #define ASSERT_CHAR_LE(a1, a2) \
@@ -220,6 +231,8 @@ void assert_u64(const char *file, int line,
         assert_size_t(__FILE__, __LINE__, #a1, #a2, a1, a2, TEST_GT)
 #define ASSERT_U_INT_GT(a1, a2) \
         assert_u_int(__FILE__, __LINE__, #a1, #a2, a1, a2, TEST_GT)
+#define ASSERT_LONG_GT(a1, a2) \
+        assert_long(__FILE__, __LINE__, #a1, #a2, a1, a2, TEST_GT)
 #define ASSERT_LONG_LONG_GT(a1, a2) \
         assert_long_long(__FILE__, __LINE__, #a1, #a2, a1, a2, TEST_GT)
 #define ASSERT_CHAR_GT(a1, a2) \
@@ -247,6 +260,8 @@ void assert_u64(const char *file, int line,
         assert_size_t(__FILE__, __LINE__, #a1, #a2, a1, a2, TEST_GE)
 #define ASSERT_U_INT_GE(a1, a2) \
         assert_u_int(__FILE__, __LINE__, #a1, #a2, a1, a2, TEST_GE)
+#define ASSERT_LONG_GE(a1, a2) \
+        assert_long(__FILE__, __LINE__, #a1, #a2, a1, a2, TEST_GE)
 #define ASSERT_LONG_LONG_GE(a1, a2) \
         assert_long_long(__FILE__, __LINE__, #a1, #a2, a1, a2, TEST_GE)
 #define ASSERT_CHAR_GE(a1, a2) \
diff --git a/regress/unittests/utf8/tests.c b/regress/unittests/utf8/tests.c
index 31f9fe9c3..f0bbca509 100644
--- a/regress/unittests/utf8/tests.c
+++ b/regress/unittests/utf8/tests.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: tests.c,v 1.3 2016/12/19 04:55:18 djm Exp $ */
+/*      $OpenBSD: tests.c,v 1.4 2017/02/19 00:11:29 djm Exp $ */
 /*
  * Regress test for the utf8.h *mprintf() API
  *
@@ -15,10 +15,7 @@
 
 #include "utf8.h"
 
-void     badarg(void);
-void     one(const char *, const char *, int, int, int, const char *);
-
-void
+static void
 badarg(void)
 {
         char     buf[16];
@@ -33,8 +30,8 @@ badarg(void)
         TEST_DONE();
 }
 
-void
-one(const char *name, const char *mbs, int width,
+static void
+one(int utf8, const char *name, const char *mbs, int width,
     int wantwidth, int wantlen, const char *wants)
 {
         char     buf[16];
@@ -43,7 +40,7 @@ one(const char *name, const char *mbs, int width,
 
         if (wantlen == -2)
                 wantlen = strlen(wants);
-        (void)strlcpy(buf, "utf8_", sizeof(buf));
+        (void)strlcpy(buf, utf8 ? "utf8_" : "c_", sizeof(buf));
         (void)strlcat(buf, name, sizeof(buf));
         TEST_START(buf);
         wp = wantwidth == -2 ? NULL : &width;
@@ -65,19 +62,41 @@ tests(void)
         TEST_DONE();
 
         badarg();
-        one("empty", "", 2, 0, 0, "");
-        one("ascii", "x", -2, -2, -2, "x");
-        one("newline", "a\nb", -2, -2, -2, "a\nb");
-        one("cr", "a\rb", -2, -2, -2, "a\rb");
-        one("tab", "a\tb", -2, -2, -2, "a\tb");
-        one("esc", "\033x", -2, -2, -2, "\\033x");
-        one("inv_badbyte", "\377x", -2, -2, -2, "\\377x");
-        one("inv_nocont", "\341x", -2, -2, -2, "\\341x");
-        one("inv_nolead", "a\200b", -2, -2, -2, "a\\200b");
-        one("sz_ascii", "1234567890123456", -2, -2, 16, "123456789012345");
-        one("sz_esc", "123456789012\033", -2, -2, 16, "123456789012");
-        one("width_ascii", "123", 2, 2, -1, "12");
-        one("width_double", "a\343\201\201", 2, 1, -1, "a");
-        one("double_fit", "a\343\201\201", 3, 3, 4, "a\343\201\201");
-        one("double_spc", "a\343\201\201", 4, 3, 4, "a\343\201\201");
+        one(1, "empty", "", 2, 0, 0, "");
+        one(1, "ascii", "x", -2, -2, -2, "x");
+        one(1, "newline", "a\nb", -2, -2, -2, "a\nb");
+        one(1, "cr", "a\rb", -2, -2, -2, "a\rb");
+        one(1, "tab", "a\tb", -2, -2, -2, "a\tb");
+        one(1, "esc", "\033x", -2, -2, -2, "\\033x");
+        one(1, "inv_badbyte", "\377x", -2, -2, -2, "\\377x");
+        one(1, "inv_nocont", "\341x", -2, -2, -2, "\\341x");
+        one(1, "inv_nolead", "a\200b", -2, -2, -2, "a\\200b");
+        one(1, "sz_ascii", "1234567890123456", -2, -2, 16, "123456789012345");
+        one(1, "sz_esc", "123456789012\033", -2, -2, 16, "123456789012");
+        one(1, "width_ascii", "123", 2, 2, -1, "12");
+        one(1, "width_double", "a\343\201\201", 2, 1, -1, "a");
+        one(1, "double_fit", "a\343\201\201", 3, 3, 4, "a\343\201\201");
+        one(1, "double_spc", "a\343\201\201", 4, 3, 4, "a\343\201\201");
+
+        TEST_START("C_setlocale");
+        loc = setlocale(LC_CTYPE, "C");
+        ASSERT_PTR_NE(loc, NULL);
+        TEST_DONE();
+
+        badarg();
+        one(0, "empty", "", 2, 0, 0, "");
+        one(0, "ascii", "x", -2, -2, -2, "x");
+        one(0, "newline", "a\nb", -2, -2, -2, "a\nb");
+        one(0, "cr", "a\rb", -2, -2, -2, "a\rb");
+        one(0, "tab", "a\tb", -2, -2, -2, "a\tb");
+        one(0, "esc", "\033x", -2, -2, -2, "\\033x");
+        one(0, "inv_badbyte", "\377x", -2, -2, -2, "\\377x");
+        one(0, "inv_nocont", "\341x", -2, -2, -2, "\\341x");
+        one(0, "inv_nolead", "a\200b", -2, -2, -2, "a\\200b");
+        one(0, "sz_ascii", "1234567890123456", -2, -2, 16, "123456789012345");
+        one(0, "sz_esc", "123456789012\033", -2, -2, 16, "123456789012");
+        one(0, "width_ascii", "123", 2, 2, -1, "12");
+        one(0, "width_double", "a\343\201\201", 2, 1, -1, "a");
+        one(0, "double_fit", "a\343\201\201", 7, 5, -1, "a\\343");
+        one(0, "double_spc", "a\343\201\201", 13, 13, 13, "a\\343\\201\\201");
 }