Massive refactoring of external header files.

This reduces the number of exported header files to the minimum needed by
the existing userspace utilities and firmware implementations.

BUG=chromium:221544
BRANCH=none
TEST=manual, trybots
CQ-DEPEND=CL:47019,CL:47022,CL:47023

  sudo FEATURES=test emerge vboot_reference
  FEATURES=test emerge-$BOARD \
                vboot_reference \
                chromeos-cryptohome \
                chromeos-installer \
                chromeos-u-boot \
                peach-u-boot \
                depthcharge

Change-Id: I2946cc2dbaf5459a6c5eca92ca57d546498e6d85
Signed-off-by: Bill Richardson <wfrichar@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/47021
Reviewed-by: Randall Spangler <rspangler@chromium.org>

42 files changed, 43 insertions, 0 deletions

diff --git a/tests/big_firmware_tests.c b/tests/big_firmware_tests.c
index ca1dea8e..efb81d14 100644
--- a/tests/big_firmware_tests.c
+++ b/tests/big_firmware_tests.c
@@ -6,6 +6,7 @@
  * is a quick and dirty test for detecting integer overflow issues.
  */
 
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/tests/big_kernel_tests.c b/tests/big_kernel_tests.c
index cc4ceca0..6d83aae4 100644
--- a/tests/big_kernel_tests.c
+++ b/tests/big_kernel_tests.c
@@ -6,6 +6,7 @@
  * is a quick and dirty test for detecting integer overflow issues.
  */
 
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/tests/firmware_image_tests.c b/tests/firmware_image_tests.c
index 96cf9551..6201d473 100644
--- a/tests/firmware_image_tests.c
+++ b/tests/firmware_image_tests.c
@@ -5,6 +5,7 @@
  * Tests for firmware image library.
  */
 
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/tests/firmware_rollback_tests.c b/tests/firmware_rollback_tests.c
index 14c0475c..09673a39 100644
--- a/tests/firmware_rollback_tests.c
+++ b/tests/firmware_rollback_tests.c
@@ -5,6 +5,7 @@
  * Tests for checking firmware rollback-prevention logic.
  */
 
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/tests/firmware_splicing_tests.c b/tests/firmware_splicing_tests.c
index 97d16dfc..17c327f4 100644
--- a/tests/firmware_splicing_tests.c
+++ b/tests/firmware_splicing_tests.c
@@ -5,6 +5,7 @@
  * Splicing tests for the firmware image verification library.
  */
 
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/tests/firmware_verify_benchmark.c b/tests/firmware_verify_benchmark.c
index 61f23abd..3cdceff8 100644
--- a/tests/firmware_verify_benchmark.c
+++ b/tests/firmware_verify_benchmark.c
@@ -5,6 +5,7 @@
  * Timing benchmark for verifying a firmware image.
  */
 
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/tests/kernel_image_tests.c b/tests/kernel_image_tests.c
index 4890de3a..8125e681 100644
--- a/tests/kernel_image_tests.c
+++ b/tests/kernel_image_tests.c
@@ -5,6 +5,7 @@
  * Tests for kernel image library.
  */
 
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/tests/kernel_rollback_tests.c b/tests/kernel_rollback_tests.c
index 731d45c9..2ecb05fc 100644
--- a/tests/kernel_rollback_tests.c
+++ b/tests/kernel_rollback_tests.c
@@ -5,6 +5,7 @@
  * Tests for checking kernel rollback-prevention logic.
  */
 
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/tests/kernel_splicing_tests.c b/tests/kernel_splicing_tests.c
index 241f1096..296af473 100644
--- a/tests/kernel_splicing_tests.c
+++ b/tests/kernel_splicing_tests.c
@@ -5,6 +5,7 @@
  * Splicing tests for the kernel image verification library.
  */
 
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/tests/kernel_verify_benchmark.c b/tests/kernel_verify_benchmark.c
index c16dfcb8..3ba113c5 100644
--- a/tests/kernel_verify_benchmark.c
+++ b/tests/kernel_verify_benchmark.c
@@ -5,6 +5,7 @@
  * Timing benchmark for verifying a firmware image.
  */
 
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/tests/rollback_index2_tests.c b/tests/rollback_index2_tests.c
index d5f29743..1a07cb02 100644
--- a/tests/rollback_index2_tests.c
+++ b/tests/rollback_index2_tests.c
@@ -5,6 +5,7 @@
  * Tests for rollback_index functions
  */
 
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/tests/rollback_index3_tests.c b/tests/rollback_index3_tests.c
index 30af89df..9434a5a7 100644
--- a/tests/rollback_index3_tests.c
+++ b/tests/rollback_index3_tests.c
@@ -5,6 +5,7 @@
  * Tests for do-nothing rollback_index functions with disabled TPM
  */
 
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/tests/rollback_index_test.c b/tests/rollback_index_test.c
index a86ebde2..d84b8ea2 100644
--- a/tests/rollback_index_test.c
+++ b/tests/rollback_index_test.c
@@ -35,6 +35,7 @@
 #include "utility.h"
 
 #include <stdarg.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
