Index: tests/test_common.c |
diff --git a/tests/test_common.c b/tests/test_common.c |
index 8270c3adca697789bd83b9411a376f70873c14c6..1c0fae23cac56a640c39cbe3bdfc2c4ece314740 100644 |
--- a/tests/test_common.c |
+++ b/tests/test_common.c |
@@ -45,110 +45,6 @@ int TEST_NEQ(int result, int not_expected_result, char* testname) { |
} |
} |
-FirmwareImage* GenerateTestFirmwareImage(int algorithm, |
- const uint8_t* firmware_sign_key, |
- int firmware_key_version, |
- int firmware_version, |
- uint64_t firmware_len, |
- const char* root_key_file, |
- const char* firmware_key_file, |
- uint8_t firmware_data_fill_char) { |
- FirmwareImage* image = FirmwareImageNew(); |
- |
- Memcpy(image->magic, FIRMWARE_MAGIC, FIRMWARE_MAGIC_SIZE); |
- image->firmware_sign_algorithm = algorithm; |
- 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; |
- |
- /* 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 = firmware_len; |
- /* Make the kernel subkey the same as the firmware signing key. */ |
- image->kernel_subkey_sign_algorithm = algorithm; |
- image->kernel_subkey_sign_key = (uint8_t*) Malloc( |
- RSAProcessedKeySize(image->kernel_subkey_sign_algorithm)); |
- Memcpy(image->kernel_subkey_sign_key, firmware_sign_key, |
- RSAProcessedKeySize(image->kernel_subkey_sign_algorithm)); |
- 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, firmware_data_fill_char, image->firmware_len); |
- |
- /* Generate and populate signatures. */ |
- if (!AddFirmwareKeySignature(image, root_key_file)) { |
- debug("Couldn't create key signature.\n"); |
- FirmwareImageFree(image); |
- return NULL; |
- } |
- |
- if (!AddFirmwareSignature(image, firmware_key_file)) { |
- debug("Couldn't create firmware and preamble signature.\n"); |
- FirmwareImageFree(image); |
- return NULL; |
- } |
- return image; |
-} |
- |
-uint8_t* GenerateTestVerificationBlob(int algorithm, |
- const uint8_t* firmware_sign_key, |
- int firmware_key_version, |
- int firmware_version, |
- uint64_t firmware_len, |
- const char* root_key_file, |
- const char* firmware_key_file) { |
- FirmwareImage* image = NULL; |
- uint8_t* firmware_blob = NULL; |
- uint64_t firmware_blob_len = 0; |
- |
- image = GenerateTestFirmwareImage(algorithm, |
- firmware_sign_key, |
- firmware_key_version, |
- firmware_version, |
- firmware_len, |
- root_key_file, |
- firmware_key_file, |
- 'F'); |
- firmware_blob = GetFirmwareBlob(image, &firmware_blob_len); |
- FirmwareImageFree(image); |
- return firmware_blob; |
-} |
- |
-uint8_t* GenerateRollbackTestVerificationBlob(int firmware_key_version, |
- int firmware_version) { |
- FirmwareImage* image = NULL; |
- uint64_t len; |
- uint8_t* verification_blob = NULL; |
- uint8_t* firmware_sign_key = NULL; |
- |
- firmware_sign_key = BufferFromFile("testkeys/key_rsa1024.keyb", |
- &len); |
- if (!firmware_sign_key) |
- return NULL; |
- image = GenerateTestFirmwareImage(0, /* RSA1024/SHA1 */ |
- firmware_sign_key, |
- firmware_key_version, |
- firmware_version, |
- 1, /* Firmware length. */ |
- "testkeys/key_rsa8192.pem", |
- "testkeys/key_rsa1024.pem", |
- 'F'); |
- if (!image) |
- return NULL; |
- verification_blob = GetFirmwareBlob(image, &len); |
- FirmwareImageFree(image); |
- return verification_blob; |
-} |
- |
- |
KernelImage* GenerateTestKernelImage(int firmware_sign_algorithm, |
int kernel_sign_algorithm, |
const uint8_t* kernel_sign_key, |