Remove unused files, and tidy the directory structure of the remaining ones.

tests/test_common.c

Index: tests/test_common.c
diff --git a/tests/test_common.c b/tests/test_common.c
index 1c0fae23cac56a640c39cbe3bdfc2c4ece314740..e53f596b21df2ff0a1b61251415b9359a2cb0689 100644
--- a/tests/test_common.c
+++ b/tests/test_common.c
@@ -44,114 +44,3 @@ int TEST_NEQ(int result, int not_expected_result, char* testname) {
     return 0;
   }
 }
-
-KernelImage* GenerateTestKernelImage(int firmware_sign_algorithm,
-                                     int kernel_sign_algorithm,
-                                     const uint8_t* kernel_sign_key,
-                                     int kernel_key_version,
-                                     int kernel_version,
-                                     uint64_t kernel_len,
-                                     const char* firmware_key_file,
-                                     const char* kernel_key_file,
-                                     uint8_t kernel_data_fill_char) {
-  KernelImage* image = KernelImageNew();
-
-  Memcpy(image->magic, KERNEL_MAGIC, KERNEL_MAGIC_SIZE);
-  image->header_version = 1;
-  image->firmware_sign_algorithm = firmware_sign_algorithm;
-  image->kernel_sign_algorithm = kernel_sign_algorithm;
-  image->kernel_key_version = kernel_key_version;
-  image->kernel_sign_key = (uint8_t*) Malloc(
-      RSAProcessedKeySize(image->kernel_sign_algorithm));
-  Memcpy(image->kernel_sign_key, kernel_sign_key,
-         RSAProcessedKeySize(image->kernel_sign_algorithm));
-
-  /* Update correct header length. */
-  image->header_len = GetKernelHeaderLen(image);
-
-  /* Calculate SHA-512 digest on header and populate header_checksum. */
-  CalculateKernelHeaderChecksum(image, image->header_checksum);
-
-  /* Populate kernel options and data with dummy data. */
-  image->kernel_version = kernel_version;
-  image->bootloader_offset = 0;
-  image->bootloader_size = 512;
-  image->padded_header_size = 100;
-  image->kernel_len = kernel_len;
-  image->kernel_key_signature = image->kernel_signature = NULL;
-  image->kernel_data = Malloc(kernel_len);
-  Memset(image->kernel_data, kernel_data_fill_char, kernel_len);
-
-  /* Generate and populate signatures. */
-  if (!AddKernelKeySignature(image, firmware_key_file)) {
-    debug("Couldn't create key signature.\n");
-    KernelImageFree(image);
-    return NULL;
-  }
-
-  if (!AddKernelSignature(image, kernel_key_file)) {
-    debug("Couldn't create kernel option and kernel signature.\n");
-    KernelImageFree(image);
-    return NULL;
-  }
-
-  return image;
-}
-
-uint8_t* GenerateTestKernelBlob(int firmware_sign_algorithm,
-                                int kernel_sign_algorithm,
-                                const uint8_t* kernel_sign_key,
-                                int kernel_key_version,
-                                int kernel_version,
-                                uint64_t kernel_len,
-                                const char* firmware_key_file,
-                                const char* kernel_key_file) {
-  KernelImage* image = NULL;
-  uint8_t* kernel_blob = NULL;
-  uint64_t kernel_blob_len = 0;
-
-  image = GenerateTestKernelImage(firmware_sign_algorithm,
-                                  kernel_sign_algorithm,
-                                  kernel_sign_key,
-                                  kernel_key_version,
-                                  kernel_version,
-                                  kernel_len,
-                                  firmware_key_file,
-                                  kernel_key_file,
-                                  'K');
-
-  kernel_blob = GetKernelBlob(image, &kernel_blob_len);
-  KernelImageFree(image);
-  return kernel_blob;
-}
-
-uint8_t* GenerateRollbackTestKernelBlob(int kernel_key_version,
-                                        int kernel_version,
-                                        int is_corrupt) {
- KernelImage* image = NULL;
- uint64_t len;
- uint8_t* kernel_blob = NULL;
- uint8_t* kernel_sign_key = NULL;
- kernel_sign_key = BufferFromFile("testkeys/key_rsa1024.keyb",
-                                  &len);
- if (!kernel_sign_key)
-   return NULL;
- image = GenerateTestKernelImage(0,  /* Firmware algo: RSA1024/SHA1 */
-                                 0,  /* Kernel algo: RSA1024/SHA1 */
-                                 kernel_sign_key,
-                                 kernel_key_version,
-                                 kernel_version,
-                                 1,  /* kernel length. */
-                                 "testkeys/key_rsa1024.pem",
-                                 "testkeys/key_rsa1024.pem",
-                                 'K');
- if (!image)
-   return NULL;
- if (is_corrupt) {
-   /* Invalidate image. */
-   Memset(image->kernel_data, 'X', image->kernel_len);
- }
- kernel_blob = GetKernelBlob(image, &len);
- KernelImageFree(image);
- return kernel_blob;
-}