vboot: fix up some headers, includes, comments, spacing

BUG=b:124141368
TEST=make clean && make runtests
BRANCH=none

Change-Id: Id97f544da845f7070555e5e8cc6e782b2d45c300
Signed-off-by: Joel Kitching <kitching@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1758151
Tested-by: Joel Kitching <kitching@chromium.org>
Reviewed-by: Joel Kitching <kitching@chromium.org>
Commit-Queue: Joel Kitching <kitching@chromium.org>

10 files changed, 19 insertions, 19 deletions

diff --git a/tests/cgptlib_test.h b/tests/cgptlib_test.h
index 21ea6b9c..e78c25ae 100644
--- a/tests/cgptlib_test.h
+++ b/tests/cgptlib_test.h
@@ -2,6 +2,7 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
+
 #ifndef VBOOT_REFERENCE_CGPTLIB_TEST_H_
 #define VBOOT_REFERENCE_CGPTLIB_TEST_H_
 
@@ -27,4 +28,4 @@ typedef int (*test_func)(void);
 	} \
 } while (0)
 
-#endif	/* VBOOT_REFERENCE_CGPTLIB_TEST_H_ */
+#endif  /* VBOOT_REFERENCE_CGPTLIB_TEST_H_ */
diff --git a/tests/crc32_test.h b/tests/crc32_test.h
index 18530f98..20987075 100644
--- a/tests/crc32_test.h
+++ b/tests/crc32_test.h
@@ -2,6 +2,7 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
+
 #ifndef VBOOT_REFERENCE_CRC32_TEST_H_
 #define VBOOT_REFERENCE_CRC32_TEST_H_
 
diff --git a/tests/futility/binary_editor.c b/tests/futility/binary_editor.c
index f6a971d3..f5d6a664 100644
--- a/tests/futility/binary_editor.c
+++ b/tests/futility/binary_editor.c
@@ -1,5 +1,4 @@
-/*
- * Copyright 2014 The Chromium OS Authors. All rights reserved.
+/* Copyright 2014 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.
  *
diff --git a/tests/futility/test_file_types.c b/tests/futility/test_file_types.c
index 9999223d..82f51486 100644
--- a/tests/futility/test_file_types.c
+++ b/tests/futility/test_file_types.c
@@ -1,8 +1,8 @@
-/*
- * Copyright 2015 The Chromium OS Authors. All rights reserved.
+/* Copyright 2015 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.
  */
+
 #include <limits.h>
 #include <stdint.h>
 #include <stdio.h>
diff --git a/tests/futility/test_not_really.c b/tests/futility/test_not_really.c
index 1d69d44d..1a7cf24c 100644
--- a/tests/futility/test_not_really.c
+++ b/tests/futility/test_not_really.c
@@ -1,8 +1,8 @@
-/*
- * Copyright (c) 2014 The Chromium OS Authors. All rights reserved.
+/* Copyright (c) 2014 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.
  */
+
 #include <stdio.h>
 #include "2struct.h"
 #include "test_common.h"
diff --git a/tests/sha_test_vectors.h b/tests/sha_test_vectors.h
index d2532b9f..a096bb49 100644
--- a/tests/sha_test_vectors.h
+++ b/tests/sha_test_vectors.h
@@ -1,10 +1,10 @@
 /* Copyright (c) 2010 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.
+ *
+ * FIPS 180-2 test vectors for SHA-1, SHA-256 and SHA-512
  */
 
-/* FIPS 180-2 test vectors for SHA-1, SHA-256 and SHA-512 */
-
 #ifndef VBOOT_REFERENCE_SHA_TEST_VECTORS_H_
 #define VBOOT_REFERENCE_SHA_TEST_VECTORS_H_
 
@@ -88,4 +88,4 @@ uint8_t sha512_results[][VB2_SHA512_DIGEST_SIZE] = {
 	}
 };
 
-#endif	/* VBOOT_REFERENCE_SHA_TEST_VECTORS_H_ */
+#endif  /* VBOOT_REFERENCE_SHA_TEST_VECTORS_H_ */
diff --git a/tests/test_common.h b/tests/test_common.h
index 25f39d9c..8d98f5cc 100644
--- a/tests/test_common.h
+++ b/tests/test_common.h
@@ -1,7 +1,6 @@
 /* Copyright (c) 2011 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.
- *
  */
 
 #ifndef VBOOT_REFERENCE_TEST_COMMON_H_
diff --git a/tests/timer_utils.h b/tests/timer_utils.h
index 78099807..74351bd8 100644
--- a/tests/timer_utils.h
+++ b/tests/timer_utils.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
+ /* Copyright (c) 2010 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.
  */
diff --git a/tests/tpm_lite/tlcl_tests.h b/tests/tpm_lite/tlcl_tests.h
index 2b6bd6b8..7b0d295c 100644
--- a/tests/tpm_lite/tlcl_tests.h
+++ b/tests/tpm_lite/tlcl_tests.h
@@ -1,13 +1,12 @@
 /* Copyright (c) 2010 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.
+ *
+ * Common definitions for test programs.
  */
 
-/* Common definitions for test programs.
- */
-
-#ifndef TLCL_TESTS_H
-#define TLCL_TESTS_H
+#ifndef VBOOT_REFERENCE_TLCL_TESTS_H_
+#define VBOOT_REFERENCE_TLCL_TESTS_H_
 
 /* Standard testing indexes. */
 #define INDEX0 0xcafe
@@ -32,4 +31,4 @@
  */
 uint32_t TlclStartupIfNeeded(void);
 
-#endif // TLCL_TESTS_H
+#endif  /* VBOOT_REFERENCE_TLCL_TESTS_H_ */
diff --git a/tests/vboot_api_kernel5_tests.c b/tests/vboot_api_kernel5_tests.c
index 82cc0767..bd584395 100644
--- a/tests/vboot_api_kernel5_tests.c
+++ b/tests/vboot_api_kernel5_tests.c
@@ -108,7 +108,8 @@ static void copy_kbh(void)
 	memcpy(kernel_buffer, &kbh, sizeof(kbh));
 }
 
-/* Mocks */
+/* Mock functions */
+
 struct vb2_gbb_header *vb2_get_gbb(struct vb2_context *c)
 {
 	return &gbb;