diff options
| author | Michael Brown | 2016-07-28 23:51:50 +0200 |
|---|---|---|
| committer | Michael Brown | 2016-07-29 02:13:27 +0200 |
| commit | 84add97ce9e094e9299db181d53ba8859f4a3e67 (patch) | |
| tree | b74ae8ed5f65cb7431f4f0c660db5282f743773c /src/config | |
| parent | [crypto] Add DER image format (diff) | |
| download | ipxe-84add97ce9e094e9299db181d53ba8859f4a3e67.tar.gz ipxe-84add97ce9e094e9299db181d53ba8859f4a3e67.tar.xz ipxe-84add97ce9e094e9299db181d53ba8859f4a3e67.zip | |
[crypto] Add PEM image format
Add PEM-encoded ASN.1 as an image format. We accept as PEM any image
containing a line starting with a "-----BEGIN" boundary marker.
We allow for PEM files containing multiple ASN.1 objects, such as a
certificate chain produced by concatenating individual certificate
files.
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/config')
| -rw-r--r-- | src/config/config.c | 3 | ||||
| -rw-r--r-- | src/config/general.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/config/config.c b/src/config/config.c index acdbebaa..c24b58d5 100644 --- a/src/config/config.c +++ b/src/config/config.c @@ -191,6 +191,9 @@ REQUIRE_OBJECT ( png ); #ifdef IMAGE_DER REQUIRE_OBJECT ( der ); #endif +#ifdef IMAGE_PEM +REQUIRE_OBJECT ( pem ); +#endif /* * Drag in all requested commands diff --git a/src/config/general.h b/src/config/general.h index 6ff4b74a..efded483 100644 --- a/src/config/general.h +++ b/src/config/general.h @@ -113,6 +113,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); //#define IMAGE_PNM /* PNM image support */ //#define IMAGE_PNG /* PNG image support */ //#define IMAGE_DER /* DER image support */ +//#define IMAGE_PEM /* PEM image support */ /* * Command-line commands to include |