vbatts/sbsigntools
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

sbverify: Split image signature table reading to separate function

Browse source 
We'd like to read detached signatures too, so split the
signature-buffer-reading code into a separate function.

Signed-off-by: Jeremy Kerr <jeremy.kerr@canonical.com>
This commit is contained in:
Jeremy Kerr 2012-06-11 17:04:17 +08:00
parent ffc1f41ace
commit f457bb21f1
1 changed files with 26 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
sbverify.c
View file

@ -98,6 +98,23 @@ err:
return -1;
}
static int load_image_signature_data(struct image *image,
uint8_t **buf, size_t *len)
{
struct cert_table_header *header;
if (!image->data_dir_sigtable->addr
|| !image->data_dir_sigtable->size) {
fprintf(stderr, "No signature table present\n");
return -1;
}
header = image->buf + image->data_dir_sigtable->addr;
*buf = (void *)(header + 1);
*len = header->size;
return 0;
}
static int x509_verify_cb(int status, X509_STORE_CTX *ctx)
{
int err = X509_STORE_CTX_get_error(ctx);
@ -112,12 +129,13 @@ static int x509_verify_cb(int status, X509_STORE_CTX *ctx)
int main(int argc, char **argv)
{
struct cert_table_header *header;
enum verify_status status;
int rc, c, flags, verify;
const uint8_t *tmp_buf;
struct image *image;
const uint8_t *buf;
X509_STORE *certs;
uint8_t *sig_buf;
size_t sig_size;
struct idc *idc;
BIO *idcbio;
PKCS7 *p7;
@ -163,15 +181,15 @@ int main(int argc, char **argv)
image_pecoff_parse(image);
image_find_regions(image);
if (!image->data_dir_sigtable->addr
|| !image->data_dir_sigtable->size) {
fprintf(stderr, "No signature table present\n");
rc = load_image_signature_data(image, &sig_buf, &sig_size);
if (rc) {
fprintf(stderr, "Unable to read signature data from %s\n",
argv[optind]);
goto out;
}
header = image->buf + image->data_dir_sigtable->addr;
buf = (void *)(header + 1);
p7 = d2i_PKCS7(NULL, &buf, header->size);
tmp_buf = sig_buf;
p7 = d2i_PKCS7(NULL, &tmp_buf, sig_size);
if (!p7) {
fprintf(stderr, "Unable to parse signature data\n");
ERR_print_errors_fp(stderr);