| Index: src/platform/vboot_reference/tests/firmware_rollback_tests.c
|
| diff --git a/src/platform/vboot_reference/tests/firmware_rollback_tests.c b/src/platform/vboot_reference/tests/firmware_rollback_tests.c
|
| index 19ac850c4f64e52b963ce4d15a690199e6d7181d..0df0c3c2dedc67107c571d279dd47fac3f61454e 100644
|
| --- a/src/platform/vboot_reference/tests/firmware_rollback_tests.c
|
| +++ b/src/platform/vboot_reference/tests/firmware_rollback_tests.c
|
| @@ -15,73 +15,6 @@
|
| #include "rollback_index.h"
|
| #include "test_common.h"
|
|
|
| -/* Generates a test firmware image for rollback tests with a given
|
| - * [firmware_key_version] and [firmware_version]. If [is_corrupt] is 1,
|
| - * then the image has invalid signatures and will fail verification. */
|
| -uint8_t* GenerateRollbackTestImage(int firmware_key_version,
|
| - int firmware_version,
|
| - int is_corrupt) {
|
| - FirmwareImage* image = NULL;
|
| - uint8_t* firmware_blob = NULL;
|
| - const char* firmare_sign_key_pub_file = "testkeys/key_rsa1024.keyb";
|
| - uint8_t* firmware_sign_key = NULL;
|
| - const char* root_key_file = "testkeys/key_rsa8192.pem";
|
| - const char* firmware_key_file = "testkeys/key_rsa1024.pem";
|
| - uint64_t len;
|
| - firmware_sign_key = BufferFromFile(firmare_sign_key_pub_file,
|
| - &len);
|
| - if (!firmware_sign_key)
|
| - return NULL;
|
| -
|
| - image = FirmwareImageNew();
|
| - if (!image)
|
| - return NULL;
|
| -
|
| - Memcpy(image->magic, FIRMWARE_MAGIC, FIRMWARE_MAGIC_SIZE);
|
| - image->firmware_sign_algorithm = 0; /* RSA1024/SHA1 */
|
| - image->firmware_sign_key = (uint8_t*) Malloc(
|
| - RSAProcessedKeySize(image->firmware_sign_algorithm));
|
| - Memcpy(image->firmware_sign_key, firmware_sign_key,
|
| - RSAProcessedKeySize(image->firmware_sign_algorithm));
|
| - image->firmware_key_version = firmware_key_version;
|
| - Free(firmware_sign_key);
|
| -
|
| - /* Update correct header length. */
|
| - image->header_len = GetFirmwareHeaderLen(image);
|
| -
|
| - /* Calculate SHA-512 digest on header and populate header_checksum. */
|
| - CalculateFirmwareHeaderChecksum(image, image->header_checksum);
|
| -
|
| - /* Populate firmware and preamble with dummy data. */
|
| - image->firmware_version = firmware_version;
|
| - image->firmware_len = 1;
|
| - image->preamble_signature = image->firmware_signature = NULL;
|
| - Memset(image->preamble, 'P', FIRMWARE_PREAMBLE_SIZE);
|
| - image->firmware_data = Malloc(image->firmware_len);
|
| - Memset(image->firmware_data, 'F', image->firmware_len);
|
| -
|
| - /* Generate and populate signatures. */
|
| - if (!AddFirmwareKeySignature(image, root_key_file)) {
|
| - fprintf(stderr, "Couldn't create key signature.\n");
|
| - FirmwareImageFree(image);
|
| - return NULL;
|
| - }
|
| -
|
| - if (!AddFirmwareSignature(image, firmware_key_file)) {
|
| - fprintf(stderr, "Couldn't create firmware and preamble signature.\n");
|
| - FirmwareImageFree(image);
|
| - return NULL;
|
| - }
|
| - if (is_corrupt) {
|
| - /* Invalidate image. */
|
| - Memset(image->firmware_data, 'X', image->firmware_len);
|
| - }
|
| -
|
| - firmware_blob = GetFirmwareBlob(image, &len);
|
| - FirmwareImageFree(image);
|
| - return firmware_blob;
|
| -}
|
| -
|
| /* Tests that check for correctness of the VerifyFirmwareDriver_f() logic
|
| * and rollback prevention. */
|
| void VerifyFirmwareDriverTest(void) {
|
|
|