summaryrefslogtreecommitdiffstats
path: root/src/config/general.h
diff options
context:
space:
mode:
authorMichael Brown2016-07-29 16:40:39 +0200
committerMichael Brown2016-07-29 16:40:39 +0200
commit942b798c8d143042fc17c7fadea528fee5cbebc2 (patch)
treeb28d383dd7745c88c406238bebaf5765dfe1c81a /src/config/general.h
parent[build] Remove obsolete explicit object requirements (diff)
downloadipxe-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/config/general.h')
-rw-r--r--src/config/general.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/config/general.h b/src/config/general.h
index efded483..38d629cc 100644
--- a/src/config/general.h
+++ b/src/config/general.h
@@ -112,8 +112,8 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
//#define IMAGE_SDI /* SDI image support */
//#define IMAGE_PNM /* PNM image support */
//#define IMAGE_PNG /* PNG image support */
-//#define IMAGE_DER /* DER image support */
-//#define IMAGE_PEM /* PEM image support */
+#define IMAGE_DER /* DER image support */
+#define IMAGE_PEM /* PEM image support */
/*
* Command-line commands to include