diff options
author | Michael Brown | 2016-07-29 16:40:39 +0200 |
---|---|---|
committer | Michael Brown | 2016-07-29 16:40:39 +0200 |
commit | 942b798c8d143042fc17c7fadea528fee5cbebc2 (patch) | |
tree | b28d383dd7745c88c406238bebaf5765dfe1c81a /src/core/image.c | |
parent | [build] Remove obsolete explicit object requirements (diff) | |
download | ipxe-942b798c8d143042fc17c7fadea528fee5cbebc2.tar.gz ipxe-942b798c8d143042fc17c7fadea528fee5cbebc2.tar.xz ipxe-942b798c8d143042fc17c7fadea528fee5cbebc2.zip |
[crypto] Enable both DER and PEM formats by default
Enable both IMAGE_DER and IMAGE_PEM by default, and drag in the
relevant objects only when image_asn1() is present in the binary.
This allows "imgverify" to transparently use either DER or PEM
signature files.
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/core/image.c')
-rw-r--r-- | src/core/image.c | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/src/core/image.c b/src/core/image.c index b4785269..a185b82f 100644 --- a/src/core/image.c +++ b/src/core/image.c @@ -505,38 +505,3 @@ int image_pixbuf ( struct image *image, struct pixel_buffer **pixbuf ) { return 0; } - -/** - * Extract ASN.1 object from image - * - * @v image Image - * @v offset Offset within image - * @v cursor ASN.1 cursor to fill in - * @ret next Offset to next image, or negative error - * - * The caller is responsible for eventually calling free() on the - * allocated ASN.1 cursor. - */ -int image_asn1 ( struct image *image, size_t offset, - struct asn1_cursor **cursor ) { - int next; - int rc; - - /* Sanity check */ - assert ( offset <= image->len ); - - /* Check that this image can be used to extract an ASN.1 object */ - if ( ! ( image->type && image->type->asn1 ) ) - return -ENOTSUP; - - /* Try creating ASN.1 cursor */ - next = image->type->asn1 ( image, offset, cursor ); - if ( next < 0 ) { - rc = next; - DBGC ( image, "IMAGE %s could not extract ASN.1 object: %s\n", - image->name, strerror ( rc ) ); - return rc; - } - - return next; -} |