test: Import explicit_bzero and strtonum test cases from OpenBSD - Remove trailing spaces. - Declare file-scope functions and variables static. - Declare functions with a proper prototype. - Do not mix declarations and code for C90 conformance. - Do not compare size_t and ssize_t variables.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358
diff --git a/COPYING b/COPYING
index 32a1130..c225ede 100644
--- a/COPYING
+++ b/COPYING
@@ -383,6 +383,8 @@ Files:
src/recallocarray.c
src/strlcat.c
src/strlcpy.c
+ test/explicit_bzero.c
+ test/strtonum.c
Copyright:
Copyright © 2004 Ted Unangst and Todd Miller
All rights reserved.
@@ -391,6 +393,7 @@ Copyright:
Copyright © 1998, 2000-2002, 2004-2005, 2007, 2010, 2012-2015
Todd C. Miller <Todd.Miller@courtesan.com>
Copyright © 2004 Ted Unangst
+ Copyright © 2004 Otto Moerbeek <otto@drijf.net>
Copyright © 2008 Damien Miller <djm@openbsd.org>
Copyright © 2008, 2010-2011, 2016-2017 Otto Moerbeek <otto@drijf.net>
Copyright © 2013 Markus Friedl <markus@openbsd.org>
@@ -398,6 +401,7 @@ Copyright:
Copyright © 2014 Brent Cook <bcook@openbsd.org>
Copyright © 2014 Pawel Jakub Dawidek <pjd@FreeBSD.org>
Copyright © 2014 Theo de Raadt <deraadt@openbsd.org>
+ Copyright © 2014 Google Inc.
Copyright © 2015 Michael Felt <aixtools@gmail.com>
Copyright © 2015 Guillem Jover <guillem@hadrons.org>
License: ISC
diff --git a/test/.gitignore b/test/.gitignore
index f226451..a80f854 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -2,6 +2,7 @@ arc4random
bzero
closefrom
endian
+explicit_bzero
fgetln
fparseln
fpurge
@@ -20,5 +21,6 @@ setmode
strl
strmode
strnstr
+strtonum
vis
vis-openbsd
diff --git a/test/Makefile.am b/test/Makefile.am
index 5ef4f29..3939583 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -34,6 +34,7 @@ check_PROGRAMS = \
bzero \
closefrom \
endian \
+ explicit_bzero \
humanize \
fgetln \
funopen \
@@ -48,6 +49,7 @@ check_PROGRAMS = \
strl \
strmode \
strnstr \
+ strtonum \
vis \
vis-openbsd \
$(nil)
diff --git a/test/explicit_bzero.c b/test/explicit_bzero.c
new file mode 100644
index 0000000..74993c2
--- /dev/null
+++ b/test/explicit_bzero.c
@@ -0,0 +1,214 @@
+/* $OpenBSD: explicit_bzero.c,v 1.7 2021/03/27 11:17:58 bcook Exp $ */
+/*
+ * Copyright (c) 2014 Google Inc.
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <assert.h>
+#include <errno.h>
+#include <signal.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#define ASSERT_EQ(a, b) assert((a) == (b))
+#define ASSERT_NE(a, b) assert((a) != (b))
+#define ASSERT_GE(a, b) assert((a) >= (b))
+
+/* 128 bits of random data. */
+static const char secret[16] = {
+ 0xa0, 0x6c, 0x0c, 0x81, 0xba, 0xd8, 0x5b, 0x0c,
+ 0xb0, 0xd6, 0xd4, 0xe3, 0xeb, 0x52, 0x5f, 0x96,
+};
+
+enum {
+ SECRETCOUNT = 64,
+ SECRETBYTES = SECRETCOUNT * sizeof(secret)
+};
+
+/*
+ * As of glibc 2.34, when _GNU_SOURCE is defined, SIGSTKSZ is no longer
+ * constant on Linux. SIGSTKSZ is redefined to sysconf (_SC_SIGSTKSZ).
+ */
+static char *altstack;
+#define ALTSTACK_SIZE (SIGSTKSZ + SECRETBYTES)
+
+static void
+setup_stack(void)
+{
+ const stack_t sigstk = {
+ .ss_sp = altstack = calloc(1, ALTSTACK_SIZE),
+ .ss_size = ALTSTACK_SIZE
+ };
+
+ ASSERT_NE(NULL, altstack);
+ ASSERT_EQ(0, sigaltstack(&sigstk, NULL));
+}
+
+static void
+cleanup_stack(void)
+{
+ free(altstack);
+}
+
+static void
+assert_on_stack(void)
+{
+ stack_t cursigstk;
+ ASSERT_EQ(0, sigaltstack(NULL, &cursigstk));
+ ASSERT_EQ(SS_ONSTACK, cursigstk.ss_flags & (SS_DISABLE|SS_ONSTACK));
+}
+
+static void
+call_on_stack(void (*fn)(int))
+{
+ /*
+ * This is a bit more complicated than strictly necessary, but
+ * it ensures we don't have any flaky test failures due to
+ * inherited signal masks/actions/etc.
+ *
+ * On systems where SA_ONSTACK is not supported, this could
+ * alternatively be implemented using makecontext() or
+ * pthread_attr_setstack().
+ */
+
+ const struct sigaction sigact = {
+ .sa_handler = fn,
+ .sa_flags = SA_ONSTACK,
+ };
+ struct sigaction oldsigact;
+ sigset_t sigset, oldsigset;
+
+ /* First, block all signals. */
+ ASSERT_EQ(0, sigemptyset(&sigset));
+ ASSERT_EQ(0, sigfillset(&sigset));
+ ASSERT_EQ(0, sigprocmask(SIG_BLOCK, &sigset, &oldsigset));
+
+ /* Next setup the signal handler for SIGUSR1. */
+ ASSERT_EQ(0, sigaction(SIGUSR1, &sigact, &oldsigact));
+
+ /* Raise SIGUSR1 and momentarily unblock it to run the handler. */
+ ASSERT_EQ(0, raise(SIGUSR1));
+ ASSERT_EQ(0, sigdelset(&sigset, SIGUSR1));
+ ASSERT_EQ(-1, sigsuspend(&sigset));
+ ASSERT_EQ(EINTR, errno);
+
+ /* Restore the original signal action, stack, and mask. */
+ ASSERT_EQ(0, sigaction(SIGUSR1, &oldsigact, NULL));
+ ASSERT_EQ(0, sigprocmask(SIG_SETMASK, &oldsigset, NULL));
+}
+
+static void
+populate_secret(char *buf, ssize_t len)
+{
+ int i, fds[2];
+ ASSERT_EQ(0, pipe(fds));
+
+ for (i = 0; i < SECRETCOUNT; i++)
+ ASSERT_EQ(sizeof(secret), write(fds[1], secret, sizeof(secret)));
+ ASSERT_EQ(0, close(fds[1]));
+
+ ASSERT_EQ(len, read(fds[0], buf, len));
+ ASSERT_EQ(0, close(fds[0]));
+}
+
+static int
+count_secrets(const char *buf)
+{
+ int res = 0;
+ size_t i;
+ for (i = 0; i < SECRETCOUNT; i++) {
+ if (memcmp(buf + i * sizeof(secret), secret,
+ sizeof(secret)) == 0)
+ res += 1;
+ }
+ return (res);
+}
+
+static char *
+test_without_bzero(void)
+{
+ char buf[SECRETBYTES];
+ char *res;
+ assert_on_stack();
+ populate_secret(buf, sizeof(buf));
+ res = memmem(altstack, ALTSTACK_SIZE, buf, sizeof(buf));
+ ASSERT_NE(NULL, res);
+ return (res);
+}
+
+static char *
+test_with_bzero(void)
+{
+ char buf[SECRETBYTES];
+ char *res;
+ assert_on_stack();
+ populate_secret(buf, sizeof(buf));
+ res = memmem(altstack, ALTSTACK_SIZE, buf, sizeof(buf));
+ ASSERT_NE(NULL, res);
+ explicit_bzero(buf, sizeof(buf));
+ return (res);
+}
+
+static void
+do_test_without_bzero(int signo)
+{
+ char *buf = test_without_bzero();
+ ASSERT_GE(count_secrets(buf), 1);
+}
+
+static void
+do_test_with_bzero(int signo)
+{
+ char *buf = test_with_bzero();
+ ASSERT_EQ(count_secrets(buf), 0);
+}
+
+int
+main(int argc, char **argv)
+{
+ setup_stack();
+
+ /*
+ * Solaris and OS X clobber the signal stack after returning to the
+ * normal stack, so we need to inspect altstack while we're still
+ * running on it. Unfortunately, this means we risk clobbering the
+ * buffer ourselves.
+ *
+ * To minimize this risk, test_with{,out}_bzero() are responsible for
+ * locating the offset of their buf variable within altstack, and
+ * and returning that address. Then we can simply memcmp() repeatedly
+ * to count how many instances of secret we found.
+ */
+
+ /*
+ * First, test that if we *don't* call explicit_bzero, that we
+ * *are* able to find at least one instance of the secret data still
+ * on the stack. This sanity checks that call_on_stack() and
+ * populate_secret() work as intended.
+ */
+ memset(altstack, 0, ALTSTACK_SIZE);
+ call_on_stack(do_test_without_bzero);
+
+ /*
+ * Now test with a call to explicit_bzero() and check that we
+ * *don't* find any instances of the secret data.
+ */
+ memset(altstack, 0, ALTSTACK_SIZE);
+ call_on_stack(do_test_with_bzero);
+
+ cleanup_stack();
+
+ return (0);
+}
diff --git a/test/strtonum.c b/test/strtonum.c
new file mode 100644
index 0000000..6dee3da
--- /dev/null
+++ b/test/strtonum.c
@@ -0,0 +1,64 @@
+/* $OpenBSD: strtonumtest.c,v 1.1 2004/08/03 20:38:36 otto Exp $ */
+/*
+ * Copyright (c) 2004 Otto Moerbeek <otto@drijf.net>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+static int fail;
+
+static void
+test(const char *p, long long lb, long long ub, int ok)
+{
+ long long val;
+ const char *q;
+
+ val = strtonum(p, lb, ub, &q);
+ if (ok && q != NULL) {
+ fprintf(stderr, "%s [%lld-%lld] ", p, lb, ub);
+ fprintf(stderr, "NUMBER NOT ACCEPTED %s\n", q);
+ fail = 1;
+ } else if (!ok && q == NULL) {
+ fprintf(stderr, "%s [%lld-%lld] %lld ", p, lb, ub, val);
+ fprintf(stderr, "NUMBER ACCEPTED\n");
+ fail = 1;
+ }
+}
+
+int main(int argc, char *argv[])
+{
+ test("1", 0, 10, 1);
+ test("0", -2, 5, 1);
+ test("0", 2, 5, 0);
+ test("0", 2, LLONG_MAX, 0);
+ test("-2", 0, LLONG_MAX, 0);
+ test("0", -5, LLONG_MAX, 1);
+ test("-3", -3, LLONG_MAX, 1);
+ test("-9223372036854775808", LLONG_MIN, LLONG_MAX, 1);
+ test("9223372036854775807", LLONG_MIN, LLONG_MAX, 1);
+ test("-9223372036854775809", LLONG_MIN, LLONG_MAX, 0);
+ test("9223372036854775808", LLONG_MIN, LLONG_MAX, 0);
+ test("1000000000000000000000000", LLONG_MIN, LLONG_MAX, 0);
+ test("-1000000000000000000000000", LLONG_MIN, LLONG_MAX, 0);
+ test("-2", 10, -1, 0);
+ test("-2", -10, -1, 1);
+ test("-20", -10, -1, 0);
+ test("20", -10, -1, 0);
+
+ return (fail);
+}
+