From 071171e807b26d6f16c880674b52a553f26ccd08 Mon Sep 17 00:00:00 2001
From: Michael Brown <mcb30@ipxe.org>
Date: Tue, 22 May 2012 00:45:31 +0100
Subject: [PATCH] [image] Allow "imgtrust" to automatically download
 cross-signed certificates

Signed-off-by: Michael Brown <mcb30@ipxe.org>
---
 src/usr/imgtrust.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/usr/imgtrust.c b/src/usr/imgtrust.c
index 651f04939..be0ca6ee0 100644
--- a/src/usr/imgtrust.c
+++ b/src/usr/imgtrust.c
@@ -25,6 +25,8 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <ipxe/uaccess.h>
 #include <ipxe/image.h>
 #include <ipxe/cms.h>
+#include <ipxe/validator.h>
+#include <ipxe/monojob.h>
 #include <usr/imgtrust.h>
 
 /** @file
@@ -46,6 +48,7 @@ int imgverify ( struct image *image, struct image *signature,
 	size_t len;
 	void *data;
 	struct cms_signature *sig;
+	struct cms_signer_info *info;
 	time_t now;
 	int rc;
 
@@ -69,6 +72,14 @@ int imgverify ( struct image *image, struct image *signature,
 	free ( data );
 	data = NULL;
 
+	/* Complete all certificate chains */
+	list_for_each_entry ( info, &sig->info, list ) {
+		if ( ( rc = create_validator ( &monojob, info->chain ) ) != 0 )
+			goto err_create_validator;
+		if ( ( rc = monojob_wait ( NULL ) ) != 0 )
+			goto err_validator_wait;
+	}
+
 	/* Use signature to verify image */
 	now = time ( NULL );
 	if ( ( rc = cms_verify ( sig, image->data, image->len,
@@ -86,6 +97,8 @@ int imgverify ( struct image *image, struct image *signature,
 	return 0;
 
  err_verify:
+ err_validator_wait:
+ err_create_validator:
 	cms_put ( sig );
  err_parse:
 	free ( data );