vboot: Move common code under common/vboot

This patch moves the code which can be shared with other data
verification schemes (e.g. RWSIG) under common/vboot. It also
adds unit tests for it.

BUG=b:38462249
BRANCH=none
TEST=make run-vboot. Verify verification succeeds on Fizz.

Change-Id: Icab4d96dd2c154a12b01c41ebe9b46286b4b590e
Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/563463
Reviewed-by: Randall Spangler <rspangler@chromium.org>

4 files changed, 181 insertions, 0 deletions

diff --git a/test/build.mk b/test/build.mk
index 2a1102748d..c54627d03c 100644
--- a/test/build.mk
+++ b/test/build.mk
@@ -79,6 +79,7 @@ test-list-host += usb_pd
 test-list-host += usb_pd_giveback
 test-list-host += utils
 test-list-host += utils_str
+test-list-host += vboot
 test-list-host += x25519
 endif
 
@@ -130,4 +131,5 @@ usb_pd-y=usb_pd.o
 usb_pd_giveback-y=usb_pd.o
 utils-y=utils.o
 utils_str-y=utils_str.o
+vboot-y=vboot.o
 x25519-y=x25519.o
diff --git a/test/test_config.h b/test/test_config.h
index b90aac3966..5c4807fd66 100644
--- a/test/test_config.h
+++ b/test/test_config.h
@@ -225,6 +225,26 @@ enum nvmem_vars {
 #define CONFIG_FLASH_NVMEM_VARS_USER_SIZE 600
 #endif	/* TEST_NVMEM_VARS */
 
+#ifdef TEST_VBOOT
+#define CONFIG_RWSIG
+#define CONFIG_SHA256
+#define CONFIG_RSA
+#define CONFIG_RWSIG_TYPE_RWSIG
+#define CONFIG_RW_B
+#define CONFIG_RW_B_MEM_OFF		CONFIG_RO_MEM_OFF
+#undef  CONFIG_RO_SIZE
+#define CONFIG_RO_SIZE			(CONFIG_FLASH_SIZE / 4)
+#undef  CONFIG_RW_SIZE
+#define CONFIG_RW_SIZE			CONFIG_RO_SIZE
+#define CONFIG_RW_A_STORAGE_OFF		CONFIG_RW_STORAGE_OFF
+#define CONFIG_RW_B_STORAGE_OFF		(CONFIG_RW_A_STORAGE_OFF + \
+					 CONFIG_RW_SIZE)
+#define CONFIG_RW_A_SIGN_STORAGE_OFF	(CONFIG_RW_A_STORAGE_OFF + \
+					 CONFIG_RW_SIZE - CONFIG_RW_SIG_SIZE)
+#define CONFIG_RW_B_SIGN_STORAGE_OFF	(CONFIG_RW_B_STORAGE_OFF + \
+					 CONFIG_RW_SIZE - CONFIG_RW_SIG_SIZE)
+#endif
+
 #ifdef TEST_X25519
 #define CONFIG_CURVE25519
 #endif /* TEST_X25519 */
diff --git a/test/vboot.c b/test/vboot.c
new file mode 100644
index 0000000000..3d4be10308
--- /dev/null
+++ b/test/vboot.c
@@ -0,0 +1,142 @@
+/* Copyright 2017 The Chromium OS Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ *
+ * Test vboot
+ */
+
+#include <stdlib.h>
+#include "common.h"
+#include "rsa.h"
+#include "test_util.h"
+#include "vboot.h"
+#include "rsa2048-3.h"
+#include "rwsig.h"
+
+struct vboot_key {
+	struct vb21_packed_key vb21_key;
+	struct rsa_public_key key_data;
+};
+
+struct vboot_sig {
+	struct vb21_signature vb21_sig;
+	uint8_t sig_data[RSANUMBYTES];
+};
+
+static void reset_data(struct vboot_key *k, struct vboot_sig *s)
+{
+	k->vb21_key.c.magic = VB21_MAGIC_PACKED_KEY;
+	k->vb21_key.key_offset = sizeof(struct vb21_packed_key);
+	k->vb21_key.key_size = sizeof(rsa_data);
+	memcpy(&k->key_data, rsa_data, sizeof(rsa_data));
+
+	s->vb21_sig.c.magic = VB21_MAGIC_SIGNATURE;
+	s->vb21_sig.sig_size = RSANUMBYTES;
+	s->vb21_sig.sig_offset = sizeof(struct vb21_signature);
+	s->vb21_sig.sig_alg = k->vb21_key.sig_alg;
+	s->vb21_sig.hash_alg = k->vb21_key.hash_alg;
+	s->vb21_sig.data_size = CONFIG_RW_SIZE - CONFIG_RW_SIG_SIZE - 32;
+	memcpy(s->sig_data, sig, sizeof(s->sig_data));
+}
+
+static int test_vboot(void)
+{
+	struct vboot_key k;
+	struct vboot_sig s;
+	uint8_t data[CONFIG_RW_SIZE];
+	int len;
+	int err;
+
+	/* Success */
+	reset_data(&k, &s);
+	memset(data, 0xff, CONFIG_RW_SIZE);
+	err = vb21_is_packed_key_valid(&k.vb21_key);
+	TEST_ASSERT(err == EC_SUCCESS);
+	err = vb21_is_signature_valid(&s.vb21_sig, &k.vb21_key);
+	TEST_ASSERT(err == EC_SUCCESS);
+	len = s.vb21_sig.data_size;
+	err = vboot_is_padding_valid(data, len,
+				     CONFIG_RW_SIZE - CONFIG_RW_SIG_SIZE);
+	TEST_ASSERT(err == EC_SUCCESS);
+
+	/* Invalid magic */
+	reset_data(&k, &s);
+	k.vb21_key.c.magic = VB21_MAGIC_SIGNATURE;
+	err = vb21_is_packed_key_valid(&k.vb21_key);
+	TEST_ASSERT(err == EC_ERROR_INVAL);
+
+	/* Invalid key size */
+	reset_data(&k, &s);
+	k.vb21_key.key_size--;
+	err = vb21_is_packed_key_valid(&k.vb21_key);
+	TEST_ASSERT(err == EC_ERROR_INVAL);
+
+	/* Invalid magic */
+	reset_data(&k, &s);
+	s.vb21_sig.c.magic = VB21_MAGIC_PACKED_KEY;
+	err = vb21_is_signature_valid(&s.vb21_sig, &k.vb21_key);
+	TEST_ASSERT(err == EC_ERROR_INVAL);
+
+	/* Invalid sig size */
+	reset_data(&k, &s);
+	s.vb21_sig.sig_size--;
+	err = vb21_is_signature_valid(&s.vb21_sig, &k.vb21_key);
+	TEST_ASSERT(err == EC_ERROR_INVAL);
+
+	/* Sig algorithm mismatch */
+	reset_data(&k, &s);
+	s.vb21_sig.sig_alg++;
+	err = vb21_is_signature_valid(&s.vb21_sig, &k.vb21_key);
+	TEST_ASSERT(err == EC_ERROR_INVAL);
+
+	/* Hash algorithm mismatch */
+	reset_data(&k, &s);
+	s.vb21_sig.hash_alg++;
+	err = vb21_is_signature_valid(&s.vb21_sig, &k.vb21_key);
+	TEST_ASSERT(err == EC_ERROR_INVAL);
+
+	/* Invalid sig_offset */
+	reset_data(&k, &s);
+	s.vb21_sig.sig_offset--;
+	err = vb21_is_signature_valid(&s.vb21_sig, &k.vb21_key);
+	TEST_ASSERT(err == EC_ERROR_INVAL);
+
+	/* Invalid data size */
+	reset_data(&k, &s);
+	s.vb21_sig.data_size = CONFIG_RW_SIZE;
+	err = vb21_is_signature_valid(&s.vb21_sig, &k.vb21_key);
+	TEST_ASSERT(err == EC_ERROR_INVAL);
+
+	/* Invalid padding */
+	reset_data(&k, &s);
+	len = s.vb21_sig.data_size;
+	data[len] = 0;
+	err = vboot_is_padding_valid(data, len,
+				     CONFIG_RW_SIZE - CONFIG_RW_SIG_SIZE);
+	TEST_ASSERT(err == EC_ERROR_INVAL);
+
+	/* Invalid padding size */
+	reset_data(&k, &s);
+	len = s.vb21_sig.data_size + 1;
+	err = vboot_is_padding_valid(data, len,
+				     CONFIG_RW_SIZE - CONFIG_RW_SIG_SIZE);
+	TEST_ASSERT(err == EC_ERROR_INVAL);
+
+	/* Padding size is too large */
+	reset_data(&k, &s);
+	len = s.vb21_sig.data_size + 64;
+	err = vboot_is_padding_valid(data, len,
+				     CONFIG_RW_SIZE - CONFIG_RW_SIG_SIZE);
+	TEST_ASSERT(err == EC_ERROR_INVAL);
+
+	return EC_SUCCESS;
+}
+
+void run_test(void)
+{
+	test_reset();
+
+	RUN_TEST(test_vboot);
+
+	test_print_result();
+}
diff --git a/test/vboot.tasklist b/test/vboot.tasklist
new file mode 100644
index 0000000000..e241aab4bb
--- /dev/null
+++ b/test/vboot.tasklist
@@ -0,0 +1,17 @@
+/* Copyright 2017 The Chromium OS Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+/**
+ * List of enabled tasks in the priority order
+ *
+ * The first one has the lowest priority.
+ *
+ * For each task, use the macro TASK_TEST(n, r, d, s) where :
+ * 'n' in the name of the task
+ * 'r' in the main routine of the task
+ * 'd' in an opaque parameter passed to the routine at startup
+ * 's' is the stack size in bytes; must be a multiple of 8
+ */
+#define CONFIG_TEST_TASK_LIST  /* No test task */