scottk/OpenCellular
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenCellular.git synced 2026-01-08 00:21:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Vboot Reference: Refactor Code.

Browse Source 
This CL does the following:
1) It adds a SignatureBuf function which uses the OpenSSL library to generate RSA signature. This is more robust than the previous way of invoking the command line "openssl" utility and capturing its output. No more unnecessary temporary files for signature operations.
2) It adds functions that allow direct manipulation of binary verified Firmware and Kernel Image blobs in memory.
3) It changes the structure field members for FirmwareImage to make it consistent with KernelImage. Now it's clearer which key is used when.
4) Minor bug fixes and slightly improved API for dealing verified boot firmware and kernel images.
5) Renames the RSA_verify function to prevent conflicts with OpenSSL since it's linked into the firmware utility binary.

Review URL: http://codereview.chromium.org/661353
This commit is contained in:
Gaurav Shah
2010-03-02 15:40:01 -08:00
parent 444e1e19f2
commit f5564fa98c
21 changed files with 675 additions and 490 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
tests/Makefile
View File

@@ -7,30 +7,30 @@ CFLAGS = -Wall -DNDEBUG
INCLUDES ?= -I../include/
TOP ?= ../
FIRMWARE_LIBS = $(TOP)/crypto/libcrypto.a $(TOP)/common/libcommon.a
LIBS = $(TOP)/utils/kernel_image.o $(TOP)/utils/firmware_image.o \
$(TOP)/crypto/libcrypto.a $(TOP)/common/libcommon.a \
$(TOP)/utils/file_keys.o -lrt
$(TOP)/utils/file_keys.o $(TOP)/utils/signature_digest.o -lcrypto
tests: firmware_image_tests kernel_image_tests sha_tests sha_benchmark \
rsa_verify_benchmark rsa_padding_test
sha_tests: sha_tests.c
$(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS)
$(CC) $(CFLAGS) $(INCLUDES) $^ -o $@ $(FIRMWARE_LIBS)
firmware_image_tests: firmware_image_tests.c $(LIBS)
$(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS)
firmware_image_tests: firmware_image_tests.c
$(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) $(FIRMWARE_LIBS)
kernel_image_tests: kernel_image_tests.c $(LIBS)
$(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS)
kernel_image_tests: kernel_image_tests.c
$(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) $(FIRMWARE_LIBS)
sha_benchmark: sha_benchmark.c timer_utils.c
$(CC) $(CFLAGS) $(INCLUDES) $^ -o $@ $(LIBS)
sha_benchmark: sha_benchmark.c timer_utils.c $(FIRMWARE_LIBS)
$(CC) $(CFLAGS) $(INCLUDES) $^ -o $@ -lrt
rsa_padding_test: rsa_padding_test.c
$(CC) $(CFLAGS) $(INCLUDES) $^ -o $@ $(LIBS)
$(CC) $(CFLAGS) $(INCLUDES) $^ -o $@ $(LIBS) $(FIRMWARE_LIBS)
rsa_verify_benchmark: rsa_verify_benchmark.c timer_utils.c
$(CC) $(CFLAGS) $(INCLUDES) $^ -o $@ $(LIBS)
$(CC) $(CFLAGS) $(INCLUDES) $^ -o $@ -lrt $(LIBS) $(FIRMWARE_LIBS)
clean:
rm -f sha_tests sha_benchmark rsa_verify_benchmark \

65
tests/firmware_image_tests.c
View File

@@ -31,8 +31,8 @@ int TEST_EQ(int result, int expected_result, char* testname) {
}
FirmwareImage* GenerateTestFirmwareImage(int algorithm,
uint8_t* sign_key,
int key_version,
uint8_t* firmware_sign_key,
int firmware_key_version,
int firmware_version,
int firmware_len) {
FirmwareImage* image = FirmwareImageNew();
@@ -40,29 +40,30 @@ FirmwareImage* GenerateTestFirmwareImage(int algorithm,
DigestContext ctx;
Memcpy(image->magic, FIRMWARE_MAGIC, FIRMWARE_MAGIC_SIZE);
image->sign_algorithm = algorithm;
image->sign_key = (uint8_t*) Malloc(
RSAProcessedKeySize(image->sign_algorithm));
Memcpy(image->sign_key, sign_key, RSAProcessedKeySize(image->sign_algorithm));
image->key_version = key_version;
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 = (sizeof(image->header_len) +
sizeof(image->sign_algorithm) +
RSAProcessedKeySize(image->sign_algorithm) +
sizeof(image->key_version) +
sizeof(image->firmware_sign_algorithm) +
RSAProcessedKeySize(image->firmware_sign_algorithm) +
sizeof(image->firmware_key_version) +
sizeof(image->header_checksum));
/* Calculate SHA-512 digest on header and populate header_checksum. */
DigestInit(&ctx, ROOT_SIGNATURE_ALGORITHM);
DigestUpdate(&ctx, (uint8_t*) &image->header_len,
sizeof(image->header_len));
DigestUpdate(&ctx, (uint8_t*) &image->sign_algorithm,
sizeof(image->sign_algorithm));
DigestUpdate(&ctx, image->sign_key,
RSAProcessedKeySize(image->sign_algorithm));
DigestUpdate(&ctx, (uint8_t*) &image->key_version,
sizeof(image->key_version));
DigestUpdate(&ctx, (uint8_t*) &image->firmware_sign_algorithm,
sizeof(image->firmware_sign_algorithm));
DigestUpdate(&ctx, image->firmware_sign_key,
RSAProcessedKeySize(image->firmware_sign_algorithm));
DigestUpdate(&ctx, (uint8_t*) &image->firmware_key_version,
sizeof(image->firmware_key_version));
header_checksum = DigestFinal(&ctx);
Memcpy(image->header_checksum, header_checksum, SHA512_DIGEST_SIZE);
Free(header_checksum);
@@ -144,8 +145,8 @@ int VerifyFirmwareImageTamperTest(FirmwareImage* image,
fprintf(stderr, "[[Tampering with root key signature...]]\n");
image->key_signature[0] = 0xFF;
image->key_signature[1] = 0x00;
image->firmware_key_signature[0] = 0xFF;
image->firmware_key_signature[1] = 0x00;
if (!TEST_EQ(VerifyFirmwareImage(root_key, image, DEV_MODE_ENABLED),
VERIFY_FIRMWARE_SUCCESS,
"FirmwareImage Root Signature Tamper Verification (Dev Mode)"))
@@ -160,13 +161,13 @@ int VerifyFirmwareImageTamperTest(FirmwareImage* image,
int main(int argc, char* argv[]) {
uint32_t len;
uint8_t* sign_key_buf = NULL;
uint8_t* firmware_sign_key_buf = NULL;
uint8_t* root_key_blob = NULL;
uint8_t* firmware_blob = NULL;
int firmware_blob_len = 0;
FirmwareImage* image = NULL;
RSAPublicKey* root_key = NULL;
int error_code = 1;
char* tmp_firmwareblob_file = ".tmpFirmwareBlob";
if(argc != 6) {
fprintf(stderr, "Usage: %s <algorithm> <root key> <processed root pubkey>"
@@ -177,11 +178,11 @@ int main(int argc, char* argv[]) {
/* Read verification keys and create a test image. */
root_key = RSAPublicKeyFromFile(argv[3]);
root_key_blob = BufferFromFile(argv[3], &len);
sign_key_buf = BufferFromFile(argv[5], &len);
image = GenerateTestFirmwareImage(atoi(argv[1]), sign_key_buf, 1,
firmware_sign_key_buf = BufferFromFile(argv[5], &len);
image = GenerateTestFirmwareImage(atoi(argv[1]), firmware_sign_key_buf, 1,
1, 1000);
if (!root_key || !sign_key_buf || !image) {
if (!root_key || !firmware_sign_key_buf || !image) {
error_code = 1;
goto failure;
}
@@ -193,25 +194,13 @@ int main(int argc, char* argv[]) {
goto failure;
}
if (!AddFirmwareSignature(image, argv[4], image->sign_algorithm)) {
if (!AddFirmwareSignature(image, argv[4])) {
fprintf(stderr, "Couldn't create firmware and preamble signature.\n");
error_code = 1;
goto failure;
}
/* Generate a firmware binary blob from image.
*
* TODO(gauravsh): There should be a function to directly generate a binary
* blob buffer from a FirmwareImage instead of indirectly writing to a file
* and reading it into a buffer.
*/
if (!WriteFirmwareImage(tmp_firmwareblob_file, image)) {
fprintf(stderr, "Couldn't create a temporary firmware blob file.\n");
error_code = 1;
goto failure;
}
firmware_blob = BufferFromFile(tmp_firmwareblob_file, &len);
firmware_blob = GetFirmwareBlob(image, &firmware_blob_len);
/* Test Firmware blob verify operations. */
if (!VerifyFirmwareTest(firmware_blob, root_key_blob))
@@ -226,7 +215,7 @@ int main(int argc, char* argv[]) {
failure:
Free(firmware_blob);
Free(image);
Free(sign_key_buf);
Free(firmware_sign_key_buf);
Free(root_key_blob);
Free(root_key);

17
tests/kernel_image_tests.c
View File

@@ -174,10 +174,10 @@ int main(int argc, char* argv[]) {
uint8_t* kernel_sign_key_buf = NULL;
uint8_t* firmware_key_blob = NULL;
uint8_t* kernel_blob = NULL;
int kernel_blob_len = 0;
KernelImage* image = NULL;
RSAPublicKey* firmware_key = NULL;
int error_code = 1;
char* tmp_kernelblob_file = ".tmpKernelBlob";
if(argc != 7) {
fprintf(stderr, "Usage: %s <firmware signing algorithm> " /* argv[1] */
@@ -217,24 +217,13 @@ int main(int argc, char* argv[]) {
goto failure;
}
if (!AddKernelSignature(image, argv[5], image->kernel_sign_algorithm)) {
if (!AddKernelSignature(image, argv[5])) {
fprintf(stderr, "Couldn't create firmware and preamble signature.\n");
error_code = 1;
goto failure;
}
/* Generate a firmware binary blob from image.
*
* TODO(gauravsh): Add a function to directly generate a binary
* blob buffer from a KernelImage instead of indirectly writing to a file
* and reading it into a buffer.
*/
if (!WriteKernelImage(tmp_kernelblob_file, image)) {
fprintf(stderr, "Couldn't create a temporary kernel blob file.\n");
error_code = 1;
goto failure;
}
kernel_blob = BufferFromFile(tmp_kernelblob_file, &len);
kernel_blob = GetKernelBlob(image, &kernel_blob_len);
/* Test Kernel blob verify operations. */
if (!VerifyKernelTest(kernel_blob, firmware_key_blob))

4
tests/rsa_padding_test.c
View File

@@ -25,14 +25,14 @@ int main(int argc, char* argv[]) {
}
/* The first test signature is valid. */
if (!RSA_verify(key, signatures[0], RSA1024NUMBYTES, 0,
if (!RSAVerify(key, signatures[0], RSA1024NUMBYTES, 0,
test_message_sha1_hash)) {
fprintf(stderr, "RSA Padding Test vector 0 FAILED!\n");
error = 255; /* Test failure. */
}
/* All other signatures should fail verification. */
for (i = 1; i < sizeof(signatures) / sizeof(signatures[0]); i++) {
if (RSA_verify(key, signatures[i], RSA1024NUMBYTES, 0,
if (RSAVerify(key, signatures[i], RSA1024NUMBYTES, 0,
test_message_sha1_hash)) {
fprintf(stderr, "RSA Padding Test vector %d FAILED!\n", i);
error = 255; /* Test failure. */

2
tests/rsa_verify_benchmark.c
View File

@@ -64,7 +64,7 @@ int SpeedTestAlgorithm(int algorithm) {
StartTimer(&ct);
for (i = 0; i < NUM_OPERATIONS; i++) {
if (!RSA_verify(key, signature, sig_len, algorithm, digest))
if (!RSAVerify(key, signature, sig_len, algorithm, digest))
fprintf(stderr, "Warning: Signature Check Failed.\n");
}
StopTimer(&ct);