diff --git a/tests/rsa_padding_test.c b/tests/rsa_padding_test.c
index fa04dacc..2f2423b9 100644
--- a/tests/rsa_padding_test.c
+++ b/tests/rsa_padding_test.c
@@ -4,6 +4,7 @@
  */
 
 
+#include <stdint.h>
 #include <stdio.h>
 
 #include "cryptolib.h"
diff --git a/tests/rsa_utility_tests.c b/tests/rsa_utility_tests.c
index 8944652e..47c483b2 100644
--- a/tests/rsa_utility_tests.c
+++ b/tests/rsa_utility_tests.c
@@ -4,6 +4,7 @@
  */
 
 
+#include <stdint.h>
 #include <stdio.h>
 
 #define _STUB_IMPLEMENTATION_
diff --git a/tests/rsa_verify_benchmark.c b/tests/rsa_verify_benchmark.c
index b359b62b..7b27f9e8 100644
--- a/tests/rsa_verify_benchmark.c
+++ b/tests/rsa_verify_benchmark.c
@@ -3,6 +3,7 @@
  * found in the LICENSE file.
  */
 
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/tests/sha_benchmark.c b/tests/sha_benchmark.c
index a5bfc538..2193b781 100644
--- a/tests/sha_benchmark.c
+++ b/tests/sha_benchmark.c
@@ -3,6 +3,7 @@
  * found in the LICENSE file.
  */
 
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/tests/sha_tests.c b/tests/sha_tests.c
index b462ccc0..ad85b9ea 100644
--- a/tests/sha_tests.c
+++ b/tests/sha_tests.c
@@ -5,6 +5,7 @@
 
 /* FIPS 180-2 Tests for message digest functions. */
 
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/tests/stateful_util_tests.c b/tests/stateful_util_tests.c
index e41feacb..9a306d5f 100644
--- a/tests/stateful_util_tests.c
+++ b/tests/stateful_util_tests.c
@@ -5,6 +5,7 @@
  * Tests for statful_util functions.
  */
 
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/tests/test_common.c b/tests/test_common.c
index e57fe21e..2fa445f6 100644
--- a/tests/test_common.c
+++ b/tests/test_common.c
@@ -7,6 +7,7 @@
 
 #include "test_common.h"
 
+#include <stdint.h>
 #include <stdio.h>
 #include <string.h>
 
diff --git a/tests/tlcl_tests.c b/tests/tlcl_tests.c
index 4765cff3..ef543d48 100644
--- a/tests/tlcl_tests.c
+++ b/tests/tlcl_tests.c
@@ -5,6 +5,7 @@
  * Tests for TPM lite library
  */
 
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/tests/tpm_bootmode_tests.c b/tests/tpm_bootmode_tests.c
index 48552c58..c39094d0 100644
--- a/tests/tpm_bootmode_tests.c
+++ b/tests/tpm_bootmode_tests.c
@@ -5,6 +5,7 @@
  * Tests for tpm_bootmode functions
  */
 
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/tests/tpm_lite/tlcl_tests.c b/tests/tpm_lite/tlcl_tests.c
index 59180e40..f36021f9 100644
--- a/tests/tpm_lite/tlcl_tests.c
+++ b/tests/tpm_lite/tlcl_tests.c
@@ -6,6 +6,8 @@
 /* Shared code for tests.
  */
 
+#include "sysincludes.h"
+
 #include "tlcl.h"
 #include "tlcl_tests.h"
 
diff --git a/tests/utility_string_tests.c b/tests/utility_string_tests.c
index fe11d70b..d7601931 100644
--- a/tests/utility_string_tests.c
+++ b/tests/utility_string_tests.c
@@ -5,6 +5,7 @@
  * Tests for string utility functions.
  */
 
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/tests/utility_tests.c b/tests/utility_tests.c
index 7e21c77a..978f768c 100644
--- a/tests/utility_tests.c
+++ b/tests/utility_tests.c
@@ -5,6 +5,7 @@
  * Tests for utility functions
  */
 
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/tests/vboot_api_devmode_tests.c b/tests/vboot_api_devmode_tests.c
index af20030f..b10bba67 100644
--- a/tests/vboot_api_devmode_tests.c
+++ b/tests/vboot_api_devmode_tests.c
@@ -6,6 +6,7 @@
  */
 
 #include <stddef.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/tests/vboot_api_firmware_tests.c b/tests/vboot_api_firmware_tests.c
