Revert "VBoot Reference: Refactor Part 2 - Crypto Libraries"
This reverts commit e018a80a37aaa45681f45f5852f04d20aedd8b2d.
Review URL: http://codereview.chromium.org/1593002
diff --git a/utils/file_keys.c b/utils/file_keys.c
index 275ca6b..8438351 100644
--- a/utils/file_keys.c
+++ b/utils/file_keys.c
@@ -15,7 +15,8 @@
#include <sys/types.h>
#include <unistd.h>
-#include "cryptolib.h"
+#include "padding.h"
+#include "rsa_utility.h"
#include "signature_digest.h"
#include "utility.h"
@@ -59,27 +60,6 @@
return key;
}
-uint8_t* DigestFile(char* input_file, int sig_algorithm) {
- int input_fd, len;
- uint8_t data[SHA1_BLOCK_SIZE];
- uint8_t* digest = NULL;
- DigestContext ctx;
-
- if( (input_fd = open(input_file, O_RDONLY)) == -1 ) {
- debug("Couldn't open input file.\n");
- return NULL;
- }
- DigestInit(&ctx, sig_algorithm);
- while ( (len = read(input_fd, data, SHA1_BLOCK_SIZE)) ==
- SHA1_BLOCK_SIZE)
- DigestUpdate(&ctx, data, len);
- if (len != -1)
- DigestUpdate(&ctx, data, len);
- digest = DigestFinal(&ctx);
- close(input_fd);
- return digest;
-}
-
uint8_t* SignatureFile(const char* input_file, const char* key_file,
int algorithm) {
char* sign_utility = "./sign_data.sh";
diff --git a/utils/firmware_image.c b/utils/firmware_image.c
index b633d1a..803ef89 100644
--- a/utils/firmware_image.c
+++ b/utils/firmware_image.c
@@ -7,13 +7,16 @@
#include "firmware_image.h"
+#include <fcntl.h>
+#include <limits.h>
#include <sys/types.h>
#include <sys/stat.h>
-#include <fcntl.h>
#include <unistd.h>
-#include "cryptolib.h"
#include "file_keys.h"
+#include "padding.h"
+#include "rsa_utility.h"
+#include "sha_utility.h"
#include "signature_digest.h"
#include "utility.h"
diff --git a/utils/firmware_image_fw.c b/utils/firmware_image_fw.c
index 5387d95..f5c7d89 100644
--- a/utils/firmware_image_fw.c
+++ b/utils/firmware_image_fw.c
@@ -8,8 +8,10 @@
#include "firmware_image_fw.h"
-#include "cryptolib.h"
+#include "padding.h"
#include "rollback_index.h"
+#include "rsa_utility.h"
+#include "sha_utility.h"
#include "utility.h"
/* Macro to determine the size of a field structure in the FirmwareImage
diff --git a/utils/firmware_utility.cc b/utils/firmware_utility.cc
index 85275e7..6b543f5 100644
--- a/utils/firmware_utility.cc
+++ b/utils/firmware_utility.cc
@@ -17,9 +17,11 @@
#include <iostream>
extern "C" {
-#include "cryptolib.h"
#include "file_keys.h"
#include "firmware_image.h"
+#include "padding.h"
+#include "rsa_utility.h"
+#include "sha_utility.h"
#include "utility.h"
}
diff --git a/utils/kernel_image.c b/utils/kernel_image.c
index 8c8c092..e66ce38 100644
--- a/utils/kernel_image.c
+++ b/utils/kernel_image.c
@@ -14,9 +14,11 @@
#include <sys/stat.h>
#include <unistd.h>
-#include "cryptolib.h"
#include "file_keys.h"
+#include "padding.h"
#include "rollback_index.h"
+#include "rsa_utility.h"
+#include "sha_utility.h"
#include "signature_digest.h"
#include "utility.h"
diff --git a/utils/kernel_image_fw.c b/utils/kernel_image_fw.c
index 734111c..466d34a 100644
--- a/utils/kernel_image_fw.c
+++ b/utils/kernel_image_fw.c
@@ -8,8 +8,10 @@
#include "kernel_image_fw.h"
-#include "cryptolib.h"
+#include "padding.h"
#include "rollback_index.h"
+#include "rsa_utility.h"
+#include "sha_utility.h"
#include "utility.h"
/* Macro to determine the size of a field structure in the KernelImage
diff --git a/utils/kernel_utility.cc b/utils/kernel_utility.cc
index 9fedeb5..9a4f34b 100644
--- a/utils/kernel_utility.cc
+++ b/utils/kernel_utility.cc
@@ -17,9 +17,11 @@
#include <iostream>
extern "C" {
-#include "cryptolib.h"
#include "file_keys.h"
#include "kernel_image.h"
+#include "padding.h"
+#include "rsa_utility.h"
+#include "sha_utility.h"
#include "utility.h"
}
diff --git a/utils/signature_digest.c b/utils/signature_digest.c
index d8d425b..8f4c238 100644
--- a/utils/signature_digest.c
+++ b/utils/signature_digest.c
@@ -13,7 +13,9 @@
#include <stdlib.h>
#include <unistd.h>
-#include "cryptolib.h"
+#include "padding.h"
+#include "sha.h"
+#include "sha_utility.h"
#include "utility.h"
uint8_t* PrependDigestInfo(int algorithm, uint8_t* digest) {
diff --git a/utils/verify_data.c b/utils/verify_data.c
index e6cc852..4b0b785 100644
--- a/utils/verify_data.c
+++ b/utils/verify_data.c
@@ -15,8 +15,11 @@
#include <sys/types.h>
#include <unistd.h>
-#include "cryptolib.h"
#include "file_keys.h"
+#include "sha_utility.h"
+#include "padding.h"
+#include "rsa.h"
+#include "rsa_utility.h"
#include "verify_data.h"
/* ANSI Color coding sequences. */