X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fboot.c;h=2a0d333a4ea7bad7c9249764f119767c2228a0ba;hp=1e010ab1ebc316e6a13a0ef588abe4ff9ed9330d;hb=917f7aa880a7c6ab08991ae0c969d0489ba48845;hpb=dc85de97c79c2172a87fc95cca16e6c6055dc1f4;ds=sidebyside

diff --git a/discover/boot.c b/discover/boot.c
index 1e010ab..2a0d333 100644
--- a/discover/boot.c
+++ b/discover/boot.c
@@ -26,7 +26,7 @@
 #include "resource.h"
 #include "platform.h"
 
-#include <security/gpg.h>
+#include <security/security.h>
 
 static const char *boot_hook_dir = PKG_SYSCONF_DIR "/boot.d";
 enum {
@@ -72,17 +72,17 @@ static int kexec_load(struct boot_task *boot_task)
 	boot_task->local_dtb_override = NULL;
 	boot_task->local_image_override = NULL;
 
-	if ((result = gpg_validate_boot_files(boot_task))) {
+	if ((result = validate_boot_files(boot_task))) {
 		if (result == KEXEC_LOAD_DECRYPTION_FALURE) {
 			pb_log("%s: Aborting kexec due to"
 				" decryption failure\n", __func__);
-			goto abort_kexec;
 		}
 		if (result == KEXEC_LOAD_SIGNATURE_FAILURE) {
 			pb_log("%s: Aborting kexec due to signature"
 				" verification failure\n", __func__);
-			goto abort_kexec;
 		}
+
+		goto abort_kexec;
 	}
 
 	const char* local_initrd = (boot_task->local_initrd_override) ?
@@ -144,7 +144,7 @@ static int kexec_load(struct boot_task *boot_task)
 	}
 
 abort_kexec:
-	gpg_validate_boot_files_cleanup(boot_task);
+	validate_boot_files_cleanup(boot_task);
 
 	return result;
 }
@@ -362,15 +362,14 @@ static void cleanup_load(struct load_url_result *result)
 static void cleanup_cancellations(struct boot_task *task,
 		struct load_url_result *cur_result)
 {
-	struct load_url_result *result, **results[] = {
-		&task->image, &task->initrd, &task->dtb,
-	};
+	struct boot_resource *resource;
+	struct load_url_result *result;
 	bool pending = false;
-	unsigned int i;
 
-	for (i = 0; i < ARRAY_SIZE(results); i++) {
-		result = *results[i];
+	list_for_each_entry(&task->resources, resource, list) {
+		result = resource->result;
 
+		/* Nothing to do if a load hasn't actually started yet */
 		if (!result)
 			continue;
 
@@ -378,9 +377,6 @@ static void cleanup_cancellations(struct boot_task *task,
 		if (result == cur_result || result->status == LOAD_OK
 				|| result->status == LOAD_ERROR) {
 			cleanup_load(result);
-			talloc_free(result);
-			*results[i] = NULL;
-
 		/* ... and cancel any pending loads, which we'll free in
 		 * the completion callback */
 		} else if (result->status == LOAD_ASYNC) {
@@ -602,21 +598,21 @@ struct boot_task *boot(void *ctx, struct discover_boot_option *opt,
 	if (boot_task->verify_signature) {
 		/* Generate names of associated signature files and load */
 		if (image) {
-			image_sig = gpg_get_signature_url(ctx, image);
+			image_sig = get_signature_url(ctx, image);
 			tmp = add_boot_resource(boot_task,
 					_("kernel image signature"), image_sig,
 					&boot_task->local_image_signature);
 			rc |= start_url_load(boot_task, tmp);
 		}
 		if (initrd) {
-			initrd_sig = gpg_get_signature_url(ctx, initrd);
+			initrd_sig = get_signature_url(ctx, initrd);
 			tmp = add_boot_resource(boot_task,
 					_("initrd signature"), initrd_sig,
 					&boot_task->local_initrd_signature);
 			rc |= start_url_load(boot_task, tmp);
 		}
 		if (dtb) {
-			dtb_sig = gpg_get_signature_url(ctx, dtb);
+			dtb_sig = get_signature_url(ctx, dtb);
 			tmp = add_boot_resource(boot_task,
 					_("dtb signature"), dtb_sig,
 					&boot_task->local_dtb_signature);