scottk/OpenCellular
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenCellular.git synced 2025-11-24 02:05:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix RSA verification test.

Browse Source 
I previously refactored some of the signature generation code to directly use the OpenSSL library instead of invoking the "openssl" command line utility. The signature_digest command line utility got lost in the process. This restores the utility which in turn fixes the RSA verification test.

Review URL: http://codereview.chromium.org/669040
This commit is contained in:
Gaurav Shah
2010-03-04 10:22:36 -08:00
parent 80d129b89d
commit cb3d22e971
4 changed files with 65 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/Makefile
View File

@@ -3,7 +3,7 @@
# found in the LICENSE file.
CC ?= gcc
CFLAGS = -Wall -DNDEBUG
CFLAGS = -Wall -DNDEBUG -O3
INCLUDES ?= -I../include/
TOP ?= ../

4
tests/run_rsa_tests.sh
View File

@@ -26,8 +26,8 @@ function generate_signatures {
do
for hashalgo in ${hash_algos[@]}
do
${UTIL_DIR}/signature_digest $algorithmcounter $1 | openssl rsautl -sign \
-pkcs -inkey ${KEY_DIR}/key_rsa${keylen}.pem \
${UTIL_DIR}/signature_digest_utility $algorithmcounter $1 | openssl \
rsautl -sign -pkcs -inkey ${KEY_DIR}/key_rsa${keylen}.pem \
> $1.rsa${keylen}\_${hashalgo}.sig
let algorithmcounter=algorithmcounter+1
done

12
utils/Makefile
View File

@@ -4,15 +4,16 @@
CC ?= gcc
CXX ?= g++
CFLAGS = -Wall -DNDEBUG
CFLAGS = -Wall -DNDEBUG -O3
INCLUDES ?= -I../include/
TOP ?= ../
LIBS = firmware_image.o kernel_image.o signature_digest.o file_keys.o
FIRMWARELIBS = $(TOP)/crypto/libcrypto.a $(TOP)/common/libcommon.a
all: dumpRSAPublicKey verify_data file_keys.o signature_digest.o firmware_image.o \
kernel_image.o signature_digest.o firmware_utility kernel_utility
all: dumpRSAPublicKey verify_data file_keys.o signature_digest.o \
firmware_image.o kernel_image.o signature_digest.o \
signature_digest_utility firmware_utility kernel_utility
dumpRSAPublicKey: dumpRSAPublicKey.c
$(CC) $(CFLAGS) $< -o $@ -lcrypto
@@ -20,6 +21,9 @@ dumpRSAPublicKey: dumpRSAPublicKey.c
verify_data: verify_data.c $(LIBS) $(FIRMWARELIBS)
$(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) $(FIRMWARELIBS) -lcrypto
signature_digest_utility: signature_digest_utility.c $(LIBS) $(FIRMWARELIBS)
$(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS) $(FIRMWARELIBS) -lcrypto
firmware_utility: firmware_utility.cc $(LIBS) $(FIRMWARELIBS)
$(CXX) $(CFLAGS) $(INCLUDES) -ggdb -D__STDC_LIMIT_MACROS $< \
-o $@ $(FIRMWARELIBS) $(LIBS) -lcrypto
@@ -41,4 +45,4 @@ kernel_image.o: kernel_image.c
$(CC) $(CFLAGS) -ansi $(INCLUDES) -c $< -o $@
clean:
rm -f dumpRSAPublicKey verify_data signature_digest firmware_utility \
kernel_utility $(LIBS)
kernel_utility signature_digest_utility $(LIBS)

54
utils/signature_digest_utility.c Normal file
View File

@@ -0,0 +1,54 @@
/* Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*
* Utility that outputs the cryptographic digest of a contents of a
* file in a format that can be directly used to generate PKCS#1 v1.5
* signatures via the "openssl" command line utility.
*/
#include <stdio.h>
#include <stdlib.h>
#include "file_keys.h"
#include "padding.h"
#include "signature_digest.h"
#include "utility.h"
int main(int argc, char* argv[]) {
int algorithm = -1;
int error_code = 0;
uint8_t* buf = NULL;
uint8_t* signature_digest = NULL;
uint32_t len;
uint32_t signature_digest_len;
if (argc != 3) {
fprintf(stderr, "Usage: %s <algoid> <file>", argv[0]);
return -1;
}
algorithm = atoi(argv[1]);
if (algorithm < 0 || algorithm >= kNumAlgorithms) {
fprintf(stderr, "Invalid Algorithm!\n");
return -1;
}
buf = BufferFromFile(argv[2], &len);
if (!buf) {
fprintf(stderr, "Could read file: %s\n", argv[2]);
return -1;
}
signature_digest = SignatureDigest(buf, len, algorithm);
signature_digest_len = (hash_size_map[algorithm] +
digestinfo_size_map[algorithm]);
if (!signature_digest)
error_code = -1;
if(signature_digest &&
1 != fwrite(signature_digest, signature_digest_len, 1, stdout))
error_code = -1;
Free(signature_digest);
Free(buf);
return error_code;
}