aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Kerr <jeremy.kerr@canonical.com>2012-05-14 15:53:26 +0800
committerJeremy Kerr <jeremy.kerr@canonical.com>2012-05-14 15:53:26 +0800
commit17f77a9aab3bb4c361acca0f8a9c4f6440c1da55 (patch)
treec67b82ab6a66aad2de111b8d2c0b7efe1a7e364e
parentc48e3922ca4beb311a5f7a34620fa101f5e1a9d0 (diff)
downloadsbsigntools-17f77a9aab3bb4c361acca0f8a9c4f6440c1da55.tar.gz
sbverify: clean up openssl init
Remove a duplicate call to ERR_load_crypto_strings, and move the digest init earlier. Signed-off-by: Jeremy Kerr <jeremy.kerr@canonical.com>
-rw-r--r--sbverify.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/sbverify.c b/sbverify.c
index ddb54d8..bb11b07 100644
--- a/sbverify.c
+++ b/sbverify.c
@@ -117,6 +117,7 @@ int main(int argc, char **argv)
certs = X509_STORE_new();
verify = 1;
+ OpenSSL_add_all_digests();
ERR_load_crypto_strings();
for (;;) {
@@ -153,9 +154,6 @@ int main(int argc, char **argv)
goto out;
}
- ERR_load_crypto_strings();
- OpenSSL_add_all_digests();
-
header = image->buf + image->data_dir_sigtable->addr;
buf = (void *)(header + 1);
p7 = d2i_PKCS7(NULL, &buf, header->size);