diff options
Diffstat (limited to 'tests')
34 files changed, 60 insertions, 102 deletions
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" |