diff options
128 files changed, 203 insertions, 273 deletions
diff --git a/cgpt/cgpt_add.c b/cgpt/cgpt_add.c index 95815db8..6134504e 100644 --- a/cgpt/cgpt_add.c +++ b/cgpt/cgpt_add.c @@ -6,8 +6,8 @@ #include <string.h> #include "cgpt.h" -#include "cgpt_params.h" #include "cgptlib_internal.h" +#include "cgpt_params.h" #include "utility.h" #include "vboot_host.h" diff --git a/cgpt/cgpt_boot.c b/cgpt/cgpt_boot.c index 932cd457..989ffd79 100644 --- a/cgpt/cgpt_boot.c +++ b/cgpt/cgpt_boot.c @@ -9,8 +9,8 @@ #include <unistd.h> #include "cgpt.h" -#include "cgpt_params.h" #include "cgptlib_internal.h" +#include "cgpt_params.h" #include "vboot_host.h" int CgptGetBootPartitionNumber(CgptBootParams *params) { diff --git a/cgpt/cgpt_edit.c b/cgpt/cgpt_edit.c index e0d32f48..6166d04a 100644 --- a/cgpt/cgpt_edit.c +++ b/cgpt/cgpt_edit.c @@ -4,8 +4,8 @@ */ #include "cgpt.h" -#include "cgpt_params.h" #include "cgptlib_internal.h" +#include "cgpt_params.h" #include "vboot_host.h" int CgptEdit(CgptEditParams *params) { diff --git a/cgpt/cgpt_find.c b/cgpt/cgpt_find.c index 1c8c72dc..d3cbb0ba 100644 --- a/cgpt/cgpt_find.c +++ b/cgpt/cgpt_find.c @@ -10,8 +10,8 @@ #include <unistd.h> #include "cgpt.h" -#include "cgpt_nor.h" #include "cgptlib_internal.h" +#include "cgpt_nor.h" #include "vboot_host.h" #define BUFSIZE 1024 diff --git a/cgpt/cgpt_wrapper.c b/cgpt/cgpt_wrapper.c index e7ac6bf3..2b473835 100644 --- a/cgpt/cgpt_wrapper.c +++ b/cgpt/cgpt_wrapper.c @@ -22,10 +22,9 @@ #include <sys/types.h> #include <unistd.h> -#include "2sysincludes.h" - #include "2common.h" #include "2sha.h" +#include "2sysincludes.h" #include "cgpt.h" #include "cgpt_nor.h" #include "file_keys.h" 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. */ diff --git a/futility/cmd_create.c b/futility/cmd_create.c index 3dc11476..a3cb8b58 100644 --- a/futility/cmd_create.c +++ b/futility/cmd_create.c @@ -3,28 +3,26 @@ * found in the LICENSE file. */ +#include <openssl/pem.h> + #include <getopt.h> #include <stdio.h> #include <unistd.h> -#include <openssl/pem.h> - -#include "2sysincludes.h" #include "2common.h" #include "2id.h" #include "2rsa.h" #include "2sha.h" +#include "2sysincludes.h" +#include "futility.h" +#include "futility_options.h" +#include "host_key2.h" +#include "host_key.h" +#include "host_misc2.h" #include "openssl_compat.h" #include "util_misc.h" -#include "vb2_common.h" #include "vb21_common.h" - -#include "host_key.h" -#include "host_key2.h" -#include "host_misc2.h" - -#include "futility.h" -#include "futility_options.h" +#include "vb2_common.h" /* Command line options */ enum { diff --git a/futility/cmd_load_fmap.c b/futility/cmd_load_fmap.c index 20da8015..818fda85 100644 --- a/futility/cmd_load_fmap.c +++ b/futility/cmd_load_fmap.c @@ -20,7 +20,6 @@ #include "fmap.h" #include "futility.h" - static const char usage[] = "\n" "Usage: " MYNAME " %s [OPTIONS] FILE AREA:file [AREA:file ...]\n" "\n" diff --git a/futility/cmd_pcr.c b/futility/cmd_pcr.c index 3b9b0ae8..dc4c3ffc 100644 --- a/futility/cmd_pcr.c +++ b/futility/cmd_pcr.c @@ -9,9 +9,9 @@ #include <stdio.h> #include <string.h> -#include "2sysincludes.h" #include "2common.h" #include "2sha.h" +#include "2sysincludes.h" #include "futility.h" static const char usage[] = "\n" diff --git a/futility/cmd_show.c b/futility/cmd_show.c index e3fea0fb..544a41c1 100644 --- a/futility/cmd_show.c +++ b/futility/cmd_show.c @@ -18,12 +18,12 @@ #include <sys/types.h> #include <unistd.h> -#include "2sysincludes.h" #include "2api.h" #include "2common.h" #include "2sha.h" -#include "file_type.h" +#include "2sysincludes.h" #include "file_type_bios.h" +#include "file_type.h" #include "fmap.h" #include "futility.h" #include "futility_options.h" diff --git a/futility/cmd_sign.c b/futility/cmd_sign.c index f221141a..a3342379 100644 --- a/futility/cmd_sign.c +++ b/futility/cmd_sign.c @@ -18,8 +18,8 @@ #include <unistd.h> #include "2common.h" -#include "file_type.h" #include "file_type_bios.h" +#include "file_type.h" #include "fmap.h" #include "futility.h" #include "futility_options.h" @@ -28,9 +28,9 @@ #include "kernel_blob.h" #include "util_misc.h" #include "vb1_helper.h" +#include "vb21_common.h" #include "vb2_common.h" #include "vb2_struct.h" -#include "vb21_common.h" #include "vboot_common.h" /* Options */ diff --git a/futility/cmd_vbutil_firmware.c b/futility/cmd_vbutil_firmware.c index edd0f8d5..b8e9bc63 100644 --- a/futility/cmd_vbutil_firmware.c +++ b/futility/cmd_vbutil_firmware.c @@ -12,18 +12,18 @@ #include <stdlib.h> #include <unistd.h> -#include "2sysincludes.h" #include "2api.h" #include "2common.h" #include "2rsa.h" +#include "2sysincludes.h" #include "futility.h" #include "host_common.h" #include "host_key2.h" #include "kernel_blob.h" #include "util_misc.h" -#include "vboot_common.h" #include "vb1_helper.h" #include "vb2_common.h" +#include "vboot_common.h" /* Command line options */ enum { diff --git a/futility/cmd_vbutil_kernel.c b/futility/cmd_vbutil_kernel.c index 17dae146..c909cff4 100644 --- a/futility/cmd_vbutil_kernel.c +++ b/futility/cmd_vbutil_kernel.c @@ -19,8 +19,8 @@ #include <sys/stat.h> #include <unistd.h> -#include "2sysincludes.h" #include "2common.h" +#include "2sysincludes.h" #include "file_type.h" #include "futility.h" #include "host_common.h" diff --git a/futility/cmd_vbutil_keyblock.c b/futility/cmd_vbutil_keyblock.c index 43811610..d526d553 100644 --- a/futility/cmd_vbutil_keyblock.c +++ b/futility/cmd_vbutil_keyblock.c @@ -11,9 +11,9 @@ #include <stdlib.h> #include <string.h> -#include "2sysincludes.h" #include "2common.h" #include "2rsa.h" +#include "2sysincludes.h" #include "futility.h" #include "host_common.h" #include "host_key2.h" diff --git a/futility/file_type_bios.c b/futility/file_type_bios.c index 6cbd5835..44a4ca20 100644 --- a/futility/file_type_bios.c +++ b/futility/file_type_bios.c @@ -9,9 +9,9 @@ #include <stdio.h> #include <string.h> -#include "fmap.h" -#include "file_type.h" #include "file_type_bios.h" +#include "file_type.h" +#include "fmap.h" #include "futility.h" #include "futility_options.h" #include "host_common.h" diff --git a/futility/file_type_rwsig.c b/futility/file_type_rwsig.c index 9173a9bd..2990ba7c 100644 --- a/futility/file_type_rwsig.c +++ b/futility/file_type_rwsig.c @@ -14,20 +14,20 @@ #include <stdio.h> #include <unistd.h> -#include "2sysincludes.h" #include "2common.h" #include "2rsa.h" #include "2sha.h" +#include "2sysincludes.h" #include "file_type.h" #include "fmap.h" #include "futility.h" #include "futility_options.h" -#include "vb21_common.h" #include "host_common.h" #include "host_key2.h" #include "host_misc.h" #include "host_signature2.h" #include "util_misc.h" +#include "vb21_common.h" #define SIGNATURE_RSVD_SIZE 1024 #define EC_RW_FILENAME "EC_RW.bin" diff --git a/futility/file_type_usbpd1.c b/futility/file_type_usbpd1.c index 34f8b455..2bcc48d1 100644 --- a/futility/file_type_usbpd1.c +++ b/futility/file_type_usbpd1.c @@ -16,18 +16,18 @@ #include <stdio.h> #include <unistd.h> -#include "2sysincludes.h" #include "2common.h" -#include "2sha.h" #include "2rsa.h" +#include "2sha.h" +#include "2sysincludes.h" #include "file_type.h" #include "futility.h" #include "futility_options.h" -#include "vb21_common.h" #include "host_common.h" #include "host_key2.h" #include "host_signature2.h" #include "util_misc.h" +#include "vb21_common.h" /* Return 1 if okay, 0 if not */ static int parse_size_opts(uint32_t len, diff --git a/futility/futility_options.h b/futility/futility_options.h index 368cc4f2..dc31728d 100644 --- a/futility/futility_options.h +++ b/futility/futility_options.h @@ -10,9 +10,10 @@ #define VBOOT_REFERENCE_FUTILITY_OPTIONS_H_ #include <stdint.h> -#include "vboot_common.h" -#include "file_type.h" + #include "2rsa.h" +#include "file_type.h" +#include "vboot_common.h" struct vb2_private_key; struct vb21_packed_key; diff --git a/futility/misc.c b/futility/misc.c index 46bf24bb..de7db515 100644 --- a/futility/misc.c +++ b/futility/misc.c @@ -20,10 +20,9 @@ #include <sys/wait.h> #include <unistd.h> -#include "2sysincludes.h" - #include "2common.h" #include "2sha.h" +#include "2sysincludes.h" #include "cgptlib_internal.h" #include "file_type.h" #include "futility.h" diff --git a/futility/ryu_root_header.c b/futility/ryu_root_header.c index fff807be..ef005311 100644 --- a/futility/ryu_root_header.c +++ b/futility/ryu_root_header.c @@ -15,9 +15,9 @@ #include <sys/types.h> #include <unistd.h> -#include "2sysincludes.h" #include "2common.h" #include "2sha.h" +#include "2sysincludes.h" #include "futility.h" #define SEARCH_STRIDE 4 diff --git a/futility/updater.c b/futility/updater.c index 9d2d3921..07d2d668 100644 --- a/futility/updater.c +++ b/futility/updater.c @@ -13,8 +13,8 @@ #include <string.h> #include <unistd.h> -#include "2rsa.h" #include "2common.h" +#include "2rsa.h" #include "crossystem.h" #include "fmap.h" #include "futility.h" diff --git a/futility/vb1_helper.c b/futility/vb1_helper.c index d99c45fa..84dc7969 100644 --- a/futility/vb1_helper.c +++ b/futility/vb1_helper.c @@ -10,11 +10,11 @@ #include <unistd.h> #include <openssl/rsa.h> -#include "2sysincludes.h" #include "2api.h" #include "2common.h" #include "2rsa.h" #include "2sha.h" +#include "2sysincludes.h" #include "file_type.h" #include "futility.h" #include "host_common.h" diff --git a/futility/vb2_helper.c b/futility/vb2_helper.c index cdaff888..f5b7978e 100644 --- a/futility/vb2_helper.c +++ b/futility/vb2_helper.c @@ -5,22 +5,20 @@ #include <openssl/pem.h> -#include "2sysincludes.h" #include "2common.h" #include "2id.h" #include "2rsa.h" #include "2sha.h" -#include "openssl_compat.h" -#include "util_misc.h" -#include "vb21_common.h" - -#include "host_common.h" -#include "host_key2.h" -#include "host_misc2.h" - +#include "2sysincludes.h" #include "file_type.h" #include "futility.h" #include "futility_options.h" +#include "host_common.h" +#include "host_key2.h" +#include "host_misc2.h" +#include "openssl_compat.h" +#include "util_misc.h" +#include "vb21_common.h" int vb2_lookup_hash_alg(const char *str, enum vb2_hash_algorithm *alg) { diff --git a/host/arch/arm/lib/crossystem_arch.c b/host/arch/arm/lib/crossystem_arch.c index 8f469653..75ed4ef9 100644 --- a/host/arch/arm/lib/crossystem_arch.c +++ b/host/arch/arm/lib/crossystem_arch.c @@ -22,11 +22,11 @@ #include <unistd.h> #include <netinet/in.h> -#include "vboot_common.h" -#include "host_common.h" -#include "crossystem.h" #include "crossystem_arch.h" +#include "crossystem.h" #include "crossystem_vbnv.h" +#include "host_common.h" +#include "vboot_common.h" /* Base name for firmware FDT files */ #define FDT_BASE_PATH "/proc/device-tree/firmware/chromeos" diff --git a/host/arch/mips/lib/crossystem_arch.c b/host/arch/mips/lib/crossystem_arch.c index 5c92c9d5..ed4fb064 100644 --- a/host/arch/mips/lib/crossystem_arch.c +++ b/host/arch/mips/lib/crossystem_arch.c @@ -5,10 +5,10 @@ #include <string.h> -#include "vboot_common.h" -#include "host_common.h" -#include "crossystem.h" #include "crossystem_arch.h" +#include "crossystem.h" +#include "host_common.h" +#include "vboot_common.h" /* TODO: Currently these are stub implementations providing reasonable defaults * wherever possible. They will need real implementation as part of of MIPS diff --git a/host/arch/x86/lib/crossystem_arch.c b/host/arch/x86/lib/crossystem_arch.c index 6b55802b..25d7a325 100644 --- a/host/arch/x86/lib/crossystem_arch.c +++ b/host/arch/x86/lib/crossystem_arch.c @@ -16,15 +16,14 @@ #include <sys/types.h> #include <unistd.h> -#include "crossystem.h" #include "crossystem_arch.h" +#include "crossystem.h" #include "crossystem_vbnv.h" #include "host_common.h" #include "utility.h" #include "vboot_common.h" #include "vboot_struct.h" - /* ACPI constants from Chrome OS Main Processor Firmware Spec */ /* Boot reasons from BINF.0, from early H2C firmware */ /* Unknown */ diff --git a/host/lib/crossystem.c b/host/lib/crossystem.c index 3db2ecb7..126b228e 100644 --- a/host/lib/crossystem.c +++ b/host/lib/crossystem.c @@ -16,16 +16,14 @@ #include <fcntl.h> #include <unistd.h> -#include "2sysincludes.h" #include "2api.h" #include "2common.h" #include "2nvstorage.h" - -#include "host_common.h" - -#include "crossystem.h" +#include "2sysincludes.h" #include "crossystem_arch.h" +#include "crossystem.h" #include "crossystem_vbnv.h" +#include "host_common.h" #include "utility.h" #include "vboot_struct.h" diff --git a/host/lib/extract_vmlinuz.c b/host/lib/extract_vmlinuz.c index 58fd7d7f..93fabaac 100644 --- a/host/lib/extract_vmlinuz.c +++ b/host/lib/extract_vmlinuz.c @@ -14,7 +14,6 @@ #include "vboot_host.h" #include "vboot_struct.h" - int ExtractVmlinuz(void *kpart_data, size_t kpart_size, void **vmlinuz_out, size_t *vmlinuz_size) { size_t now = 0; diff --git a/host/lib/file_keys.c b/host/lib/file_keys.c index e47091de..7ae71802 100644 --- a/host/lib/file_keys.c +++ b/host/lib/file_keys.c @@ -13,10 +13,9 @@ #include <sys/types.h> #include <unistd.h> -#include "2sysincludes.h" - #include "2common.h" #include "2sha.h" +#include "2sysincludes.h" #include "file_keys.h" #include "host_common.h" #include "signature_digest.h" diff --git a/host/lib/host_common.c b/host/lib/host_common.c index c3ba044e..414050f4 100644 --- a/host/lib/host_common.c +++ b/host/lib/host_common.c @@ -7,9 +7,9 @@ #include <string.h> -#include "2sysincludes.h" #include "2common.h" #include "2rsa.h" +#include "2sysincludes.h" #include "host_common.h" #include "host_key2.h" #include "utility.h" diff --git a/host/lib/host_key.c b/host/lib/host_key.c index 52845c03..8651f4f0 100644 --- a/host/lib/host_key.c +++ b/host/lib/host_key.c @@ -13,10 +13,10 @@ #include <stdlib.h> #include <unistd.h> -#include "2sysincludes.h" #include "2common.h" #include "2rsa.h" #include "2sha.h" +#include "2sysincludes.h" #include "host_common.h" #include "host_misc.h" #include "vb2_common.h" diff --git a/host/lib/host_key2.c b/host/lib/host_key2.c index b76ac2ae..072eb5a2 100644 --- a/host/lib/host_key2.c +++ b/host/lib/host_key2.c @@ -13,13 +13,13 @@ #include <stdlib.h> #include <unistd.h> -#include "2sysincludes.h" #include "2common.h" #include "2rsa.h" #include "2sha.h" +#include "2sysincludes.h" #include "host_common.h" -#include "host_key.h" #include "host_key2.h" +#include "host_key.h" #include "host_misc.h" #include "vb2_common.h" #include "vboot_common.h" diff --git a/host/lib/host_keyblock.c b/host/lib/host_keyblock.c index 08f2b768..be1aa085 100644 --- a/host/lib/host_keyblock.c +++ b/host/lib/host_keyblock.c @@ -14,9 +14,9 @@ #include "2rsa.h" #include "2sha.h" #include "host_common.h" -#include "host_key.h" #include "host_key2.h" #include "host_keyblock.h" +#include "host_key.h" #include "vb2_common.h" #include "vb2_struct.h" #include "vboot_common.h" diff --git a/host/lib/host_signature.c b/host/lib/host_signature.c index cfa40d10..0c5900ec 100644 --- a/host/lib/host_signature.c +++ b/host/lib/host_signature.c @@ -15,11 +15,10 @@ #include <sys/wait.h> #include <unistd.h> -#include "2sysincludes.h" - #include "2common.h" #include "2rsa.h" #include "2sha.h" +#include "2sysincludes.h" #include "host_common.h" #include "host_signature2.h" #include "vb2_common.h" diff --git a/host/lib/include/util_misc.h b/host/lib/include/util_misc.h index cd26b30a..1f92af95 100644 --- a/host/lib/include/util_misc.h +++ b/host/lib/include/util_misc.h @@ -10,6 +10,7 @@ #include "host_key.h" #include "vboot_struct.h" + struct rsa_st; struct vb2_packed_key; struct vb2_private_key; diff --git a/host/lib/signature_digest.c b/host/lib/signature_digest.c index a154ed4b..b480798d 100644 --- a/host/lib/signature_digest.c +++ b/host/lib/signature_digest.c @@ -9,11 +9,10 @@ #include <stdlib.h> #include <unistd.h> -#include "2sysincludes.h" - #include "2common.h" #include "2rsa.h" #include "2sha.h" +#include "2sysincludes.h" #include "host_common.h" #include "host_signature2.h" #include "signature_digest.h" diff --git a/host/lib/util_misc.c b/host/lib/util_misc.c index d2e694d0..535ede28 100644 --- a/host/lib/util_misc.c +++ b/host/lib/util_misc.c @@ -13,15 +13,14 @@ #include <string.h> #include <unistd.h> -#include "2sysincludes.h" - #include "2common.h" #include "2sha.h" +#include "2sysincludes.h" #include "host_common.h" +#include "host_key2.h" #include "openssl_compat.h" #include "util_misc.h" #include "vb2_common.h" -#include "host_key2.h" #include "vboot_common.h" const char *packed_key_sha1_string(const struct vb2_packed_key *key) diff --git a/host/lib21/host_fw_preamble.c b/host/lib21/host_fw_preamble.c index 7220b32e..ea2da988 100644 --- a/host/lib21/host_fw_preamble.c +++ b/host/lib21/host_fw_preamble.c @@ -5,9 +5,9 @@ * Host functions for keyblocks */ -#include "2sysincludes.h" #include "2common.h" #include "2rsa.h" +#include "2sysincludes.h" #include "host_common.h" #include "host_fw_preamble2.h" #include "host_key2.h" diff --git a/host/lib21/host_key.c b/host/lib21/host_key.c index 1154bec9..34e5a633 100644 --- a/host/lib21/host_key.c +++ b/host/lib21/host_key.c @@ -9,15 +9,15 @@ #include <openssl/pem.h> -#include "2sysincludes.h" #include "2common.h" #include "2rsa.h" #include "2sha.h" -#include "vb21_common.h" +#include "2sysincludes.h" #include "host_common.h" #include "host_key2.h" #include "host_misc.h" #include "openssl_compat.h" +#include "vb21_common.h" const struct vb2_text_vs_enum vb2_text_vs_sig[] = { {"RSA1024", VB2_SIG_RSA1024}, diff --git a/host/lib21/host_keyblock.c b/host/lib21/host_keyblock.c index 9c5959a4..d52afe23 100644 --- a/host/lib21/host_keyblock.c +++ b/host/lib21/host_keyblock.c @@ -5,15 +5,15 @@ * Host functions for keyblocks */ -#include "2sysincludes.h" #include "2common.h" #include "2rsa.h" -#include "vb21_common.h" +#include "2sysincludes.h" #include "host_common.h" #include "host_key2.h" #include "host_keyblock2.h" #include "host_misc.h" #include "host_signature2.h" +#include "vb21_common.h" vb2_error_t vb21_keyblock_create(struct vb21_keyblock **kb_ptr, const struct vb2_public_key *data_key, diff --git a/host/lib21/host_misc.c b/host/lib21/host_misc.c index 9d375681..71a77c5d 100644 --- a/host/lib21/host_misc.c +++ b/host/lib21/host_misc.c @@ -10,12 +10,12 @@ #include <string.h> #include <unistd.h> -#include "2sysincludes.h" #include "2common.h" #include "2sha.h" -#include "vb21_common.h" +#include "2sysincludes.h" #include "host_common.h" #include "host_misc2.h" +#include "vb21_common.h" vb2_error_t vb2_read_file(const char *filename, uint8_t **data_ptr, uint32_t *size_ptr) diff --git a/host/lib21/host_signature.c b/host/lib21/host_signature.c index 51320e7b..e4dead01 100644 --- a/host/lib21/host_signature.c +++ b/host/lib21/host_signature.c @@ -7,15 +7,15 @@ #include <openssl/rsa.h> -#include "2sysincludes.h" #include "2common.h" #include "2rsa.h" #include "2sha.h" -#include "vb21_common.h" +#include "2sysincludes.h" #include "host_common.h" #include "host_key2.h" -#include "host_signature2.h" #include "host_misc.h" +#include "host_signature2.h" +#include "vb21_common.h" vb2_error_t vb2_digest_info(enum vb2_hash_algorithm hash_alg, const uint8_t **buf_ptr, uint32_t *size_ptr) diff --git a/tests/crc32_test.c b/tests/crc32_test.c index a9631a58..aeb48b34 100644 --- a/tests/crc32_test.c +++ b/tests/crc32_test.c @@ -3,9 +3,9 @@ * found in the LICENSE file. */ -#include "crc32_test.h" #include "cgptlib_test.h" #include "crc32.h" +#include "crc32_test.h" #include "test_common.h" #include "utility.h" diff --git a/tests/ec_sync_tests.c b/tests/ec_sync_tests.c index 9f4dad89..ee0434f1 100644 --- a/tests/ec_sync_tests.c +++ b/tests/ec_sync_tests.c @@ -9,10 +9,10 @@ #include <stdio.h> #include <stdlib.h> -#include "2sysincludes.h" #include "2common.h" #include "2misc.h" #include "2nvstorage.h" +#include "2sysincludes.h" #include "ec_sync.h" #include "host_common.h" #include "load_kernel_fw.h" diff --git a/tests/futility/test_not_really.c b/tests/futility/test_not_really.c index 1a7cf24c..3cfc3ed6 100644 --- a/tests/futility/test_not_really.c +++ b/tests/futility/test_not_really.c @@ -4,6 +4,7 @@ */ #include <stdio.h> + #include "2struct.h" #include "test_common.h" diff --git a/tests/sha_benchmark.c b/tests/sha_benchmark.c index fadcb6bc..27b1c101 100644 --- a/tests/sha_benchmark.c +++ b/tests/sha_benchmark.c @@ -7,9 +7,9 @@ #include <stdio.h> #include <stdlib.h> -#include "2sysincludes.h" #include "2common.h" #include "2sha.h" +#include "2sysincludes.h" #include "host_common.h" #include "timer_utils.h" diff --git a/tests/timer_utils.h b/tests/timer_utils.h index 74351bd8..8cafdf91 100644 --- a/tests/timer_utils.h +++ b/tests/timer_utils.h @@ -7,7 +7,6 @@ #define VBOOT_REFERENCE_TIMER_UTILS_H_ #include <inttypes.h> - #include <time.h> typedef struct ClockTimer { diff --git a/tests/utility_string_tests.c b/tests/utility_string_tests.c index add1e640..af74d329 100644 --- a/tests/utility_string_tests.c +++ b/tests/utility_string_tests.c @@ -14,7 +14,6 @@ #include "utility.h" #include "vboot_common.h" - /* Test string concatenation */ static void StrncatTest(void) { char dest[128]; diff --git a/tests/vb20_api_kernel_tests.c b/tests/vb20_api_kernel_tests.c index 9f68a1fd..0e59cc38 100644 --- a/tests/vb20_api_kernel_tests.c +++ b/tests/vb20_api_kernel_tests.c @@ -7,15 +7,15 @@ #include <stdio.h> -#include "2sysincludes.h" #include "2api.h" #include "2common.h" #include "2misc.h" #include "2nvstorage.h" #include "2rsa.h" #include "2secdata.h" -#include "vb2_common.h" +#include "2sysincludes.h" #include "test_common.h" +#include "vb2_common.h" /* Common context for tests */ static uint8_t workbuf[VB2_KERNEL_WORKBUF_RECOMMENDED_SIZE] diff --git a/tests/vb20_api_tests.c b/tests/vb20_api_tests.c index 8db477e5..f75d2a17 100644 --- a/tests/vb20_api_tests.c +++ b/tests/vb20_api_tests.c @@ -7,14 +7,14 @@ #include <stdio.h> -#include "2sysincludes.h" #include "2api.h" #include "2misc.h" #include "2nvstorage.h" #include "2rsa.h" #include "2secdata.h" -#include "vb2_common.h" +#include "2sysincludes.h" #include "test_common.h" +#include "vb2_common.h" /* Common context for tests */ static uint8_t workbuf[VB2_FIRMWARE_WORKBUF_RECOMMENDED_SIZE] diff --git a/tests/vb20_common2_tests.c b/tests/vb20_common2_tests.c index 39e4c06f..46b04cad 100644 --- a/tests/vb20_common2_tests.c +++ b/tests/vb20_common2_tests.c @@ -9,15 +9,14 @@ #include <stdio.h> #include <string.h> -#include "2sysincludes.h" #include "2rsa.h" +#include "2sysincludes.h" #include "file_keys.h" #include "host_common.h" #include "host_key2.h" +#include "test_common.h" #include "vb2_common.h" #include "vboot_common.h" -#include "test_common.h" - static const uint8_t test_data[] = "This is some test data to sign."; static const uint32_t test_size = sizeof(test_data); diff --git a/tests/vb20_common3_tests.c b/tests/vb20_common3_tests.c index 255889f3..e3489e6c 100644 --- a/tests/vb20_common3_tests.c +++ b/tests/vb20_common3_tests.c @@ -7,17 +7,16 @@ #include <stdio.h> -#include "2sysincludes.h" #include "2rsa.h" - +#include "2sysincludes.h" #include "file_keys.h" #include "host_common.h" -#include "host_key.h" #include "host_keyblock.h" +#include "host_key.h" #include "host_signature.h" +#include "test_common.h" #include "vb2_common.h" #include "vboot_common.h" -#include "test_common.h" static void resign_keyblock(struct vb2_keyblock *h, const struct vb2_private_key *key) diff --git a/tests/vb20_common_tests.c b/tests/vb20_common_tests.c index d4555f44..7d9ffe82 100644 --- a/tests/vb20_common_tests.c +++ b/tests/vb20_common_tests.c @@ -6,9 +6,9 @@ */ #include "2sysincludes.h" +#include "test_common.h" #include "vb2_common.h" #include "vboot_struct.h" /* For old struct sizes */ -#include "test_common.h" /* * Test struct packing for vboot_struct.h structs which are passed between diff --git a/tests/vb20_kernel_tests.c b/tests/vb20_kernel_tests.c index d182e4c3..1beec5fd 100644 --- a/tests/vb20_kernel_tests.c +++ b/tests/vb20_kernel_tests.c @@ -7,15 +7,15 @@ #include <stdio.h> -#include "2sysincludes.h" #include "2api.h" #include "2common.h" #include "2misc.h" #include "2nvstorage.h" #include "2rsa.h" #include "2secdata.h" -#include "vb2_common.h" +#include "2sysincludes.h" #include "test_common.h" +#include "vb2_common.h" /* Common context for tests */ static uint8_t workbuf[VB2_KERNEL_WORKBUF_RECOMMENDED_SIZE] diff --git a/tests/vb20_misc_tests.c b/tests/vb20_misc_tests.c index cc592226..92f6eb18 100644 --- a/tests/vb20_misc_tests.c +++ b/tests/vb20_misc_tests.c @@ -7,15 +7,15 @@ #include <stdio.h> -#include "2sysincludes.h" #include "2api.h" #include "2common.h" #include "2misc.h" #include "2nvstorage.h" #include "2rsa.h" #include "2secdata.h" -#include "vb2_common.h" +#include "2sysincludes.h" #include "test_common.h" +#include "vb2_common.h" /* Common context for tests */ static uint8_t workbuf[VB2_FIRMWARE_WORKBUF_RECOMMENDED_SIZE] diff --git a/tests/vb20_rsa_padding_tests.c b/tests/vb20_rsa_padding_tests.c index 6c17c46b..78fd05b2 100644 --- a/tests/vb20_rsa_padding_tests.c +++ b/tests/vb20_rsa_padding_tests.c @@ -6,14 +6,13 @@ #include <stdint.h> #include <stdio.h> +#include "2rsa.h" +#include "2sysincludes.h" #include "file_keys.h" +#include "host_key.h" #include "rsa_padding_test.h" #include "test_common.h" #include "utility.h" - -#include "2sysincludes.h" -#include "2rsa.h" -#include "host_key.h" #include "vb2_common.h" /** diff --git a/tests/vb21_api_tests.c b/tests/vb21_api_tests.c index b7df9449..d0215bfa 100644 --- a/tests/vb21_api_tests.c +++ b/tests/vb21_api_tests.c @@ -7,20 +7,17 @@ #include <stdio.h> -#include "2sysincludes.h" #include "2api.h" #include "2common.h" #include "2misc.h" #include "2nvstorage.h" #include "2rsa.h" #include "2secdata.h" - -#include "vb21_common.h" - +#include "2sysincludes.h" #include "host_key2.h" #include "host_signature2.h" - #include "test_common.h" +#include "vb21_common.h" /* Common context for tests */ static uint8_t workbuf[VB2_FIRMWARE_WORKBUF_RECOMMENDED_SIZE] diff --git a/tests/vb21_common2_tests.c b/tests/vb21_common2_tests.c index e74ad0a4..448d3372 100644 --- a/tests/vb21_common2_tests.c +++ b/tests/vb21_common2_tests.c @@ -9,16 +9,15 @@ #include <stdio.h> #include <string.h> -#include "2sysincludes.h" #include "2common.h" #include "2rsa.h" -#include "vb21_common.h" +#include "2sysincludes.h" #include "host_common.h" #include "host_key2.h" #include "host_signature2.h" #include "test_common.h" #include "util_misc.h" - +#include "vb21_common.h" static const uint8_t test_data[] = "This is some test data to sign."; static const uint32_t test_size = sizeof(test_data); diff --git a/tests/vb21_common_tests.c b/tests/vb21_common_tests.c index a971fd20..16f8318f 100644 --- a/tests/vb21_common_tests.c +++ b/tests/vb21_common_tests.c @@ -5,16 +5,15 @@ * Tests for firmware 2common.c */ -#include "2sysincludes.h" #include "2common.h" #include "2rsa.h" -#include "vb21_common.h" +#include "2sysincludes.h" #include "host_fw_preamble2.h" #include "host_key2.h" #include "host_keyblock2.h" #include "host_signature2.h" - #include "test_common.h" +#include "vb21_common.h" static const uint8_t test_data[] = "This is some test data to sign."; static const uint8_t test_data2[] = "Some more test data"; diff --git a/tests/vb21_host_fw_preamble_tests.c b/tests/vb21_host_fw_preamble_tests.c index f563f6ce..d46fd05b 100644 --- a/tests/vb21_host_fw_preamble_tests.c +++ b/tests/vb21_host_fw_preamble_tests.c @@ -8,18 +8,15 @@ #include <stdio.h> #include <unistd.h> -#include "2sysincludes.h" #include "2common.h" #include "2rsa.h" - -#include "vb21_common.h" - +#include "2sysincludes.h" #include "host_common.h" #include "host_fw_preamble2.h" #include "host_key2.h" #include "host_signature2.h" - #include "test_common.h" +#include "vb21_common.h" const uint8_t test_data1[] = "Some test data"; const uint8_t test_data2[] = "Some more test data"; diff --git a/tests/vb21_host_key_tests.c b/tests/vb21_host_key_tests.c index c90fd40e..0be763fc 100644 --- a/tests/vb21_host_key_tests.c +++ b/tests/vb21_host_key_tests.c @@ -8,14 +8,13 @@ #include <stdio.h> #include <unistd.h> -#include "2sysincludes.h" #include "2common.h" #include "2rsa.h" -#include "vb21_common.h" +#include "2sysincludes.h" #include "host_common.h" #include "host_key2.h" - #include "test_common.h" +#include "vb21_common.h" /* Test only the algorithms we use */ struct alg_combo { diff --git a/tests/vb21_host_keyblock_tests.c b/tests/vb21_host_keyblock_tests.c index 5c4ad0e3..069157b9 100644 --- a/tests/vb21_host_keyblock_tests.c +++ b/tests/vb21_host_keyblock_tests.c @@ -8,15 +8,14 @@ #include <stdio.h> #include <unistd.h> -#include "2sysincludes.h" #include "2common.h" #include "2rsa.h" -#include "vb21_common.h" +#include "2sysincludes.h" #include "host_common.h" #include "host_key2.h" #include "host_keyblock2.h" - #include "test_common.h" +#include "vb21_common.h" static void keyblock_tests(const char *keys_dir) { diff --git a/tests/vb21_host_misc_tests.c b/tests/vb21_host_misc_tests.c index c4af29a0..8a556e99 100644 --- a/tests/vb21_host_misc_tests.c +++ b/tests/vb21_host_misc_tests.c @@ -8,13 +8,12 @@ #include <stdio.h> #include <unistd.h> -#include "2sysincludes.h" #include "2common.h" -#include "vb21_common.h" +#include "2sysincludes.h" #include "host_common.h" #include "host_misc.h" - #include "test_common.h" +#include "vb21_common.h" static void misc_tests(void) { diff --git a/tests/vb21_misc_tests.c b/tests/vb21_misc_tests.c index fa65eb00..0ad30c34 100644 --- a/tests/vb21_misc_tests.c +++ b/tests/vb21_misc_tests.c @@ -7,16 +7,14 @@ #include <stdio.h> -#include "2sysincludes.h" #include "2api.h" #include "2common.h" #include "2misc.h" #include "2nvstorage.h" #include "2secdata.h" - -#include "vb21_common.h" - +#include "2sysincludes.h" #include "test_common.h" +#include "vb21_common.h" /* Common context for tests */ static uint8_t workbuf[VB2_FIRMWARE_WORKBUF_RECOMMENDED_SIZE] diff --git a/tests/vb2_misc_tests.c b/tests/vb2_misc_tests.c index ee73da4f..fb8d37fa 100644 --- a/tests/vb2_misc_tests.c +++ b/tests/vb2_misc_tests.c @@ -5,13 +5,12 @@ * Tests for misc library */ -#include "2sysincludes.h" #include "2api.h" #include "2common.h" #include "2misc.h" #include "2nvstorage.h" #include "2secdata.h" - +#include "2sysincludes.h" #include "test_common.h" /* Common context for tests */ diff --git a/tests/vb2_nvstorage_tests.c b/tests/vb2_nvstorage_tests.c index 1addc003..fdb0e742 100644 --- a/tests/vb2_nvstorage_tests.c +++ b/tests/vb2_nvstorage_tests.c @@ -10,16 +10,14 @@ #include <stdlib.h> #include <string.h> -#include "2sysincludes.h" - -#include "test_common.h" -#include "vboot_common.h" - #include "2api.h" #include "2common.h" #include "2misc.h" -#include "2nvstorage.h" #include "2nvstorage_fields.h" +#include "2nvstorage.h" +#include "2sysincludes.h" +#include "test_common.h" +#include "vboot_common.h" /* Single NV storage field to test */ struct nv_field { diff --git a/tests/vb2_rsa_utility_tests.c b/tests/vb2_rsa_utility_tests.c index 58203b23..989b401e 100644 --- a/tests/vb2_rsa_utility_tests.c +++ b/tests/vb2_rsa_utility_tests.c @@ -3,14 +3,12 @@ * found in the LICENSE file. */ - #include <stdint.h> #include <stdio.h> -#include "2sysincludes.h" - #include "2common.h" #include "2rsa.h" +#include "2sysincludes.h" #include "file_keys.h" #include "rsa_padding_test.h" #include "test_common.h" diff --git a/tests/vb2_sha_tests.c b/tests/vb2_sha_tests.c index 6eae02ff..30d32f6c 100644 --- a/tests/vb2_sha_tests.c +++ b/tests/vb2_sha_tests.c @@ -7,11 +7,10 @@ #include <stdio.h> -#include "2sysincludes.h" +#include "2return_codes.h" #include "2rsa.h" #include "2sha.h" -#include "2return_codes.h" - +#include "2sysincludes.h" #include "sha_test_vectors.h" #include "test_common.h" diff --git a/tests/vboot_api_devmode_tests.c b/tests/vboot_api_devmode_tests.c index dc9da890..7126850e 100644 --- a/tests/vboot_api_devmode_tests.c +++ b/tests/vboot_api_devmode_tests.c @@ -10,11 +10,11 @@ #include <stdio.h> #include <stdlib.h> -#include "2sysincludes.h" #include "2common.h" #include "2misc.h" #include "2nvstorage.h" #include "2secdata.h" +#include "2sysincludes.h" #include "crc32.h" #include "host_common.h" #include "load_kernel_fw.h" @@ -25,7 +25,6 @@ #include "vboot_kernel.h" #include "vboot_struct.h" - /* Expected results */ #define MAX_NOTE_EVENTS 10 diff --git a/tests/vboot_api_kernel2_tests.c b/tests/vboot_api_kernel2_tests.c index 988d3e4b..a5c58633 100644 --- a/tests/vboot_api_kernel2_tests.c +++ b/tests/vboot_api_kernel2_tests.c @@ -5,10 +5,6 @@ * Tests for vboot_api_kernel, part 2 */ -#include <stdint.h> -#include <stdio.h> -#include <stdlib.h> - #include "2common.h" #include "2misc.h" #include "2nvstorage.h" @@ -17,6 +13,7 @@ #include "load_kernel_fw.h" #include "secdata_tpm.h" #include "test_common.h" +#include "tss_constants.h" #include "vboot_audio.h" #include "vboot_common.h" #include "vboot_display.h" diff --git a/tests/vboot_api_kernel4_tests.c b/tests/vboot_api_kernel4_tests.c index 03194b56..645b2049 100644 --- a/tests/vboot_api_kernel4_tests.c +++ b/tests/vboot_api_kernel4_tests.c @@ -5,20 +5,19 @@ * Tests for vboot_api_kernel, part 4 - select and load kernel */ -#include <stdint.h> -#include <stdio.h> -#include <stdlib.h> - -#include "2sysincludes.h" #include "2api.h" #include "2common.h" #include "2misc.h" #include "2nvstorage.h" +#include "2secdata.h" +#include "2sysincludes.h" #include "ec_sync.h" #include "host_common.h" #include "load_kernel_fw.h" #include "secdata_tpm.h" #include "test_common.h" +#include "tlcl.h" +#include "tss_constants.h" #include "vboot_audio.h" #include "vboot_common.h" #include "vboot_kernel.h" diff --git a/tests/vboot_api_kernel5_tests.c b/tests/vboot_api_kernel5_tests.c index cd641e7a..c392d7cf 100644 --- a/tests/vboot_api_kernel5_tests.c +++ b/tests/vboot_api_kernel5_tests.c @@ -5,22 +5,19 @@ * Tests for vboot_api_kernel.c */ -#include <stdint.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> - -#include "2sysincludes.h" #include "2api.h" #include "2common.h" #include "2misc.h" #include "2nvstorage.h" #include "2rsa.h" +#include "2secdata.h" #include "2struct.h" +#include "2sysincludes.h" #include "host_common.h" #include "load_kernel_fw.h" #include "secdata_tpm.h" #include "test_common.h" +#include "tss_constants.h" #include "vb2_common.h" #include "vboot_api.h" #include "vboot_common.h" diff --git a/tests/vboot_api_kernel_tests.c b/tests/vboot_api_kernel_tests.c index c5636a94..a5de12ba 100644 --- a/tests/vboot_api_kernel_tests.c +++ b/tests/vboot_api_kernel_tests.c @@ -5,14 +5,9 @@ * Tests for VbTryLoadKernel() */ -#include <stddef.h> -#include <stdint.h> -#include <stdio.h> -#include <stdlib.h> - -#include "2sysincludes.h" #include "2common.h" #include "2nvstorage.h" +#include "2sysincludes.h" #include "load_kernel_fw.h" #include "secdata_tpm.h" #include "test_common.h" diff --git a/tests/vboot_detach_menu_tests.c b/tests/vboot_detach_menu_tests.c index bca2cf6f..e6e1f4c2 100644 --- a/tests/vboot_detach_menu_tests.c +++ b/tests/vboot_detach_menu_tests.c @@ -5,10 +5,6 @@ * Tests detachable menu UI */ -#include <stdint.h> -#include <stdio.h> -#include <stdlib.h> - #include "2common.h" #include "2misc.h" #include "2nvstorage.h" @@ -17,6 +13,7 @@ #include "load_kernel_fw.h" #include "secdata_tpm.h" #include "test_common.h" +#include "tss_constants.h" #include "vboot_api.h" #include "vboot_audio.h" #include "vboot_common.h" diff --git a/tests/vboot_display_tests.c b/tests/vboot_display_tests.c index bd3fca8d..8286d4f6 100644 --- a/tests/vboot_display_tests.c +++ b/tests/vboot_display_tests.c @@ -10,11 +10,11 @@ #include <stdlib.h> #include <string.h> -#include "2sysincludes.h" #include "2common.h" #include "2misc.h" #include "2nvstorage.h" #include "2struct.h" +#include "2sysincludes.h" #include "host_common.h" #include "test_common.h" #include "vboot_common.h" diff --git a/tests/vboot_kernel_tests.c b/tests/vboot_kernel_tests.c index 25be6fe0..c3ccb34c 100644 --- a/tests/vboot_kernel_tests.c +++ b/tests/vboot_kernel_tests.c @@ -5,17 +5,14 @@ * Tests for vboot_kernel.c */ -#include <stdint.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> - -#include "2sysincludes.h" #include "2api.h" #include "2common.h" #include "2misc.h" #include "2nvstorage.h" +#include "2secdata.h" +#include "2secdata_struct.h" #include "2sha.h" +#include "2sysincludes.h" #include "cgptlib.h" #include "cgptlib_internal.h" #include "crc32.h" diff --git a/utility/load_kernel_test.c b/utility/load_kernel_test.c index 34bee188..3e4fb90c 100644 --- a/utility/load_kernel_test.c +++ b/utility/load_kernel_test.c @@ -10,9 +10,9 @@ #include <sys/types.h> #include <unistd.h> -#include "2sysincludes.h" #include "2api.h" #include "2misc.h" +#include "2sysincludes.h" #include "host_common.h" #include "load_kernel_fw.h" #include "secdata_tpm.h" diff --git a/utility/pad_digest_utility.c b/utility/pad_digest_utility.c index 3861e5fe..718f7356 100644 --- a/utility/pad_digest_utility.c +++ b/utility/pad_digest_utility.c @@ -8,9 +8,9 @@ #include <stdlib.h> #include <string.h> -#include "2sysincludes.h" #include "2common.h" #include "2sha.h" +#include "2sysincludes.h" #include "host_common.h" #include "host_signature2.h" #include "signature_digest.h" diff --git a/utility/signature_digest_utility.c b/utility/signature_digest_utility.c index edabf71d..9a39317a 100644 --- a/utility/signature_digest_utility.c +++ b/utility/signature_digest_utility.c @@ -11,8 +11,8 @@ #include <stdio.h> #include <stdlib.h> -#include "2sysincludes.h" #include "2common.h" +#include "2sysincludes.h" #include "host_common.h" #include "host_signature2.h" #include "signature_digest.h" diff --git a/utility/verify_data.c b/utility/verify_data.c index 1bf6756c..6069044d 100644 --- a/utility/verify_data.c +++ b/utility/verify_data.c @@ -15,11 +15,10 @@ #include <sys/types.h> #include <unistd.h> -#include "2sysincludes.h" - #include "2common.h" -#include "2sha.h" #include "2rsa.h" +#include "2sha.h" +#include "2sysincludes.h" #include "file_keys.h" #include "host_common.h" #include "vb2_common.h" |