Refactor siglen_map[] to store key size in bytes instead of 32-bit words.
Review URL: http://codereview.chromium.org/660261
diff --git a/utils/firmware_image.c b/utils/firmware_image.c
index 714d5dd..d5b0549 100644
--- a/utils/firmware_image.c
+++ b/utils/firmware_image.c
@@ -81,7 +81,7 @@
/* Compute size of pre-processed RSA public key and signature. */
sign_key_len = RSAProcessedKeySize(image->sign_algorithm);
- signature_len = siglen_map[image->sign_algorithm] * sizeof(uint32_t);
+ signature_len = siglen_map[image->sign_algorithm];
/* Check whether the header length is correct. */
@@ -166,7 +166,7 @@
write(fd, image->magic, FIELD_LEN(magic));
WriteFirmwareHeader(fd, image);
write(fd, image->key_signature, FIELD_LEN(key_signature));
- signature_len = siglen_map[image->sign_algorithm] * sizeof(uint32_t);
+ signature_len = siglen_map[image->sign_algorithm];
WriteFirmwarePreamble(fd, image);
write(fd, image->preamble_signature, signature_len);
write(fd, image->firmware_signature, signature_len);
@@ -293,7 +293,7 @@
const uint8_t* firmware_data_start,
int firmware_len,
int algorithm) {
- int signature_len = siglen_map[algorithm] * sizeof(uint32_t);
+ int signature_len = siglen_map[algorithm];
if (!RSAVerifyBinary_f(NULL, sign_key, /* Key to use. */
firmware_data_start + signature_len, /* Data to
* verify */
@@ -335,7 +335,7 @@
sign_key_ptr = header_ptr + (FIELD_LEN(header_len) +
FIELD_LEN(sign_algorithm));
sign_key = RSAPublicKeyFromBuf(sign_key_ptr, sign_key_len);
- signature_len = siglen_map[algorithm] * sizeof(uint32_t);
+ signature_len = siglen_map[algorithm];
/* Only continue if preamble verification succeeds. */
preamble_ptr = (header_ptr + header_len +
@@ -406,7 +406,7 @@
sign_key_size = RSAProcessedKeySize(image->sign_algorithm);
sign_key = RSAPublicKeyFromBuf(image->sign_key,
sign_key_size);
- signature_size = siglen_map[image->sign_algorithm] * sizeof(uint32_t);
+ signature_size = siglen_map[image->sign_algorithm];
if (image->sign_algorithm >= kNumAlgorithms)
return VERIFY_FIRMWARE_INVALID_ALGORITHM;
@@ -477,7 +477,7 @@
char* tmp_firmware_file = ".tmpFirmwareFile";
uint8_t* preamble_signature;
uint8_t* firmware_signature;
- int signature_len = siglen_map[algorithm] * sizeof(uint32_t);
+ int signature_len = siglen_map[algorithm];
/* Write preamble to a file. */
if(-1 == (tmp_preamble_fd = creat(tmp_preamble_file, S_IRWXU))) {