diff options
author | Joel Kitching <kitching@google.com> | 2019-08-29 13:58:52 +0800 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2019-09-23 17:54:12 +0000 |
commit | ffd42a82201423d7b82cffd755baf3d5cd5c7efc (patch) | |
tree | 744299c8a134b963e8ac117c1d62a4a5d1b51f73 /firmware | |
parent | 56b70c403ea47f7da67c69b72c84d591b8f3ce21 (diff) | |
download | vboot-ffd42a82201423d7b82cffd755baf3d5cd5c7efc.tar.gz |
vboot: fix up some more includes
Should have no extra line breaks in between local includes,
and should be sorted alphabetically.
BUG=b:124141368
TEST=make clean && make runtests
BRANCH=none
Change-Id: I83c25d30d7376712857314965a7d93f57190aa3f
Signed-off-by: Joel Kitching <kitching@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1776281
Tested-by: Joel Kitching <kitching@chromium.org>
Commit-Queue: Joel Kitching <kitching@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Diffstat (limited to 'firmware')
49 files changed, 63 insertions, 77 deletions
diff --git a/firmware/2lib/2api.c b/firmware/2lib/2api.c index 7e168cb0..5be542bc 100644 --- a/firmware/2lib/2api.c +++ b/firmware/2lib/2api.c @@ -6,14 +6,14 @@ * (Firmware portion) */ -#include "2sysincludes.h" #include "2api.h" #include "2common.h" #include "2misc.h" #include "2nvstorage.h" +#include "2rsa.h" #include "2secdata.h" #include "2sha.h" -#include "2rsa.h" +#include "2sysincludes.h" #include "2tpm_bootmode.h" void vb2api_fail(struct vb2_context *ctx, uint8_t reason, uint8_t subcode) diff --git a/firmware/2lib/2common.c b/firmware/2lib/2common.c index c0eb4479..6da2fc3e 100644 --- a/firmware/2lib/2common.c +++ b/firmware/2lib/2common.c @@ -6,10 +6,10 @@ * (Firmware portion) */ -#include "2sysincludes.h" #include "2common.h" #include "2rsa.h" #include "2sha.h" +#include "2sysincludes.h" vb2_error_t vb2_safe_memcmp(const void *s1, const void *s2, size_t size) { diff --git a/firmware/2lib/2crc8.c b/firmware/2lib/2crc8.c index d5284de6..2760f270 100644 --- a/firmware/2lib/2crc8.c +++ b/firmware/2lib/2crc8.c @@ -5,8 +5,8 @@ * Very simple 8-bit CRC function. */ -#include "2sysincludes.h" #include "2crc8.h" +#include "2sysincludes.h" /* Uses CRC-8 ITU version, with x^8 + x^2 + x + 1 polynomial. Note that result will evaluate to zero for a buffer of all zeroes. */ diff --git a/firmware/2lib/2hmac.c b/firmware/2lib/2hmac.c index 651ae57f..d67da42c 100644 --- a/firmware/2lib/2hmac.c +++ b/firmware/2lib/2hmac.c @@ -3,9 +3,9 @@ * found in the LICENSE file. */ -#include "2sysincludes.h" -#include "2sha.h" #include "2hmac.h" +#include "2sha.h" +#include "2sysincludes.h" int hmac(enum vb2_hash_algorithm alg, const void *key, uint32_t key_size, diff --git a/firmware/2lib/2misc.c b/firmware/2lib/2misc.c index c3cae7c2..396a1593 100644 --- a/firmware/2lib/2misc.c +++ b/firmware/2lib/2misc.c @@ -5,14 +5,14 @@ * Misc functions which need access to vb2_context but are not public APIs */ -#include "2sysincludes.h" #include "2api.h" #include "2common.h" #include "2misc.h" #include "2nvstorage.h" +#include "2rsa.h" #include "2secdata.h" #include "2sha.h" -#include "2rsa.h" +#include "2sysincludes.h" vb2_error_t vb2_validate_gbb_signature(uint8_t *sig) { diff --git a/firmware/2lib/2nvstorage.c b/firmware/2lib/2nvstorage.c index be23cbbc..36926ffb 100644 --- a/firmware/2lib/2nvstorage.c +++ b/firmware/2lib/2nvstorage.c @@ -5,12 +5,12 @@ /* Non-volatile storage routines */ -#include "2sysincludes.h" #include "2common.h" #include "2crc8.h" #include "2misc.h" -#include "2nvstorage.h" #include "2nvstorage_fields.h" +#include "2nvstorage.h" +#include "2sysincludes.h" static void vb2_nv_regen_crc(struct vb2_context *ctx) { diff --git a/firmware/2lib/2rsa.c b/firmware/2lib/2rsa.c index 199c1c2e..5d84ecd6 100644 --- a/firmware/2lib/2rsa.c +++ b/firmware/2lib/2rsa.c @@ -9,10 +9,10 @@ * multiple RSA key lengths and hash digest algorithms. */ -#include "2sysincludes.h" #include "2common.h" #include "2rsa.h" #include "2sha.h" +#include "2sysincludes.h" #include "vboot_test.h" /** diff --git a/firmware/2lib/2secdata_firmware.c b/firmware/2lib/2secdata_firmware.c index 6f5d2178..1d3c855d 100644 --- a/firmware/2lib/2secdata_firmware.c +++ b/firmware/2lib/2secdata_firmware.c @@ -5,12 +5,12 @@ * Secure storage APIs */ -#include "2sysincludes.h" #include "2common.h" #include "2crc8.h" #include "2misc.h" #include "2secdata.h" #include "2secdata_struct.h" +#include "2sysincludes.h" vb2_error_t vb2api_secdata_firmware_check(struct vb2_context *ctx) { diff --git a/firmware/2lib/2secdata_fwmp.c b/firmware/2lib/2secdata_fwmp.c index d4fda283..7d19fca4 100644 --- a/firmware/2lib/2secdata_fwmp.c +++ b/firmware/2lib/2secdata_fwmp.c @@ -5,8 +5,8 @@ * Firmware management parameters (FWMP) APIs */ -#include "2crc8.h" #include "2common.h" +#include "2crc8.h" #include "2misc.h" #include "2secdata.h" #include "2secdata_struct.h" diff --git a/firmware/2lib/2secdata_kernel.c b/firmware/2lib/2secdata_kernel.c index 2be219f5..5dbd4dde 100644 --- a/firmware/2lib/2secdata_kernel.c +++ b/firmware/2lib/2secdata_kernel.c @@ -5,12 +5,12 @@ * Secure storage APIs - kernel version space */ -#include "2sysincludes.h" #include "2common.h" #include "2crc8.h" #include "2misc.h" #include "2secdata.h" #include "2secdata_struct.h" +#include "2sysincludes.h" vb2_error_t vb2api_secdata_kernel_check(struct vb2_context *ctx) { diff --git a/firmware/2lib/2sha1.c b/firmware/2lib/2sha1.c index 41c83174..a2414143 100644 --- a/firmware/2lib/2sha1.c +++ b/firmware/2lib/2sha1.c @@ -6,9 +6,9 @@ * Open Source Project (platorm/system/core.git/libmincrypt/sha.c */ -#include "2sysincludes.h" #include "2common.h" #include "2sha.h" +#include "2sysincludes.h" /* * Some machines lack byteswap.h and endian.h. These have to use the diff --git a/firmware/2lib/2sha256.c b/firmware/2lib/2sha256.c index d2cf6726..139745f4 100644 --- a/firmware/2lib/2sha256.c +++ b/firmware/2lib/2sha256.c @@ -35,9 +35,9 @@ * SUCH DAMAGE. */ -#include "2sysincludes.h" #include "2common.h" #include "2sha.h" +#include "2sysincludes.h" #define SHFR(x, n) (x >> n) #define ROTR(x, n) ((x >> n) | (x << ((sizeof(x) << 3) - n))) diff --git a/firmware/2lib/2sha512.c b/firmware/2lib/2sha512.c index e1f2601f..ee78ec2b 100644 --- a/firmware/2lib/2sha512.c +++ b/firmware/2lib/2sha512.c @@ -35,9 +35,9 @@ * SUCH DAMAGE. */ -#include "2sysincludes.h" #include "2common.h" #include "2sha.h" +#include "2sysincludes.h" #define SHFR(x, n) (x >> n) #define ROTR(x, n) ((x >> n) | (x << ((sizeof(x) << 3) - n))) diff --git a/firmware/2lib/2sha_utility.c b/firmware/2lib/2sha_utility.c index cc36b99f..a267edde 100644 --- a/firmware/2lib/2sha_utility.c +++ b/firmware/2lib/2sha_utility.c @@ -5,9 +5,9 @@ * Utility functions for message digest functions. */ -#include "2sysincludes.h" #include "2common.h" #include "2sha.h" +#include "2sysincludes.h" #if VB2_SUPPORT_SHA1 #define CTH_SHA1 VB2_HASH_SHA1 diff --git a/firmware/2lib/2stub.c b/firmware/2lib/2stub.c index 00c5d9b2..f7e680d6 100644 --- a/firmware/2lib/2stub.c +++ b/firmware/2lib/2stub.c @@ -8,8 +8,8 @@ #include <stdarg.h> #include <stdio.h> -#include "2sysincludes.h" #include "2api.h" +#include "2sysincludes.h" __attribute__((weak)) void vb2ex_printf(const char *func, const char *fmt, ...) diff --git a/firmware/2lib/2tpm_bootmode.c b/firmware/2lib/2tpm_bootmode.c index 6903fe87..81f6c40b 100644 --- a/firmware/2lib/2tpm_bootmode.c +++ b/firmware/2lib/2tpm_bootmode.c @@ -5,9 +5,9 @@ * Functions for updating the TPM state with the status of boot path. */ -#include "2sysincludes.h" #include "2common.h" #include "2sha.h" +#include "2sysincludes.h" #include "2tpm_bootmode.h" /* diff --git a/firmware/2lib/include/2return_codes.h b/firmware/2lib/include/2return_codes.h index bc612344..ed34109e 100644 --- a/firmware/2lib/include/2return_codes.h +++ b/firmware/2lib/include/2return_codes.h @@ -6,6 +6,8 @@ #ifndef VBOOT_REFERENCE_2RETURN_CODES_H_ #define VBOOT_REFERENCE_2RETURN_CODES_H_ +#include "2sysincludes.h" + /* * Functions which return an error all return this type. This is a 32-bit * value rather than an int so it's consistent across different architectures. diff --git a/firmware/lib/cgptlib/cgptlib.c b/firmware/lib/cgptlib/cgptlib.c index 25a2fe27..7803a7e9 100644 --- a/firmware/lib/cgptlib/cgptlib.c +++ b/firmware/lib/cgptlib/cgptlib.c @@ -3,9 +3,8 @@ * found in the LICENSE file. */ -#include "2sysincludes.h" #include "2common.h" - +#include "2sysincludes.h" #include "cgptlib.h" #include "cgptlib_internal.h" #include "crc32.h" diff --git a/firmware/lib/cgptlib/cgptlib_internal.c b/firmware/lib/cgptlib/cgptlib_internal.c index a29d2535..50ad936a 100644 --- a/firmware/lib/cgptlib/cgptlib_internal.c +++ b/firmware/lib/cgptlib/cgptlib_internal.c @@ -4,7 +4,6 @@ */ #include "2sysincludes.h" - #include "cgptlib.h" #include "cgptlib_internal.h" #include "crc32.h" diff --git a/firmware/lib/cgptlib/crc32.c b/firmware/lib/cgptlib/crc32.c index 72f73fc4..f97fe5a5 100644 --- a/firmware/lib/cgptlib/crc32.c +++ b/firmware/lib/cgptlib/crc32.c @@ -39,8 +39,8 @@ /* polynomial $edb88320 */ /* */ /* -------------------------------------------------------------------- */ -#include "2sysincludes.h" +#include "2sysincludes.h" #include "crc32.h" static uint32_t crc32_tab[] = { diff --git a/firmware/lib/ec_sync.c b/firmware/lib/ec_sync.c index 719a8be1..a2fac707 100644 --- a/firmware/lib/ec_sync.c +++ b/firmware/lib/ec_sync.c @@ -5,11 +5,10 @@ * EC software sync routines for vboot */ -#include "2sysincludes.h" #include "2common.h" #include "2misc.h" #include "2nvstorage.h" - +#include "2sysincludes.h" #include "ec_sync.h" #include "vboot_api.h" #include "vboot_common.h" diff --git a/firmware/lib/ec_sync_all.c b/firmware/lib/ec_sync_all.c index 467c3300..5b205474 100644 --- a/firmware/lib/ec_sync_all.c +++ b/firmware/lib/ec_sync_all.c @@ -5,11 +5,10 @@ * EC software sync routines for vboot */ -#include "2sysincludes.h" #include "2common.h" #include "2misc.h" #include "2nvstorage.h" - +#include "2sysincludes.h" #include "ec_sync.h" #include "vboot_api.h" #include "vboot_common.h" diff --git a/firmware/lib/gpt_misc.c b/firmware/lib/gpt_misc.c index 38646437..dfe9084b 100644 --- a/firmware/lib/gpt_misc.c +++ b/firmware/lib/gpt_misc.c @@ -3,9 +3,8 @@ * found in the LICENSE file. */ -#include "2sysincludes.h" #include "2common.h" - +#include "2sysincludes.h" #include "cgptlib.h" #include "cgptlib_internal.h" #include "crc32.h" @@ -13,7 +12,6 @@ #include "utility.h" #include "vboot_api.h" - /** * Allocate and read GPT data from the drive. * diff --git a/firmware/lib/mocked_secdata_tpm.c b/firmware/lib/mocked_secdata_tpm.c index b2f0670f..9aa09272 100644 --- a/firmware/lib/mocked_secdata_tpm.c +++ b/firmware/lib/mocked_secdata_tpm.c @@ -6,9 +6,9 @@ * stored in the TPM NVRAM. */ -#include "utility.h" #include "secdata_tpm.h" #include "tss_constants.h" +#include "utility.h" vb2_error_t SetVirtualDevMode(int val) { diff --git a/firmware/lib/secdata_tpm.c b/firmware/lib/secdata_tpm.c index 5ddb16cd..cf179978 100644 --- a/firmware/lib/secdata_tpm.c +++ b/firmware/lib/secdata_tpm.c @@ -6,9 +6,11 @@ * stored in the TPM NVRAM. */ -#include "2sysincludes.h" #include "2common.h" #include "2crc8.h" +#include "2nvstorage.h" +#include "2secdata.h" +#include "2sysincludes.h" #include "secdata_tpm.h" #include "tlcl.h" #include "tss_constants.h" diff --git a/firmware/lib/tpm2_lite/marshaling.c b/firmware/lib/tpm2_lite/marshaling.c index fb1b8022..90ce04ca 100644 --- a/firmware/lib/tpm2_lite/marshaling.c +++ b/firmware/lib/tpm2_lite/marshaling.c @@ -3,9 +3,8 @@ * found in the LICENSE file. */ -#include "2sysincludes.h" #include "2common.h" - +#include "2sysincludes.h" #include "tpm2_marshaling.h" #include "utility.h" diff --git a/firmware/lib/tpm2_lite/tlcl.c b/firmware/lib/tpm2_lite/tlcl.c index 70cc3e0e..1ac18c2d 100644 --- a/firmware/lib/tpm2_lite/tlcl.c +++ b/firmware/lib/tpm2_lite/tlcl.c @@ -7,8 +7,8 @@ */ #include "2common.h" -#include "secdata_tpm.h" #include "2sysincludes.h" +#include "secdata_tpm.h" #include "tlcl.h" #include "tpm2_marshaling.h" #include "utility.h" diff --git a/firmware/lib/tpm_lite/mocked_tlcl.c b/firmware/lib/tpm_lite/mocked_tlcl.c index ec5a152a..d0f61201 100644 --- a/firmware/lib/tpm_lite/mocked_tlcl.c +++ b/firmware/lib/tpm_lite/mocked_tlcl.c @@ -4,7 +4,6 @@ */ #include "2sysincludes.h" - #include "tlcl.h" #include "tlcl_internal.h" #include "utility.h" diff --git a/firmware/lib/tpm_lite/tlcl.c b/firmware/lib/tpm_lite/tlcl.c index b5cb44fc..1fba3204 100644 --- a/firmware/lib/tpm_lite/tlcl.c +++ b/firmware/lib/tpm_lite/tlcl.c @@ -14,11 +14,10 @@ * time. */ -#include "2sysincludes.h" #include "2common.h" #include "2hmac.h" #include "2sha.h" - +#include "2sysincludes.h" #include "tlcl.h" #include "tlcl_internal.h" #include "tlcl_structures.h" diff --git a/firmware/lib/utility_string.c b/firmware/lib/utility_string.c index 87b2293b..299bbaa1 100644 --- a/firmware/lib/utility_string.c +++ b/firmware/lib/utility_string.c @@ -6,10 +6,8 @@ */ #include "2sysincludes.h" - #include "utility.h" - uint32_t Uint64ToString(char *buf, uint32_t bufsize, uint64_t value, uint32_t radix, uint32_t zero_pad_width) { diff --git a/firmware/lib/vboot_api_kernel.c b/firmware/lib/vboot_api_kernel.c index eb05109b..a52412fd 100644 --- a/firmware/lib/vboot_api_kernel.c +++ b/firmware/lib/vboot_api_kernel.c @@ -5,7 +5,6 @@ * High-level firmware wrapper API - entry points for kernel selection */ -#include "2sysincludes.h" #include "2common.h" #include "2misc.h" #include "2nvstorage.h" diff --git a/firmware/lib/vboot_audio.c b/firmware/lib/vboot_audio.c index d59b65bf..c5212013 100644 --- a/firmware/lib/vboot_audio.c +++ b/firmware/lib/vboot_audio.c @@ -5,10 +5,9 @@ * Delay/beep functions used in dev-mode kernel selection. */ -#include "2sysincludes.h" #include "2common.h" #include "2misc.h" - +#include "2sysincludes.h" #include "utility.h" #include "vboot_api.h" #include "vboot_audio.h" diff --git a/firmware/lib/vboot_common.c b/firmware/lib/vboot_common.c index b1c6d339..75492080 100644 --- a/firmware/lib/vboot_common.c +++ b/firmware/lib/vboot_common.c @@ -6,14 +6,14 @@ * (Firmware portion) */ -#include "2sysincludes.h" #include "2common.h" #include "2misc.h" #include "2rsa.h" #include "2sha.h" +#include "2sysincludes.h" +#include "utility.h" #include "vboot_api.h" #include "vboot_common.h" -#include "utility.h" const char *kVbootErrors[VBOOT_ERROR_MAX] = { "Success.", diff --git a/firmware/lib/vboot_common_init.c b/firmware/lib/vboot_common_init.c index 174f39c7..00a201b6 100644 --- a/firmware/lib/vboot_common_init.c +++ b/firmware/lib/vboot_common_init.c @@ -6,12 +6,11 @@ * (Firmware portion) */ -#include "2sysincludes.h" #include "2common.h" - +#include "2sysincludes.h" +#include "utility.h" #include "vboot_api.h" #include "vboot_common.h" -#include "utility.h" vb2_error_t VbSharedDataInit(VbSharedDataHeader *header, uint64_t size) { diff --git a/firmware/lib/vboot_display.c b/firmware/lib/vboot_display.c index 9341e1e3..eb471484 100644 --- a/firmware/lib/vboot_display.c +++ b/firmware/lib/vboot_display.c @@ -5,11 +5,11 @@ * Display functions used in kernel selection. */ -#include "2sysincludes.h" #include "2common.h" #include "2misc.h" #include "2nvstorage.h" #include "2sha.h" +#include "2sysincludes.h" #include "utility.h" #include "vboot_api.h" #include "vboot_common.h" diff --git a/firmware/lib/vboot_ui.c b/firmware/lib/vboot_ui.c index 35dafe97..aa9a58cb 100644 --- a/firmware/lib/vboot_ui.c +++ b/firmware/lib/vboot_ui.c @@ -5,12 +5,12 @@ * High-level firmware wrapper API - user interface for RW firmware */ -#include "2sysincludes.h" #include "2common.h" #include "2misc.h" #include "2nvstorage.h" #include "2rsa.h" #include "2secdata.h" +#include "2sysincludes.h" #include "ec_sync.h" #include "load_kernel_fw.h" #include "secdata_tpm.h" diff --git a/firmware/lib/vboot_ui_common.c b/firmware/lib/vboot_ui_common.c index 376e1a67..1e956576 100644 --- a/firmware/lib/vboot_ui_common.c +++ b/firmware/lib/vboot_ui_common.c @@ -6,8 +6,8 @@ */ #include "2common.h" -#include "secdata_tpm.h" #include "2sysincludes.h" +#include "secdata_tpm.h" #include "vboot_api.h" #include "vboot_kernel.h" #include "vboot_ui_common.h" diff --git a/firmware/lib20/api.c b/firmware/lib20/api.c index e28b168e..13f26bfd 100644 --- a/firmware/lib20/api.c +++ b/firmware/lib20/api.c @@ -6,13 +6,13 @@ * (Firmware portion) */ -#include "2sysincludes.h" #include "2api.h" #include "2misc.h" #include "2nvstorage.h" +#include "2rsa.h" #include "2secdata.h" #include "2sha.h" -#include "2rsa.h" +#include "2sysincludes.h" #include "vb2_common.h" vb2_error_t vb2api_fw_phase3(struct vb2_context *ctx) diff --git a/firmware/lib20/api_kernel.c b/firmware/lib20/api_kernel.c index 88e2a0b8..555a7c47 100644 --- a/firmware/lib20/api_kernel.c +++ b/firmware/lib20/api_kernel.c @@ -6,13 +6,13 @@ * (Kernel portion) */ -#include "2sysincludes.h" #include "2api.h" #include "2misc.h" #include "2nvstorage.h" +#include "2rsa.h" #include "2secdata.h" #include "2sha.h" -#include "2rsa.h" +#include "2sysincludes.h" #include "vb2_common.h" vb2_error_t vb2api_kernel_phase1(struct vb2_context *ctx) diff --git a/firmware/lib20/common.c b/firmware/lib20/common.c index 8e9a2d85..c9d52e97 100644 --- a/firmware/lib20/common.c +++ b/firmware/lib20/common.c @@ -6,9 +6,9 @@ * (Firmware portion) */ -#include "2sysincludes.h" #include "2rsa.h" #include "2sha.h" +#include "2sysincludes.h" #include "vb2_common.h" uint8_t *vb2_signature_data(struct vb2_signature *sig) diff --git a/firmware/lib20/kernel.c b/firmware/lib20/kernel.c index a78920ff..a40a4971 100644 --- a/firmware/lib20/kernel.c +++ b/firmware/lib20/kernel.c @@ -6,12 +6,12 @@ */ #include "2common.h" -#include "2sysincludes.h" #include "2misc.h" #include "2nvstorage.h" #include "2rsa.h" #include "2secdata.h" #include "2sha.h" +#include "2sysincludes.h" #include "vb2_common.h" static const uint8_t *vb2_signature_data_const(const struct vb2_signature *sig) diff --git a/firmware/lib20/misc.c b/firmware/lib20/misc.c index e95732ef..01fd717f 100644 --- a/firmware/lib20/misc.c +++ b/firmware/lib20/misc.c @@ -5,13 +5,13 @@ * Misc functions which need access to vb2_context but are not public APIs */ -#include "2sysincludes.h" #include "2api.h" #include "2misc.h" #include "2nvstorage.h" +#include "2rsa.h" #include "2secdata.h" #include "2sha.h" -#include "2rsa.h" +#include "2sysincludes.h" #include "vb2_common.h" /* diff --git a/firmware/lib20/packed_key.c b/firmware/lib20/packed_key.c index 42c66223..fc60e8a7 100644 --- a/firmware/lib20/packed_key.c +++ b/firmware/lib20/packed_key.c @@ -6,8 +6,8 @@ */ #include "2common.h" -#include "2sysincludes.h" #include "2rsa.h" +#include "2sysincludes.h" #include "vb2_common.h" vb2_error_t vb2_unpack_key_buffer(struct vb2_public_key *key, diff --git a/firmware/lib21/api.c b/firmware/lib21/api.c index d9a955e7..732982c4 100644 --- a/firmware/lib21/api.c +++ b/firmware/lib21/api.c @@ -6,14 +6,14 @@ * (Firmware portion) */ -#include "2sysincludes.h" #include "2api.h" #include "2common.h" #include "2misc.h" #include "2nvstorage.h" +#include "2rsa.h" #include "2secdata.h" #include "2sha.h" -#include "2rsa.h" +#include "2sysincludes.h" #include "vb21_common.h" vb2_error_t vb21api_fw_phase3(struct vb2_context *ctx) diff --git a/firmware/lib21/common.c b/firmware/lib21/common.c index ed96ea08..89367ba3 100644 --- a/firmware/lib21/common.c +++ b/firmware/lib21/common.c @@ -5,10 +5,10 @@ * Signature validation functions */ -#include "2sysincludes.h" #include "2common.h" #include "2rsa.h" #include "2sha.h" +#include "2sysincludes.h" #include "vb21_common.h" const char *vb21_common_desc(const void *buf) diff --git a/firmware/lib21/misc.c b/firmware/lib21/misc.c index 7c5def9b..982ee0e3 100644 --- a/firmware/lib21/misc.c +++ b/firmware/lib21/misc.c @@ -5,14 +5,14 @@ * Misc functions which need access to vb2_context but are not public APIs */ -#include "2sysincludes.h" #include "2api.h" #include "2common.h" #include "2misc.h" #include "2nvstorage.h" +#include "2rsa.h" #include "2secdata.h" #include "2sha.h" -#include "2rsa.h" +#include "2sysincludes.h" #include "vb21_common.h" /** diff --git a/firmware/lib21/packed_key.c b/firmware/lib21/packed_key.c index b962da9e..bb6eb042 100644 --- a/firmware/lib21/packed_key.c +++ b/firmware/lib21/packed_key.c @@ -5,9 +5,9 @@ * Key unpacking functions */ -#include "2sysincludes.h" #include "2common.h" #include "2rsa.h" +#include "2sysincludes.h" #include "vb21_common.h" vb2_error_t vb2_unpack_key_data(struct vb2_public_key *key, diff --git a/firmware/linktest/main.c b/firmware/linktest/main.c index bc120c3d..0236b8d9 100644 --- a/firmware/linktest/main.c +++ b/firmware/linktest/main.c @@ -11,7 +11,6 @@ #include "vboot_common.h" #include "vboot_kernel.h" - int main(void) { /* cgptlib.h */ diff --git a/firmware/stub/tpm_lite_stub.c b/firmware/stub/tpm_lite_stub.c index dced1448..0d26cfff 100644 --- a/firmware/stub/tpm_lite_stub.c +++ b/firmware/stub/tpm_lite_stub.c @@ -7,15 +7,6 @@ */ #include <stdint.h> - -#include "2sysincludes.h" -#include "2common.h" - -#include "tlcl.h" -#include "tlcl_internal.h" -#include "utility.h" -#include "vboot_api.h" - #include <errno.h> #include <fcntl.h> #include <stdarg.h> @@ -28,6 +19,12 @@ #include <time.h> #include <unistd.h> +#include "2common.h" +#include "2sysincludes.h" +#include "tlcl.h" +#include "tlcl_internal.h" +#include "utility.h" +#include "vboot_api.h" #define TPM_DEVICE_PATH "/dev/tpm0" /* Retry failed open()s for 5 seconds in 10ms polling intervals. */ |