util/nvmutil: use local tmpfile on openbsd

if the global file is created on a different file
system than the gbe file, unveil would trigger an
abort trap, since we rely on created a second
temporary file, whose path we can't know ahead
of time.

i could get rid of unveil, or unveil a directory,
but neither is acceptable. just use localtmp on
openbsd. a temporary file is created next to
the gbe file, in the same directory.

Signed-off-by: Leah Rowe <leah@libreboot.org>

util/nvmutil/Makefile

@@ -4,10 +4,10 @@
 
 CC?=cc
 CSTD?=-std=c90
-WERROR?=
-CWARN?=-Wall -pedantic
+WERROR?=-Werror
+CWARN?=-Wall -Wextra -pedantic
 COPT?=-Os
-CFLAGS?=$(COPT) $(CWARN) $(CSTD)
+CFLAGS?=-I. $(COPT) $(CWARN) $(CSTD)
 LDFLAGS?=
 DESTDIR?=
 PREFIX?=/usr/local

util/nvmutil/nvmutil.c

@@ -704,7 +704,17 @@ main(int argc, char *argv[])
 
 	fname = argv[1];
 
+#ifdef NVMUTIL_UNVEIL
+	/*
+	 * if global tmp is a different filesystem,
+	 * unveil would trap on final file rename
+	 * and we can't know the path in advance
+	 */
+	tname = new_tmpfile(&tmp_fd, 1, NULL);
+#else
 	tname = new_tmpfile(&tmp_fd, 0, NULL);
+#endif
+
 	if (tname == NULL)
 		err(errno, "Can't create tmpfile");
 
@@ -1373,6 +1383,8 @@ read_urandom(void)
 	if (fd < 0) {
 
 		fd = open("/dev/urandom", O_RDONLY);
+		if (fd < 0)
+			fd = open("/dev/random", O_RDONLY);
 
 		if (fd < 0)
 			return 16;