summaryrefslogtreecommitdiffstats
path: root/src/usr/imgtrust.c
diff options
context:
space:
mode:
authorMichael Brown2012-05-04 18:12:32 +0200
committerMichael Brown2012-05-04 18:54:31 +0200
commit557f467bab42b47d91b08e936fbe2ffa8e80f2e7 (patch)
treeac81d6db346318baa0048444f2989144b27a0eca /src/usr/imgtrust.c
parent[time] Add Linux time source using gettimeofday() (diff)
downloadipxe-557f467bab42b47d91b08e936fbe2ffa8e80f2e7.tar.gz
ipxe-557f467bab42b47d91b08e936fbe2ffa8e80f2e7.tar.xz
ipxe-557f467bab42b47d91b08e936fbe2ffa8e80f2e7.zip
[crypto] Allow certificate chains to be long-lived data structures
At present, certificate chain validation is treated as an instantaneous process that can be carried out using only data that is already in memory. This model does not allow for validation to include non-instantaneous steps, such as downloading a cross-signing certificate, or determining certificate revocation status via OCSP. Redesign the internal representation of certificate chains to allow chains to outlive the scope of the original source of certificates (such as a TLS Certificate record). Allow for certificates to be cached, so that each certificate needs to be validated only once. Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/usr/imgtrust.c')
-rw-r--r--src/usr/imgtrust.c18
1 files changed, 12 insertions, 6 deletions
diff --git a/src/usr/imgtrust.c b/src/usr/imgtrust.c
index 59660782..651f0493 100644
--- a/src/usr/imgtrust.c
+++ b/src/usr/imgtrust.c
@@ -45,7 +45,7 @@ int imgverify ( struct image *image, struct image *signature,
const char *name ) {
size_t len;
void *data;
- struct cms_signature sig;
+ struct cms_signature *sig;
time_t now;
int rc;
@@ -62,25 +62,31 @@ int imgverify ( struct image *image, struct image *signature,
copy_from_user ( data, signature->data, 0, len );
/* Parse signature */
- if ( ( rc = cms_parse ( &sig, data, len ) ) != 0 )
+ if ( ( rc = cms_signature ( data, len, &sig ) ) != 0 )
goto err_parse;
+ /* Free internal copy of signature */
+ free ( data );
+ data = NULL;
+
/* Use signature to verify image */
now = time ( NULL );
- if ( ( rc = cms_verify ( &sig, image->data, image->len,
+ if ( ( rc = cms_verify ( sig, image->data, image->len,
name, now, NULL ) ) != 0 )
goto err_verify;
+ /* Drop reference to signature */
+ cms_put ( sig );
+ sig = NULL;
+
/* Mark image as trusted */
image_trust ( image );
syslog ( LOG_NOTICE, "Image \"%s\" signature OK\n", image->name );
- /* Free internal copy of signature */
- free ( data );
-
return 0;
err_verify:
+ cms_put ( sig );
err_parse:
free ( data );
err_alloc: