summaryrefslogtreecommitdiffstats
path: root/src/config/config.c
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/config.c
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/config.c')
-rw-r--r--src/config/config.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/config/config.c b/src/config/config.c
index c24b58d5..e24cfe0d 100644
--- a/src/config/config.c
+++ b/src/config/config.c
@@ -188,12 +188,6 @@ REQUIRE_OBJECT ( pnm );
#ifdef IMAGE_PNG
REQUIRE_OBJECT ( png );
#endif
-#ifdef IMAGE_DER
-REQUIRE_OBJECT ( der );
-#endif
-#ifdef IMAGE_PEM
-REQUIRE_OBJECT ( pem );
-#endif
/*
* Drag in all requested commands