[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>
This commit is contained in:
Michael Brown
2016-07-29 15:40:39 +01:00
parent b7e43b0335
commit 942b798c8d
5 changed files with 83 additions and 43 deletions
-6
View File
@@ -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