From 75073d0a8478441cc97a6efa10b566c5fb1dac81 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@debian.org>
Date: Fri, 17 Apr 2020 20:57:17 +0100
Subject: New upstream version 1.4.0

---
 regress/CMakeLists.txt | 22 ++++++++++------------
 regress/assert.c       |  4 ++++
 regress/cred.c         |  3 +++
 regress/dev.c          |  3 +++
 4 files changed, 20 insertions(+), 12 deletions(-)

(limited to 'regress')

diff --git a/regress/CMakeLists.txt b/regress/CMakeLists.txt
index b8fea64..0314c38 100644
--- a/regress/CMakeLists.txt
+++ b/regress/CMakeLists.txt
@@ -2,17 +2,15 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-# cred
-add_executable(regress_cred cred.c)
-target_link_libraries(regress_cred fido2_shared)
-add_custom_command(TARGET regress_cred POST_BUILD COMMAND regress_cred)
+add_custom_target(regress ALL)
 
-# assert
-add_executable(regress_assert assert.c)
-target_link_libraries(regress_assert fido2_shared)
-add_custom_command(TARGET regress_assert POST_BUILD COMMAND regress_assert)
+macro(add_regress_test NAME SOURCES)
+	add_executable(${NAME} ${SOURCES})
+	target_link_libraries(${NAME} fido2_shared)
+	add_custom_command(TARGET regress POST_BUILD COMMAND ${NAME}
+		DEPENDS ${NAME})
+endmacro()
 
-# dev
-add_executable(regress_dev dev.c)
-target_link_libraries(regress_dev fido2_shared)
-add_custom_command(TARGET regress_dev POST_BUILD COMMAND regress_dev)
+add_regress_test(regress_cred cred.c)
+add_regress_test(regress_assert assert.c)
+add_regress_test(regress_dev dev.c)
diff --git a/regress/assert.c b/regress/assert.c
index ebf0652..caa5725 100644
--- a/regress/assert.c
+++ b/regress/assert.c
@@ -216,12 +216,16 @@ empty_assert_tests(void)
 	fido_dev_io_t io_f;
 	int i;
 
+	memset(&io_f, 0, sizeof(io_f));
+
 	a = alloc_assert();
 	d = alloc_dev();
+
 	io_f.open = dummy_open;
 	io_f.close = dummy_close;
 	io_f.read = dummy_read;
 	io_f.write = dummy_write;
+
 	assert(fido_dev_set_io_functions(d, &io_f) == FIDO_OK);
 
 	empty_assert(d, a, 0);
diff --git a/regress/cred.c b/regress/cred.c
index 4998649..f8c08a4 100644
--- a/regress/cred.c
+++ b/regress/cred.c
@@ -333,10 +333,13 @@ empty_cred(void)
 	assert(fido_cred_x5c_ptr(c) == NULL);
 	assert(fido_cred_verify(c) == FIDO_ERR_INVALID_ARGUMENT);
 
+	memset(&io_f, 0, sizeof(io_f));
+
 	io_f.open = dummy_open;
 	io_f.close = dummy_close;
 	io_f.read = dummy_read;
 	io_f.write = dummy_write;
+
 	d = alloc_dev();
 
 	fido_dev_force_u2f(d);
diff --git a/regress/dev.c b/regress/dev.c
index 39b3584..84a45cc 100644
--- a/regress/dev.c
+++ b/regress/dev.c
@@ -6,6 +6,7 @@
 
 #include <assert.h>
 #include <fido.h>
+#include <string.h>
 
 #define FAKE_DEV_HANDLE	((void *)0xdeadbeef)
 #define REPORT_LEN	(64 + 1)
@@ -53,6 +54,8 @@ open_iff_ok(void)
 	fido_dev_t	*dev = NULL;
 	fido_dev_io_t	 io;
 
+	memset(&io, 0, sizeof(io));
+
 	io.open = dummy_open;
 	io.close = dummy_close;
 	io.read = dummy_read;
-- 
cgit v1.2.3