index a31b532e..9e7c441d 100644
--- a/tests/vboot_api_firmware_tests.c
+++ b/tests/vboot_api_firmware_tests.c
@@ -5,6 +5,7 @@
  * Tests for vboot_api_firmware
  */
 
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/tests/vboot_api_init_tests.c b/tests/vboot_api_init_tests.c
index 7834b907..e04554a7 100644
--- a/tests/vboot_api_init_tests.c
+++ b/tests/vboot_api_init_tests.c
@@ -5,6 +5,7 @@
  * Tests for vboot_api_init
  */
 
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/tests/vboot_api_kernel2_tests.c b/tests/vboot_api_kernel2_tests.c
index 9b921cd2..aa3e20dc 100644
--- a/tests/vboot_api_kernel2_tests.c
+++ b/tests/vboot_api_kernel2_tests.c
@@ -5,6 +5,7 @@
  * Tests for vboot_api_kernel, part 2
  */
 
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/tests/vboot_api_kernel3_tests.c b/tests/vboot_api_kernel3_tests.c
index 9ec6f19b..5b69845d 100644
--- a/tests/vboot_api_kernel3_tests.c
+++ b/tests/vboot_api_kernel3_tests.c
@@ -5,6 +5,7 @@
  * Tests for vboot_api_kernel, part 3 - software sync
  */
 
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/tests/vboot_api_kernel4_tests.c b/tests/vboot_api_kernel4_tests.c
index 414279e5..af8d2b67 100644
--- a/tests/vboot_api_kernel4_tests.c
+++ b/tests/vboot_api_kernel4_tests.c
@@ -5,6 +5,7 @@
  * Tests for vboot_api_kernel, part 4 - select and load kernel
  */
 
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/tests/vboot_api_kernel_tests.c b/tests/vboot_api_kernel_tests.c
index 8c04814e..56cb2104 100644
--- a/tests/vboot_api_kernel_tests.c
+++ b/tests/vboot_api_kernel_tests.c
@@ -6,6 +6,7 @@
  */
 
 #include <stddef.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/tests/vboot_audio_tests.c b/tests/vboot_audio_tests.c
index a1ecf71b..23667b1e 100644
--- a/tests/vboot_audio_tests.c
+++ b/tests/vboot_audio_tests.c
@@ -6,6 +6,7 @@
  */
 
 #include <stddef.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/tests/vboot_common2_tests.c b/tests/vboot_common2_tests.c
index b154e50b..564518ac 100644
--- a/tests/vboot_common2_tests.c
+++ b/tests/vboot_common2_tests.c
@@ -5,6 +5,7 @@
  * Tests for firmware image library.
  */
 
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/tests/vboot_common3_tests.c b/tests/vboot_common3_tests.c
index c4f81cd3..b5499f66 100644
--- a/tests/vboot_common3_tests.c
+++ b/tests/vboot_common3_tests.c
@@ -5,6 +5,7 @@
  * Tests for firmware image library.
  */
 
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/tests/vboot_common_tests.c b/tests/vboot_common_tests.c
index df4fdc21..852be795 100644
--- a/tests/vboot_common_tests.c
+++ b/tests/vboot_common_tests.c
@@ -5,6 +5,7 @@
  * Tests for firmware vboot_common.c
  */
 
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/tests/vboot_display_tests.c b/tests/vboot_display_tests.c
index 3093534d..8e4a3a27 100644
--- a/tests/vboot_display_tests.c
+++ b/tests/vboot_display_tests.c
@@ -5,6 +5,7 @@
  * Tests for firmware display library.
  */
 
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/tests/vboot_firmware_tests.c b/tests/vboot_firmware_tests.c
index 24a6c285..f6b96fec 100644
--- a/tests/vboot_firmware_tests.c
+++ b/tests/vboot_firmware_tests.c
@@ -5,6 +5,7 @@
  * Tests for vboot_firmware library.
  */
 
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/tests/vboot_kernel_tests.c b/tests/vboot_kernel_tests.c
index 1ee1528f..6992e94a 100644
--- a/tests/vboot_kernel_tests.c
+++ b/tests/vboot_kernel_tests.c
@@ -5,6 +5,7 @@
  * Tests for vboot_kernel.c
  */
 
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/tests/vboot_nvstorage_test.c b/tests/vboot_nvstorage_test.c
index 91e8a89a..7ffec614 100644
--- a/tests/vboot_nvstorage_test.c
+++ b/tests/vboot_nvstorage_test.c
@@ -5,6 +5,7 @@
  * Tests for firmware NV storage library.
  */
 
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/tests/verify_firmware_fuzz_driver.c b/tests/verify_firmware_fuzz_driver.c
index f04a7d5d..3868d74f 100644
--- a/tests/verify_firmware_fuzz_driver.c
+++ b/tests/verify_firmware_fuzz_driver.c
@@ -5,6 +5,7 @@
  * Utility for aiding fuzz testing of firmware image verification code.
  */
 
+#include <stdint.h>
 #include <stdio.h>
 
 #include "file_keys.h"
diff --git a/tests/verify_kernel_fuzz_driver.c b/tests/verify_kernel_fuzz_driver.c
index 10272638..e429f5e0 100644
--- a/tests/verify_kernel_fuzz_driver.c
+++ b/tests/verify_kernel_fuzz_driver.c
@@ -5,6 +5,7 @@
  * Utility for aiding fuzz testing of kernel image verification code.
  */
 
+#include <stdint.h>
 #include <stdio.h>
 
 #include "file_keys.h"