From 17f77a9aab3bb4c361acca0f8a9c4f6440c1da55 Mon Sep 17 00:00:00 2001
From: Jeremy Kerr <jeremy.kerr@canonical.com>
Date: Mon, 14 May 2012 15:53:26 +0800
Subject: [PATCH] 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>
---
 sbverify.c | 4 +---
 1 file changed, 1 insertion(+), 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);